repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 31fd8e9c29400cf7212f53a52d4665b4148c8769:
path_to: 
revision_to: 

commit 31fd8e9c29400cf7212f53a52d4665b4148c8769
Author: James Baicoianu 
Date:   Mon Feb 13 04:59:33 2017 -0800

    Prevent default collision response if collision_trigger is set

diff --git a/scripts/janusbase.js b/scripts/janusbase.js

--- a/scripts/janusbase.js
+++ b/scripts/janusbase.js
@@ -295,6 +295,11 @@ elation.require(['engine.things.generic', 'utils.template'], function() {
           var proxy = other.getProxyObject();
           //console.log('I collided', proxy, this);
           elation.events.fire({type: 'collision', element: this, data: proxy});
+
+          if (proxy.collision_trigger) {
+            ev.preventDefault();
+            ev.stopPropagation();
+          }
         } else {
 console.error('dunno what this is', other);
         }

-----END OF PAGE-----