From 7a3443968d5547a0e69c9384c41373390344f845 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Tue, 16 Feb 2016 15:55:11 -0800
Subject: [PATCH] added collides with property

---
 examples/html/entityProperties.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index 4b4c5a398e..1dfd5643bc 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -264,6 +264,7 @@
                 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");
@@ -482,6 +483,7 @@
                                 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;
@@ -703,6 +705,7 @@
                 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'));
@@ -1386,6 +1389,13 @@
             </span>
         </div>
 
+        <div class="property">
+            <div class="label">collidesWith</div>
+            <div class="value">
+                <input id="property-collides-with">
+            </div>
+        </div>        
+
         <div class="property">
             <div class="label">Collision Sound URL</div>
             <div class="value">