build

ippa · Jan 3, 2014 · f2b96b4 · f2b96b4
1 parent dc845d5
commit f2b96b4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/jaws-min.js b/jaws-min.js
@@ -1,2 +1,2 @@
-/* Built at 2013-10-06 21:36:05 +0200 */
+/* Built at 2014-01-03 11:51:42 +0100 */
 
diff --git a/jaws.js b/jaws.js
@@ -1,4 +1,4 @@
-/* Built at 2013-10-06 21:36:04 +0200 */
+/* Built at 2014-01-03 11:51:42 +0100 */
 /**
  * @namespace JawsJS core functions.
  *
@@ -2918,13 +2918,13 @@ var jaws = (function(jaws) {
    *   jaws.collide(bullets, enemies, function(bullet, enemy) { ... } )
    */
   jaws.collide = function(x, x2, callback) {
-    if (x.rect && x2.forEach)
+    if ((x.rect || x.radius) && x2.forEach)
       return (jaws.collideOneWithMany(x, x2, callback).length > 0);
     if (x.forEach && x2.forEach)
       return (jaws.collideManyWithMany(x, x2, callback).length > 0);
-    if (x.forEach && x2.rect)
+    if (x.forEach && (x2.rect || x2.radius))
       return (jaws.collideOneWithMany(x2, x, callback).length > 0);
-    if (x.rect && x2.rect) {
+    if ((x.rect && x2.rect) || (x.radius && x2.radius)) {
       var result = jaws.collideOneWithOne(x, x2);
       if (callback && result)
         callback(x, x2);
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		/* Built at 2013-10-06 21:36:05 +0200 */
		/* Built at 2014-01-03 11:51:42 +0100 */