From 5a9d533e7007d71a59c6fc06ad16ac0bc9c71a16 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Wed, 13 Jan 2016 15:30:12 -0800 Subject: [PATCH] ping pong and gun tweaks --- unpublishedScripts/hiddenEntityReset.js | 17 +++++++++++------ unpublishedScripts/masterReset.js | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js index f96443f059..cd4a05dfce 100644 --- a/unpublishedScripts/hiddenEntityReset.js +++ b/unpublishedScripts/hiddenEntityReset.js @@ -301,15 +301,15 @@ spatialKey: { rightRelativePosition: { x: 0.03, - y: 0, + y: 0.0, z: -0.085 }, leftRelativePosition: { x: -0.03, - y: 0, + y: 0.00, z: -0.085 }, - relativeRotation: Quat.fromPitchYawRollDegrees(100, 90, 0) + relativeRotation: Quat.fromPitchYawRollDegrees(90, 90, 0) }, invertSolidWhileHeld: true }, @@ -1160,9 +1160,14 @@ }, grabbableKey: { spatialKey: { - relativePosition: { - x: 0.01, - y: 0, + rightRelativePosition: { + x: -0.05, + y: .06, + z: 0.1 + }, + leftRelativePosition: { + x: 0.05, + y: 0.06, z: 0.1 }, relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90) diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js index 81c2db9e05..79e14b4c88 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -286,15 +286,15 @@ MasterReset = function() { spatialKey: { rightRelativePosition: { x: 0.03, - y: 0, + y: 0.0, z: -0.085 }, leftRelativePosition: { x: -0.03, - y: 0, + y: 0.00, z: -0.085 }, - relativeRotation: Quat.fromPitchYawRollDegrees(100, 90, 0) + relativeRotation: Quat.fromPitchYawRollDegrees(90, 90, 0) }, invertSolidWhileHeld: true }, @@ -1146,9 +1146,14 @@ MasterReset = function() { }, grabbableKey: { spatialKey: { - relativePosition: { - x: 0.01, - y: 0, + rightRelativePosition: { + x: -0.05, + y: .06, + z: 0.1 + }, + leftRelativePosition: { + x: 0.05, + y: 0.06, z: 0.1 }, relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90)