Merge remote-tracking branch 'origin/master'

Author: pavle-goloskokovic

.github/CONTRIBUTING.md

@@ -1,10 +1,10 @@
-#How to contribute
+# How to contribute
 
 It's important to us that you feel you can contribute towards the evolution of Phaser. This can take many forms: from helping to fix bugs or improve the docs, to adding in new features to the source. This guide should help you in making that process as smooth as possible.
 
 Before contributing, please read the [code of conduct](https://github.com/photonstorm/phaser/blob/master/v2/CODE_OF_CONDUCT.md).
 
-##Reporting issues
+## Reporting issues
 
 [GitHub Issues][0] is the place to report bugs you may have found. When submitting a bug please do the following:
 
@@ -19,12 +19,12 @@ Before contributing, please read the [code of conduct](https://github.com/photon
 **5. Share as much information as possible.** Include browser version affected, your OS, version of the library, steps to reproduce, etc. "X isn't working!!!1!" will probably just be closed.
 
 
-##Pixi and Phaser
+## Pixi and Phaser
 
 It's important to understand that internally Phaser 2 uses a heavily customized version of [Pixi.js v2](https://github.com/GoodBoyDigital/pixi.js/) for all rendering. It's possible you may find a bug that is generated on the Pixi level rather than Phaser. You're welcome to still report the issue of course, but if you get a reply saying we think it might be a Pixi issue, this is what we're talking about :)
 
 
-##Support Forum
+## Support Forum
 
 We have a very active [Phaser Support Forum][4]. If you need general support, or are struggling to understand how to do something or need your code checked over, then we would urge you to post it to our forum. There are a lot of friendly devs in there who can help, as well as the core Phaser and Pixi teams, so it's a great place to get support from. You're welcome to report bugs directly on GitHub, but for general support we'd always recommend using the forum first.
 
@@ -47,17 +47,17 @@ make your changes and submit a Pull Request:
 - **Only commit relevant changes.** Don't include changes that are not directly relevant to the fix you are making. The more focused a PR is, the faster it will get attention and be merged. Extra files changing only whitespace or trash files will likely get your PR closed.
 
 
-##Coding style preferences are not contributions
+## Coding style preferences are not contributions
 
 If your PR is doing little more than changing the Phaser source code into a format / coding style that you prefer then we will automatically close it. All PRs must adhere to the coding style already set-out across the thousands of lines of code in Phaser. Your personal preferences for how things should "look" or be structured do not apply here, sorry. PRs should fix bugs, fix documentation or add features. No changes for the sake of change.
 
 
-##I don't really like git / node.js, but I can fix this bug
+## I don't really like git / node.js, but I can fix this bug
 
 That is fine too. While Pull Requests are the best thing in the world for us, they are not the only way to help. You're welcome to post fixes to our forum or even just email them to us. All we ask is that you still adhere to the guidelines presented here re: JSHint, etc.
 
 
-##Code Style Guide
+## Code Style Guide
 
 - Use 4 spaces for tabs, never tab characters.
 

src/camera/3d/Camera3D.js

@@ -298,7 +298,7 @@ var Camera3D = new Class({
             dir.set(x, y, z);
         }
 
-        dir.sub(this.position).normalize();
+        dir.subtract(this.position).normalize();
 
         //  Calculate right vector
         tmpVec3.copy(dir).cross(up).normalize();
@@ -319,7 +319,7 @@ var Camera3D = new Class({
 
     rotateAround: function (point, radians, axis)
     {
-        tmpVec3.copy(point).sub(this.position);
+        tmpVec3.copy(point).subtract(this.position);
 
         this.translate(tmpVec3);
         this.rotate(radians, axis);
@@ -391,7 +391,7 @@ var Camera3D = new Class({
 
         direction.unproject(viewport, mtx);
 
-        direction.sub(origin).normalize();
+        direction.subtract(origin).normalize();
 
         return this.ray;
     },
@@ -419,7 +419,7 @@ var Camera3D = new Class({
         var dir = dirvec.set(this.direction).negate();
 
         // Better view-aligned billboards might use this:
-        // var dir = tmp.set(camera.position).sub(p).normalize();
+        // var dir = tmp.set(camera.position).subtract(p).normalize();
 
         var right = rightvec.set(this.up).cross(dir).normalize();
         var up = tmpVec3.set(dir).cross(right).normalize();

src/curves/curve/inc/GetTangent.js

@@ -39,7 +39,7 @@ var GetTangent = function (t, out)
     this.getPoint(t1, this._tmpVec2A);
     this.getPoint(t2, out);
 
-    return out.sub(this._tmpVec2A).normalize();
+    return out.subtract(this._tmpVec2A).normalize();
 };
 
 module.exports = GetTangent;

src/curves/line/LineCurve.js

@@ -59,7 +59,7 @@ var LineCurve = new Class({
             return out.copy(this.p1);
         }
 
-        out.copy(this.p1).sub(this.p0).scale(t).add(this.p0);
+        out.copy(this.p1).subtract(this.p0).scale(t).add(this.p0);
 
         return out;
     },
@@ -72,7 +72,7 @@ var LineCurve = new Class({
 
     getTangent: function ()
     {
-        var tangent = tmpVec2.copy(this.p1).sub(this.p0);
+        var tangent = tmpVec2.copy(this.p1).subtract(this.p0);
 
         return tangent.normalize();
     },

src/curves/path/inc/EllipseTo.js

@@ -26,7 +26,7 @@ var EllipseTo = function (xRadius, yRadius, startAngle, endAngle, clockwise, rot
     //  Calculate where to center the ellipse
     var start = ellipse.getStartPoint(this._tmpVec2B);
 
-    end.sub(start);
+    end.subtract(start);
 
     ellipse.x = end.x;
     ellipse.y = end.y;

src/input/keyboard/combo/KeyComboMatchEvent.js

@@ -11,9 +11,7 @@ var KeyComboMatchEvent = new Class({
     {
         Event.call(this, 'KEY_COMBO_MATCH_EVENT');
 
-        this.target = keyCombo;
-
-        this.data = keyboardEvent;
+        this.data = keyCombo;
     }
 
 });

src/math/Quaternion.js

@@ -168,7 +168,7 @@ var Quaternion = new Class({
 
         if (dot < -0.999999)
         {
-            if (tmpvec.copy(xUnitVec3).cross(a).len() < EPSILON)
+            if (tmpvec.copy(xUnitVec3).cross(a).length() < EPSILON)
             {
                 tmpvec.copy(yUnitVec3).cross(a);
             }

src/physics/arcade/inc/CollideGroupVsTilemapLayer.js

@@ -1,8 +1,25 @@
 var CollideGroupVsTilemapLayer = function (group, tilemapLayer, collideCallback, processCallback, callbackContext, overlapOnly)
 {
-    // TODO
+    var children = group.getChildren();
 
-    return false;
+    if (children.length === 0)
+    {
+        return false;
+    }
+
+    var didCollide = false;
+
+    for (var i = 0; i < children.length; i++)
+    {
+        if (children[i].body)
+        {
+            if (this.collideSpriteVsTilemapLayer(children[i], tilemapLayer, collideCallback, processCallback, callbackContext, overlapOnly)) {
+                didCollide = true;
+            }
+        }
+    }
+
+    return didCollide;
 };
 
 module.exports = CollideGroupVsTilemapLayer;

src/physics/arcade/inc/CollideHandler.js

@@ -9,51 +9,51 @@ var CollideHandler = function (object1, object2, collideCallback, processCallbac
     //  If neither of the objects are set then bail out
     if (!object1 || !object2)
     {
-        return;
+        return false;
     }
 
     //  A Body
     if (object1.body)
     {
         if (object2.body)
         {
-            this.collideSpriteVsSprite(object1, object2, collideCallback, processCallback, callbackContext, overlapOnly);
+            return this.collideSpriteVsSprite(object1, object2, collideCallback, processCallback, callbackContext, overlapOnly);
         }
         else if (object2.isParent)
         {
-            this.collideSpriteVsGroup(object1, object2, collideCallback, processCallback, callbackContext, overlapOnly);
+            return this.collideSpriteVsGroup(object1, object2, collideCallback, processCallback, callbackContext, overlapOnly);
         }
         else if (object2.isTilemap)
         {
-            this.collideSpriteVsTilemapLayer(object1, object2, collideCallback, processCallback, callbackContext, overlapOnly);
+            return this.collideSpriteVsTilemapLayer(object1, object2, collideCallback, processCallback, callbackContext, overlapOnly);
         }
     }
     //  GROUPS
     else if (object1.isParent)
     {
         if (object2.body)
         {
-            this.collideSpriteVsGroup(object2, object1, collideCallback, processCallback, callbackContext, overlapOnly);
+            return this.collideSpriteVsGroup(object2, object1, collideCallback, processCallback, callbackContext, overlapOnly);
         }
         else if (object2.isParent)
         {
-            this.collideGroupVsGroup(object1, object2, collideCallback, processCallback, callbackContext, overlapOnly);
+            return this.collideGroupVsGroup(object1, object2, collideCallback, processCallback, callbackContext, overlapOnly);
         }
         else if (object2.isTilemap)
         {
-            this.collideGroupVsTilemapLayer(object1, object2, collideCallback, processCallback, callbackContext, overlapOnly);
+            return this.collideGroupVsTilemapLayer(object1, object2, collideCallback, processCallback, callbackContext, overlapOnly);
         }
     }
     //  TILEMAP LAYERS
     else if (object1.isTilemap)
     {
         if (object2.body)
         {
-            this.collideSpriteVsTilemapLayer(object2, object1, collideCallback, processCallback, callbackContext, overlapOnly);
+            return this.collideSpriteVsTilemapLayer(object2, object1, collideCallback, processCallback, callbackContext, overlapOnly);
         }
         else if (object2.isParent)
         {
-            this.collideGroupVsTilemapLayer(object2, object1, collideCallback, processCallback, callbackContext, overlapOnly);
+            return this.collideGroupVsTilemapLayer(object2, object1, collideCallback, processCallback, callbackContext, overlapOnly);
         }
     }
 };