Moved entity reset switch, fixed some style issues

This commit is contained in:
ericrius1 2015-10-08 10:11:21 -07:00
parent 9f0721c08b
commit b7f52ea542
2 changed files with 15 additions and 30 deletions

View file

@ -40,10 +40,6 @@
this.triggerReset(); this.triggerReset();
}, },
startFarGrabNonColliding: function () {
this.triggerReset();
},
triggerReset: function() { triggerReset: function() {
MasterReset(); MasterReset();
}, },

View file

@ -24,21 +24,10 @@ function createHiddenMasterSwitch() {
type: "Box", type: "Box",
name: "Master Switch", name: "Master Switch",
script: hiddenEntityScriptURL, script: hiddenEntityScriptURL,
dimensions: { dimensions: {x: 0.7, y: 0.2, z: 0.1},
x: 0.2, position: {x: 543.9, y: 496.05, z: 502.43},
y: 0.2, rotation: Quat.fromPitchYawRollDegrees(0, 33, 0),
z: 0.2 visible: false
},
color: {
red: 42,
green: 36,
blue: 30
},
position: {
x: 554,
y: 495.5,
z: 503.2
}
}); });
} }