Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 06:53:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added wantsTrigger to user data for a couple items to avoid breakage with new grab script changes

Browse source
This commit is contained in:
ericrius1 2015-10-21 10:16:31 -07:00
parent 6465bb85dd
commit 1c5dc0374a
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
unpublishedScripts/hiddenEntityReset.js
View file

@ -54,7 +54,6 @@
MasterReset = function() { MasterReset = function() {
var resetKey = "resetMe"; var resetKey = "resetMe";
var GRABBABLE_DATA_KEY = "grabbableKey";
var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
@ -97,8 +96,6 @@
z: 505.78 z: 505.78
}); });
createCombinedArmChair({ createCombinedArmChair({
x: 549.29, x: 549.29,
y: 494.9, y: 494.9,
@ -487,7 +484,6 @@
grabbableKey: { grabbableKey: {
invertSolidWhileHeld: true invertSolidWhileHeld: true
} }
}) })
}); });
@ -533,6 +529,9 @@
resetMe: true, resetMe: true,
on: true, on: true,
type: "Hall Light" type: "Hall Light"
},
grabbableKey: {
wantsTrigger: true
} }
}) })
}); });
@ -628,6 +627,9 @@
resetMe: true, resetMe: true,
on: true, on: true,
type: "Garage Light" type: "Garage Light"
},
grabbableKey: {
wantsTrigger: true
} }
}) })
}); });
@ -759,6 +761,7 @@
grabbableKey: { grabbableKey: {
invertSolidWhileHeld: true invertSolidWhileHeld: true
} }
}) })
}; };
var dice1 = Entities.addEntity(diceProps); var dice1 = Entities.addEntity(diceProps);
@ -851,6 +854,7 @@
grabbableKey: { grabbableKey: {
invertSolidWhileHeld: true invertSolidWhileHeld: true
} }
}) })
}); });
} }
@ -1176,7 +1180,7 @@
y: 0.05, y: 0.05,
z: 0.25 z: 0.25
} }
} ]; }];
var modelURL, entity; var modelURL, entity;
for (i = 0; i < blockTypes.length; i++) { for (i = 0; i < blockTypes.length; i++) {

7
unpublishedScripts/masterReset.js
View file

@ -27,7 +27,6 @@ var targetsScriptURL = Script.resolvePath('../examples/toys/ping_pong_gun/wallTa
MasterReset = function() { MasterReset = function() {
var resetKey = "resetMe"; var resetKey = "resetMe";
var GRABBABLE_DATA_KEY = "grabbableKey";
var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
@ -505,6 +504,9 @@ MasterReset = function() {
resetMe: true, resetMe: true,
on: true, on: true,
type: "Hall Light" type: "Hall Light"
},
grabbableKey: {
wantsTrigger: true
} }
}) })
}); });
@ -600,6 +602,9 @@ MasterReset = function() {
resetMe: true, resetMe: true,
on: true, on: true,
type: "Garage Light" type: "Garage Light"
},
grabbableKey: {
wantsTrigger: true
} }
}) })
}); });