Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more ignoreForCollisions to collisionless

Browse source
This commit is contained in:
Andrew Meadows 2016-01-18 13:40:24 -08:00
parent 7fb145e819
commit 48374ef5bc
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/example/games/exterminatorGame/pistolScriptSpawnerSpawner.js
View file

@ -7,7 +7,7 @@ var pistolSpawnerEntity = Entities.addEntity({
dimensions: {x: 0.38, y: 1.9, z: 3.02}, dimensions: {x: 0.38, y: 1.9, z: 3.02},
script: scriptURL, script: scriptURL,
visible: false, visible: false,
ignoreForCollisions: true collisionless: true
}); });
var pistol = Entities.addEntity({ var pistol = Entities.addEntity({
@ -17,7 +17,7 @@ var pistol = Entities.addEntity({
dimensions: {x: 0.38, y: 1.9, z: 3.02}, dimensions: {x: 0.38, y: 1.9, z: 3.02},
script: scriptURL, script: scriptURL,
color: {red: 200, green: 0, blue: 20}, color: {red: 200, green: 0, blue: 20},
ignoreForCollisions: true collisionless: true
}); });
@ -28,4 +28,4 @@ function cleanup() {
} }
// Script.update.connect(update); // Script.update.connect(update);
Script.scriptEnding.connect(cleanup); Script.scriptEnding.connect(cleanup);

2
unpublishedScripts/basketballsResetter.js
View file

@ -83,7 +83,7 @@ var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
}, },
dynamic: true, dynamic: true,
collisionSoundURL: basketballCollisionSoundURL, collisionSoundURL: basketballCollisionSoundURL,
ignoreForCollisions: false, collisionless: false,
modelURL: basketballURL, modelURL: basketballURL,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {

6
unpublishedScripts/hiddenEntityReset.js
View file

@ -494,7 +494,7 @@
z: 1.73 z: 1.73
}, },
dynamic: true, dynamic: true,
ignoreForCollisions: false, collisionless: false,
compoundShapeURL: rackCollisionHullURL, compoundShapeURL: rackCollisionHullURL,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
@ -543,7 +543,7 @@
}, },
dynamic: true, dynamic: true,
collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav', collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
ignoreForCollisions: false, collisionless: false,
modelURL: basketballURL, modelURL: basketballURL,
userData: JSON.stringify({ userData: JSON.stringify({
originalPositionKey: { originalPositionKey: {
@ -1523,4 +1523,4 @@
}; };
// entity scripts always need to return a newly constructed object of our type // entity scripts always need to return a newly constructed object of our type
return new ResetSwitch(); return new ResetSwitch();
}); });

6
unpublishedScripts/masterReset.js
View file

@ -478,7 +478,7 @@ MasterReset = function() {
z: 1.73 z: 1.73
}, },
dynamic: true, dynamic: true,
ignoreForCollisions: false, collisionless: false,
compoundShapeURL: rackCollisionHullURL, compoundShapeURL: rackCollisionHullURL,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
@ -528,7 +528,7 @@ MasterReset = function() {
}, },
dynamic: true, dynamic: true,
collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav', collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
ignoreForCollisions: false, collisionless: false,
modelURL: basketballURL, modelURL: basketballURL,
userData: JSON.stringify({ userData: JSON.stringify({
originalPositionKey: { originalPositionKey: {
@ -1504,4 +1504,4 @@ MasterReset = function() {
Script.scriptEnding.connect(cleanup); Script.scriptEnding.connect(cleanup);
} }
}; };