From 39bb68931fd7759b4a25dbcb87933e0be5e8e4a6 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Fri, 5 Feb 2016 15:48:34 -0800 Subject: [PATCH] updated gun position --- unpublishedScripts/hiddenEntityReset.js | 44 ++++++++++++------------- unpublishedScripts/masterReset.js | 44 ++++++++++++------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js index 903388bb43..4a64b34510 100644 --- a/unpublishedScripts/hiddenEntityReset.js +++ b/unpublishedScripts/hiddenEntityReset.js @@ -299,35 +299,35 @@ }, dynamic: true, userData: JSON.stringify({ - wearable: { - joints: { - RightHand: [{ - x: 0.07079616189002991, - y: 0.20177987217903137, - z: 0.06374628841876984 + "wearable": { + "joints": { + "RightHand": [{ + "x": 0.07079616189002991, + "y": 0.20177987217903137, + "z": 0.06374628841876984 }, { - x: -0.5863648653030396, - y: -0.46007341146469116, - z: 0.46949487924575806, - w: -0.4733745753765106 + "x": -0.5863648653030396, + "y": -0.46007341146469116, + "z": 0.46949487924575806, + "w": -0.4733745753765106 }], - LeftHand: [{ - x: 0.1802254319190979, - y: 0.13442856073379517, - z: 0.08504903316497803 + "LeftHand": [{ + "x": 0.0012094751000404358, + "y": 0.1991066336631775, + "z": 0.079972043633461 }, { - x: 0.2198076844215393, - y: -0.7377811074256897, - z: 0.2780133783817291, - w: 0.574519157409668 + "x": 0.29249316453933716, + "y": -0.6115763187408447, + "z": 0.5668558478355408, + "w": 0.46807748079299927 }] } }, - grabbableKey: { - invertSolidWhileHeld: true + "grabbableKey": { + "invertSolidWhileHeld": true }, - resetMe: { - resetMe: true + "resetMe": { + "resetMe": true } }) }); diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js index 306ae294fd..c5669b9ac0 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -283,35 +283,35 @@ MasterReset = function() { damping: 0.5, collisionSoundURL: "http://hifi-content.s3.amazonaws.com/james/pistol/sounds/drop.wav", userData: JSON.stringify({ - wearable: { - joints: { - RightHand: [{ - x: 0.07079616189002991, - y: 0.20177987217903137, - z: 0.06374628841876984 + "wearable": { + "joints": { + "RightHand": [{ + "x": 0.07079616189002991, + "y": 0.20177987217903137, + "z": 0.06374628841876984 }, { - x: -0.5863648653030396, - y: -0.46007341146469116, - z: 0.46949487924575806, - w: -0.4733745753765106 + "x": -0.5863648653030396, + "y": -0.46007341146469116, + "z": 0.46949487924575806, + "w": -0.4733745753765106 }], - LeftHand: [{ - x: 0.1802254319190979, - y: 0.13442856073379517, - z: 0.08504903316497803 + "LeftHand": [{ + "x": 0.0012094751000404358, + "y": 0.1991066336631775, + "z": 0.079972043633461 }, { - x: 0.2198076844215393, - y: -0.7377811074256897, - z: 0.2780133783817291, - w: 0.574519157409668 + "x": 0.29249316453933716, + "y": -0.6115763187408447, + "z": 0.5668558478355408, + "w": 0.46807748079299927 }] } }, - grabbableKey: { - invertSolidWhileHeld: true + "grabbableKey": { + "invertSolidWhileHeld": true }, - resetMe: { - resetMe: true + "resetMe": { + "resetMe": true } }) });