From 168fb67d675971e9133d76de8ba26db9b5f3fc77 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Tue, 16 Feb 2016 18:19:12 -0800
Subject: [PATCH] making collidesWith a checkbox

---
 examples/html/entityProperties.html | 49 ++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index 1dfd5643bc..c4a46d2fa5 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -264,7 +264,6 @@
                 var elCollisionless = document.getElementById("property-collisionless");
                 var elDynamic = document.getElementById("property-dynamic" );
                 var elCollisionSoundURL = document.getElementById("property-collision-sound-url");
-                var elCollidesWith = document.getElementById("property-collides-with");
                 var elLifetime = document.getElementById("property-lifetime");
                 var elScriptURL = document.getElementById("property-script-url");
                 var elScriptTimestamp = document.getElementById("property-script-timestamp");
@@ -483,7 +482,6 @@
                                 elCollisionless.checked = properties.collisionless;
                                 elDynamic.checked = properties.dynamic;
                                 elCollisionSoundURL.value = properties.collisionSoundURL;
-                                elCollidesWith.value = properties.collidesWith;
                                 elLifetime.value = properties.lifetime;
                                 elScriptURL.value = properties.script;
                                 elScriptTimestamp.value = properties.scriptTimestamp;
@@ -705,7 +703,6 @@
                 elCollisionless.addEventListener('change', createEmitCheckedPropertyUpdateFunction('collisionless'));
                 elDynamic.addEventListener('change', createEmitCheckedPropertyUpdateFunction('dynamic'));
                 elCollisionSoundURL.addEventListener('change', createEmitTextPropertyUpdateFunction('collisionSoundURL'));
-                elCollidesWith.addEventListener('change', createEmitTextPropertyUpdateFunction('collidesWith'));
     
                 elLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('lifetime'));
                 elScriptURL.addEventListener('change', createEmitTextPropertyUpdateFunction('script'));
@@ -1389,12 +1386,48 @@
             </span>
         </div>
 
-        <div class="property">
-            <div class="label">collidesWith</div>
-            <div class="value">
-                <input id="property-collides-with">
+        <div>
+            <div> collidesWith </div>
+
+            <div class="property">
+              <span class="label">Static</span>
+              <span class="value">
+                <input type='checkbox' id="property-collide-static">
+              </span>
             </div>
-        </div>        
+
+            <div class="property">
+              <span class="label">dynamic</span>
+              <span class="value">
+                <input type='checkbox' id="property-collide-dynamic">
+              </span>
+            </div>
+
+            <div class="property">
+              <span class="label">kinematic</span>
+              <span class="value">
+                <input type='checkbox' id="property-collide-kinematic">
+              </span>
+            </div>
+
+            <div class="property">
+              <span class="label">myAvatar</span>
+              <span class="value">
+                <input type='checkbox' id="property-collide-myAvatar">
+              </span>
+            </div>
+
+            <div class="property">
+              <span class="label">otherAvatar</span>
+              <span class="value">
+                <input type='checkbox' id="property-collide-otherAvatar">
+              </span>
+            </div>
+
+
+
+
+        </div>
 
         <div class="property">
             <div class="label">Collision Sound URL</div>