diff --git a/examples/weapons/pistol/pistolSpawner.js b/examples/weapons/pistol/pistolSpawner.js index 9b677faa53..d804150cbe 100644 --- a/examples/weapons/pistol/pistolSpawner.js +++ b/examples/weapons/pistol/pistolSpawner.js @@ -1,4 +1,4 @@ -var center = Vec3.sum(MyAvatar.position, Vec3.multiply(0.5, Quat.getFront(Camera.getOrientation()))); +var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1.5, Quat.getFront(Camera.getOrientation()))); var scriptURL = Script.resolvePath('pistol.js'); var modelURL = "https://s3.amazonaws.com/hifi-public/eric/models/gun.fbx"; @@ -20,6 +20,8 @@ var pistol = Entities.addEntity({ }, shapeType: 'box', collisionsWillMove: true, + gravity: {x: 0, y: -5.0, z: 0}, + restitution: 0, collisionSoundURL: "https://s3.amazonaws.com/hifi-public/sounds/Guns/Gun_Drop_and_Metalli_1.wav", userData: JSON.stringify({ grabbableKey: { @@ -41,4 +43,4 @@ function cleanup() { Entities.deleteEntity(pistol); } -// Script.scriptEnding.connect(cleanup); \ No newline at end of file +Script.scriptEnding.connect(cleanup); \ No newline at end of file diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js index e7d8fb76d3..9e20f3f7e8 100644 --- a/unpublishedScripts/hiddenEntityReset.js +++ b/unpublishedScripts/hiddenEntityReset.js @@ -354,7 +354,7 @@ y: DIAMETER, z: DIAMETER }, - restitution: 1.0, + restitution: 0.0, linearDamping: 0.00001, gravity: { x: 0, diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js index e4460375e0..ea164823d5 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -153,7 +153,8 @@ MasterReset = function() { blue: 20 }, shapeType: 'box', - gravity: {x: 0, y: -3.0, z: 0}, + gravity: {x: 0, y: -5.0, z: 0}, + restitution: 0, collisionsWillMove: true, collisionSoundURL: "https://s3.amazonaws.com/hifi-public/sounds/Guns/Gun_Drop_and_Metalli_1.wav", userData: JSON.stringify({