Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-12 17:44:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6524 from ericrius1/toyboxSounds

Browse source 
Removed collision sound for bow and lowered restitution on flashlight and spraycan to avoid multiple bounce sounds
This commit is contained in:
Ryan Downe Karpf 2015-12-02 13:56:36 -08:00
commit 1d57f4daa8
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
unpublishedScripts/hiddenEntityReset.js
View file

@ -241,7 +241,6 @@
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: {
@ -656,6 +655,7 @@
y: -3.5, y: -3.5,
z: 0 z: 0
}, },
restitution: 0,
velocity: { velocity: {
x: 0, x: 0,
y: -0.01, y: -0.01,
@ -1189,6 +1189,7 @@
collisionsWillMove: true, collisionsWillMove: true,
collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/SpryPntCnDrp1.L.wav", collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/SpryPntCnDrp1.L.wav",
shapeType: 'box', shapeType: 'box',
restitution: 0,
gravity: { gravity: {
x: 0, x: 0,
y: -3.0, y: -3.0,

3
unpublishedScripts/masterReset.js
View file

@ -220,7 +220,6 @@ 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: {
@ -636,6 +635,7 @@ MasterReset = function() {
y: -3.5, y: -3.5,
z: 0 z: 0
}, },
restitution: 0,
velocity: { velocity: {
x: 0, x: 0,
y: -0.01, y: -0.01,
@ -1174,6 +1174,7 @@ MasterReset = function() {
y: -3.0, y: -3.0,
z: 0 z: 0
}, },
restitution: 0,
velocity: { velocity: {
x: 0, x: 0,
y: -1, y: -1,