Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-16 22:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6342 from imgntn/bballsounds

Browse source 
Add Collision Sounds to Basketballs in Toybox
This commit is contained in:
Ryan Downe Karpf 2015-11-09 09:07:39 -08:00
commit 78228da64a
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
unpublishedScripts/basketballsResetter.js
View file

@ -82,7 +82,7 @@ var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
z: 0
},
collisionsWillMove: true,
collisionsSoundURL: basketballCollisionSoundURL,
collisionSoundURL: basketballCollisionSoundURL,
ignoreForCollisions: false,
modelURL: basketballURL,
userData: JSON.stringify({

3
unpublishedScripts/hiddenEntityReset.js
View file

@ -308,6 +308,7 @@
z: 0
},
collisionsWillMove: true,
collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
ignoreForCollisions: false,
modelURL: basketballURL,
userData: JSON.stringify({
@ -1258,4 +1259,4 @@
};
// entity scripts always need to return a newly constructed object of our type
return new ResetSwitch();
});
});

9
unpublishedScripts/masterReset.js
View file

@ -248,7 +248,7 @@ MasterReset = function() {
},
grabbableKey: {
grabbable: false,
wantsTrigger:true
wantsTrigger: true
}
})
});
@ -289,6 +289,7 @@ MasterReset = function() {
z: 0
},
collisionsWillMove: true,
collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
ignoreForCollisions: false,
modelURL: basketballURL,
userData: JSON.stringify({
@ -334,7 +335,7 @@ MasterReset = function() {
name: "Basketball Resetter",
script: basketballResetterScriptURL,
dimensions: dimensions,
visible:false,
visible: false,
userData: JSON.stringify({
resetMe: {
resetMe: true
@ -367,7 +368,7 @@ MasterReset = function() {
name: "Target Resetter",
script: targetsResetterScriptURL,
dimensions: dimensions,
visible:false,
visible: false,
userData: JSON.stringify({
resetMe: {
resetMe: true
@ -1238,4 +1239,4 @@ MasterReset = function() {
Script.scriptEnding.connect(cleanup);
}
};
};