Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-20 01:49:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

added collision sounds to some toys

Browse source
This commit is contained in:
ericrius1 2015-12-01 17:00:43 -08:00
parent 948479b0e8
commit e4199439af
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/controllers/handControllerGrab.js
View file

@ -1277,7 +1277,6 @@ function update() {
Messages.subscribe('Hifi-Hand-Disabler'); Messages.subscribe('Hifi-Hand-Disabler');
handleHandDisablerMessages = function(channel, message, sender) { handleHandDisablerMessages = function(channel, message, sender) {
if (sender === MyAvatar.sessionUUID) { if (sender === MyAvatar.sessionUUID) {
if (message === 'left') { if (message === 'left') {
handToDisable = LEFT_HAND; handToDisable = LEFT_HAND;

3
unpublishedScripts/hiddenEntityReset.js
View file

@ -241,6 +241,7 @@
gravity: BOW_GRAVITY, gravity: BOW_GRAVITY,
shapeType: 'compound', shapeType: 'compound',
compoundShapeURL: COLLISION_HULL_URL, compoundShapeURL: COLLISION_HULL_URL,
collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/bow_fall.L.wav",
script: bowScriptURL, script: bowScriptURL,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
@ -649,6 +650,7 @@
z: 0.08 z: 0.08
}, },
collisionsWillMove: true, collisionsWillMove: true,
collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/flashlight_drop.L.wav",
gravity: { gravity: {
x: 0, x: 0,
y: -3.5, y: -3.5,
@ -1185,6 +1187,7 @@
z: 0.07 z: 0.07
}, },
collisionsWillMove: true, collisionsWillMove: true,
collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/SpryPntCnDrp1.L.wav",
shapeType: 'box', shapeType: 'box',
gravity: { gravity: {
x: 0, x: 0,

3
unpublishedScripts/masterReset.js
View file

@ -220,6 +220,7 @@ MasterReset = function() {
gravity: BOW_GRAVITY, gravity: BOW_GRAVITY,
shapeType: 'compound', shapeType: 'compound',
compoundShapeURL: COLLISION_HULL_URL, compoundShapeURL: COLLISION_HULL_URL,
collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/bow_fall.L.wav",
script: bowScriptURL, script: bowScriptURL,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
@ -629,6 +630,7 @@ MasterReset = function() {
z: 0.08 z: 0.08
}, },
collisionsWillMove: true, collisionsWillMove: true,
collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/flashlight_drop.L.wav",
gravity: { gravity: {
x: 0, x: 0,
y: -3.5, y: -3.5,
@ -1165,6 +1167,7 @@ MasterReset = function() {
z: 0.07 z: 0.07
}, },
collisionsWillMove: true, collisionsWillMove: true,
collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/SpryPntCnDrp1.L.wav",
shapeType: 'box', shapeType: 'box',
gravity: { gravity: {
x: 0, x: 0,