From 018050344746581d6b39a434dc3182027b093314 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Wed, 2 Dec 2015 12:07:38 -0800
Subject: [PATCH 1/2] removed collision sound url

---
 unpublishedScripts/hiddenEntityReset.js | 1 -
 unpublishedScripts/masterReset.js       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index 982c65fc08..0c15100aaa 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -241,7 +241,6 @@
                 gravity: BOW_GRAVITY,
                 shapeType: 'compound',
                 compoundShapeURL: COLLISION_HULL_URL,
-                collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/bow_fall.L.wav",
                 script: bowScriptURL,
                 userData: JSON.stringify({
                     resetMe: {
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index 6e89e12d41..2aa29eb94e 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -220,7 +220,6 @@ MasterReset = function() {
             gravity: BOW_GRAVITY,
             shapeType: 'compound',
             compoundShapeURL: COLLISION_HULL_URL,
-            collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/bow_fall.L.wav",
             script: bowScriptURL,
             userData: JSON.stringify({
                 resetMe: {

From 6d953a65dd2a44ee94906adc2e21424edcb0e205 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Wed, 2 Dec 2015 12:09:21 -0800
Subject: [PATCH 2/2] changed restitution to 0

---
 unpublishedScripts/hiddenEntityReset.js | 2 ++
 unpublishedScripts/masterReset.js       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index 0c15100aaa..48745715f9 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -655,6 +655,7 @@
                     y: -3.5,
                     z: 0
                 },
+                restitution: 0,
                 velocity: {
                     x: 0,
                     y: -0.01,
@@ -1188,6 +1189,7 @@
                 collisionsWillMove: true,
                 collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/SpryPntCnDrp1.L.wav",
                 shapeType: 'box',
+                restitution: 0,
                 gravity: {
                     x: 0,
                     y: -3.0,
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index 2aa29eb94e..6a870f988f 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -635,6 +635,7 @@ MasterReset = function() {
                 y: -3.5,
                 z: 0
             },
+            restitution: 0,
             velocity: {
                 x: 0,
                 y: -0.01,
@@ -1173,6 +1174,7 @@ MasterReset = function() {
                 y: -3.0,
                 z: 0
             },
+            restitution: 0,
             velocity: {
                 x: 0,
                 y: -1,