From e4199439af6a89db8a19c1a856d839ddd34a6f37 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Tue, 1 Dec 2015 17:00:43 -0800 Subject: [PATCH 1/4] added collision sounds to some toys --- examples/controllers/handControllerGrab.js | 1 - unpublishedScripts/hiddenEntityReset.js | 3 +++ unpublishedScripts/masterReset.js | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/controllers/handControllerGrab.js b/examples/controllers/handControllerGrab.js index 287f57ca30..3902963a61 100644 --- a/examples/controllers/handControllerGrab.js +++ b/examples/controllers/handControllerGrab.js @@ -1277,7 +1277,6 @@ function update() { Messages.subscribe('Hifi-Hand-Disabler'); handleHandDisablerMessages = function(channel, message, sender) { - if (sender === MyAvatar.sessionUUID) { if (message === 'left') { handToDisable = LEFT_HAND; diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js index af914259a3..982c65fc08 100644 --- a/unpublishedScripts/hiddenEntityReset.js +++ b/unpublishedScripts/hiddenEntityReset.js @@ -241,6 +241,7 @@ 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: { @@ -649,6 +650,7 @@ z: 0.08 }, collisionsWillMove: true, + collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/flashlight_drop.L.wav", gravity: { x: 0, y: -3.5, @@ -1185,6 +1187,7 @@ z: 0.07 }, collisionsWillMove: true, + collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/SpryPntCnDrp1.L.wav", shapeType: 'box', gravity: { x: 0, diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js index 667dc3aa96..6e89e12d41 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -220,6 +220,7 @@ 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: { @@ -629,6 +630,7 @@ MasterReset = function() { z: 0.08 }, collisionsWillMove: true, + collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/flashlight_drop.L.wav", gravity: { x: 0, y: -3.5, @@ -1165,6 +1167,7 @@ MasterReset = function() { z: 0.07 }, collisionsWillMove: true, + collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/SpryPntCnDrp1.L.wav", shapeType: 'box', gravity: { x: 0, From 0fd1bdaec508c9edefc15989d4b1919065a97478 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Tue, 1 Dec 2015 17:03:11 -0800 Subject: [PATCH 2/4] fixed accidental newline in handgrab --- examples/controllers/handControllerGrab.js | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/controllers/handControllerGrab.js b/examples/controllers/handControllerGrab.js index 3902963a61..ebfa248f58 100644 --- a/examples/controllers/handControllerGrab.js +++ b/examples/controllers/handControllerGrab.js @@ -1277,6 +1277,7 @@ function update() { Messages.subscribe('Hifi-Hand-Disabler'); handleHandDisablerMessages = function(channel, message, sender) { + if (sender === MyAvatar.sessionUUID) { if (message === 'left') { handToDisable = LEFT_HAND; From 40fb45c6d39453126b94443369c4f907a2fe746a Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Tue, 1 Dec 2015 17:04:10 -0800 Subject: [PATCH 3/4] fixed accidental newline in handgrab --- examples/controllers/handControllerGrab.js | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/controllers/handControllerGrab.js b/examples/controllers/handControllerGrab.js index ebfa248f58..3902963a61 100644 --- a/examples/controllers/handControllerGrab.js +++ b/examples/controllers/handControllerGrab.js @@ -1277,7 +1277,6 @@ function update() { Messages.subscribe('Hifi-Hand-Disabler'); handleHandDisablerMessages = function(channel, message, sender) { - if (sender === MyAvatar.sessionUUID) { if (message === 'left') { handToDisable = LEFT_HAND; From 34234da2d1de9b593d92687b125df6f80625fbd1 Mon Sep 17 00:00:00 2001 From: Eric Levin Date: Tue, 1 Dec 2015 17:05:51 -0800 Subject: [PATCH 4/4] fixed spacing --- examples/controllers/handControllerGrab.js | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/controllers/handControllerGrab.js b/examples/controllers/handControllerGrab.js index 3902963a61..ebfa248f58 100644 --- a/examples/controllers/handControllerGrab.js +++ b/examples/controllers/handControllerGrab.js @@ -1277,6 +1277,7 @@ function update() { Messages.subscribe('Hifi-Hand-Disabler'); handleHandDisablerMessages = function(channel, message, sender) { + if (sender === MyAvatar.sessionUUID) { if (message === 'left') { handToDisable = LEFT_HAND;