From 48374ef5bc1ca9d80b10127c4c235ea9cdfaff5d Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 18 Jan 2016 13:40:24 -0800
Subject: [PATCH] more ignoreForCollisions to collisionless

---
 .../games/exterminatorGame/pistolScriptSpawnerSpawner.js    | 6 +++---
 unpublishedScripts/basketballsResetter.js                   | 2 +-
 unpublishedScripts/hiddenEntityReset.js                     | 6 +++---
 unpublishedScripts/masterReset.js                           | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/example/games/exterminatorGame/pistolScriptSpawnerSpawner.js b/examples/example/games/exterminatorGame/pistolScriptSpawnerSpawner.js
index 099deea652..1967e5dc23 100644
--- a/examples/example/games/exterminatorGame/pistolScriptSpawnerSpawner.js
+++ b/examples/example/games/exterminatorGame/pistolScriptSpawnerSpawner.js
@@ -7,7 +7,7 @@ var pistolSpawnerEntity = Entities.addEntity({
     dimensions: {x: 0.38, y: 1.9, z: 3.02},
     script: scriptURL,
     visible: false,
-    ignoreForCollisions: true
+    collisionless: true
 });
 
 var pistol = Entities.addEntity({
@@ -17,7 +17,7 @@ var pistol = Entities.addEntity({
     dimensions: {x: 0.38, y: 1.9, z: 3.02},
     script: scriptURL,
     color: {red: 200, green: 0, blue: 20},
-    ignoreForCollisions: true
+    collisionless: true
 });
 
 
@@ -28,4 +28,4 @@ function cleanup() {
 }
 
 // Script.update.connect(update);
-Script.scriptEnding.connect(cleanup);
\ No newline at end of file
+Script.scriptEnding.connect(cleanup);
diff --git a/unpublishedScripts/basketballsResetter.js b/unpublishedScripts/basketballsResetter.js
index e4938a2b79..76cc4e8331 100644
--- a/unpublishedScripts/basketballsResetter.js
+++ b/unpublishedScripts/basketballsResetter.js
@@ -83,7 +83,7 @@ var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
                     },
                     dynamic: true,
                     collisionSoundURL: basketballCollisionSoundURL,
-                    ignoreForCollisions: false,
+                    collisionless: false,
                     modelURL: basketballURL,
                     userData: JSON.stringify({
                         resetMe: {
diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index ec50264811..78aab78d61 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -494,7 +494,7 @@
                     z: 1.73
                 },
                 dynamic: true,
-                ignoreForCollisions: false,
+                collisionless: false,
                 compoundShapeURL: rackCollisionHullURL,
                 userData: JSON.stringify({
                     resetMe: {
@@ -543,7 +543,7 @@
                         },
                         dynamic: true,
                         collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
-                        ignoreForCollisions: false,
+                        collisionless: false,
                         modelURL: basketballURL,
                         userData: JSON.stringify({
                             originalPositionKey: {
@@ -1523,4 +1523,4 @@
     };
     // entity scripts always need to return a newly constructed object of our type
     return new ResetSwitch();
-});
\ No newline at end of file
+});
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index 72074da5f1..b3a9d49ea3 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -478,7 +478,7 @@ MasterReset = function() {
                 z: 1.73
             },
             dynamic: true,
-            ignoreForCollisions: false,
+            collisionless: false,
             compoundShapeURL: rackCollisionHullURL,
             userData: JSON.stringify({
                 resetMe: {
@@ -528,7 +528,7 @@ MasterReset = function() {
                     },
                     dynamic: true,
                     collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
-                    ignoreForCollisions: false,
+                    collisionless: false,
                     modelURL: basketballURL,
                     userData: JSON.stringify({
                         originalPositionKey: {
@@ -1504,4 +1504,4 @@ MasterReset = function() {
 
         Script.scriptEnding.connect(cleanup);
     }
-};
\ No newline at end of file
+};