Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 08:29:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed missing brace

Browse source
This commit is contained in:
ericrius1 2015-11-30 18:29:20 -08:00
parent b67c481726
commit 880aed0e6b
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
unpublishedScripts/hiddenEntityReset.js
View file

@ -262,7 +262,6 @@
} }
>>>>>>> master
function createFire() { function createFire() {

11
unpublishedScripts/masterReset.js
View file

@ -121,8 +121,8 @@ MasterReset = function() {
z: 503.91 z: 503.91
}); });
createBow();
createBow();
} }
function deleteAllToys() { function deleteAllToys() {
@ -137,6 +137,7 @@ MasterReset = function() {
}); });
} }
function createGun(position) { function createGun(position) {
var modelURL = "https://s3.amazonaws.com/hifi-public/eric/models/gun.fbx"; var modelURL = "https://s3.amazonaws.com/hifi-public/eric/models/gun.fbx";
@ -157,7 +158,11 @@ MasterReset = function() {
blue: 20 blue: 20
}, },
shapeType: 'box', shapeType: 'box',
gravity: {x: 0, y: -5.0, z: 0}, gravity: {
x: 0,
y: -5.0,
z: 0
},
restitution: 0, restitution: 0,
collisionsWillMove: true, collisionsWillMove: true,
collisionSoundURL: "https://s3.amazonaws.com/hifi-public/sounds/Guns/Gun_Drop_and_Metalli_1.wav", collisionSoundURL: "https://s3.amazonaws.com/hifi-public/sounds/Guns/Gun_Drop_and_Metalli_1.wav",
@ -178,6 +183,7 @@ MasterReset = function() {
} }
}) })
}); });
}
function createBow() { function createBow() {
@ -232,7 +238,6 @@ MasterReset = function() {
} }
}) })
}); });
} }
function createFire() { function createFire() {