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

Merge pull request #7022 from imgntn/mastertoys

Browse source 
Fix userData for pistol in toybox reset scripts
This commit is contained in:
Eric Levin 2016-02-03 17:47:21 -08:00
commit 2af6c08057
2 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
unpublishedScripts/hiddenEntityReset.js
View file

@ -299,7 +299,6 @@
},
dynamic: true,
userData: JSON.stringify({
grabbableKey: {
wearable: {
joints: {
RightHand: [{
@ -324,6 +323,7 @@
}]
}
},
grabbableKey: {
invertSolidWhileHeld: true
},
resetMe: {

2
unpublishedScripts/masterReset.js
View file

@ -283,7 +283,6 @@ MasterReset = function() {
damping: 0.5,
collisionSoundURL: "http://hifi-content.s3.amazonaws.com/james/pistol/sounds/drop.wav",
userData: JSON.stringify({
grabbableKey: {
wearable: {
joints: {
RightHand: [{
@ -308,6 +307,7 @@ MasterReset = function() {
}]
}
},
grabbableKey: {
invertSolidWhileHeld: true
},
resetMe: {