Merge pull request #6869 from imgntn/pistolfix

Make Pistol Quieter and Minor Adjustments

examples/toybox/pistol/createPistol.js

@@ -9,8 +9,8 @@ var pistol = Entities.addEntity({
     position: center,
     dimensions: {
         x: 0.05,
-        y: .23,
-        z: .36
+        y: 0.23,
+        z: 0.36
     },
     script: scriptURL,
     color: {
@@ -20,9 +20,14 @@ var pistol = Entities.addEntity({
     },
     shapeType: 'box',
     dynamic: true,
-    gravity: {x: 0, y: -5.0, z: 0},
+    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",
+    damping:0.5,
+    collisionSoundURL: "http://hifi-content.s3.amazonaws.com/james/pistol/sounds/drop.wav",
     userData: JSON.stringify({
         grabbableKey: {
             spatialKey: {

examples/toybox/pistol/pistol.js

@@ -1,6 +1,5 @@
 //
 //  pistol.js
-//  examples/toybox/entityScripts
 //
 //  Created by Eric Levin on11/11/15.
 //  Copyright 2015 High Fidelity, Inc.
@@ -16,7 +15,6 @@
     Script.include("../../libraries/constants.js");
 
     var _this;
-    // if the trigger value goes below this while held, the can will stop spraying.  if it goes above, it will spray
     var DISABLE_LASER_THRESHOLD = 0.2;
     var TRIGGER_CONTROLS = [
         Controller.Standard.LT,

unpublishedScripts/hiddenEntityReset.js

@@ -277,7 +277,9 @@
                 name: "pistol",
                 modelURL: modelURL,
                 position: position,
-                collisionSoundURL: "https://s3.amazonaws.com/hifi-public/sounds/Guns/Gun_Drop_and_Metalli_1.wav",
+                restitution: 0,
+                damping:0.5,
+                collisionSoundURL: "http://hifi-content.s3.amazonaws.com/james/pistol/sounds/drop.wav",
                 dimensions: {
                     x: 0.05,
                     y: 0.23,

unpublishedScripts/masterReset.js

@@ -280,7 +280,8 @@ MasterReset = function() {
             },
             restitution: 0,
             dynamic: true,
-            collisionSoundURL: "https://s3.amazonaws.com/hifi-public/sounds/Guns/Gun_Drop_and_Metalli_1.wav",
+            damping: 0.5,
+            collisionSoundURL: "http://hifi-content.s3.amazonaws.com/james/pistol/sounds/drop.wav",
             userData: JSON.stringify({
                 grabbableKey: {
                     spatialKey: {