Merge branch 'master' of https://github.com/photonstorm/phaser

Author: photonstorm

src/cameras/2d/BaseCamera.js

@@ -727,11 +727,12 @@ var BaseCamera = new Class({
             var ty = (objectX * mvb + objectY * mvd + mvf);
             var tw = ((objectX + objectW) * mva + (objectY + objectH) * mvc + mve);
             var th = ((objectX + objectW) * mvb + (objectY + objectH) * mvd + mvf);
-            var cullW = cameraW + objectW;
-            var cullH = cameraH + objectH;
+            var cullTop = this.y;
+            var cullBottom = cullTop + cameraH;
+            var cullLeft = this.x;
+            var cullRight = cullLeft + cameraW;
 
-            if (tx > -objectW && ty > -objectH && tx < cullW && ty < cullH &&
-                tw > -objectW && th > -objectH && tw < cullW && th < cullH)
+            if ((tw > cullLeft && tx < cullRight) && (th > cullTop && ty < cullBottom))
             {
                 culledObjects.push(object);
             }

src/physics/arcade/PhysicsGroup.js

@@ -121,6 +121,14 @@ var PhysicsGroup = new Class({
                 singleConfig.removeCallback = this.removeCallbackHandler;
             });
         }
+        else
+        {
+            // config is not defined and children is not a plain object nor an array of plain objects
+            config = {
+                createCallback: this.createCallbackHandler,
+                removeCallback: this.removeCallbackHandler
+            }
+        }
 
         /**
          * The physics simulation.

src/textures/parsers/SpriteSheetFromAtlas.js

@@ -117,27 +117,33 @@ var SpriteSheetFromAtlas = function (texture, frame, config)
             {
                 var destX = (leftRow) ? leftPad : 0;
                 var destY = (topRow) ? topPad : 0;
-                var destWidth = frameWidth;
-                var destHeight = frameHeight;
+
+                var trimWidth = 0;
+                var trimHeight = 0;
 
                 if (leftRow)
                 {
-                    destWidth = leftWidth;
+                    trimWidth += (frameWidth - leftWidth);
                 }
-                else if (rightRow)
+
+                if (rightRow)
                 {
-                    destWidth = rightWidth;
+                    trimWidth += (frameWidth - rightWidth);
                 }
 
                 if (topRow)
                 {
-                    destHeight = topHeight;
+                    trimHeight += (frameHeight - topHeight);
                 }
-                else if (bottomRow)
+
+                if (bottomRow)
                 {
-                    destHeight = bottomHeight;
+                    trimHeight += (frameHeight - bottomHeight);
                 }
 
+                var destWidth = frameWidth - trimWidth;
+                var destHeight = frameHeight - trimHeight;
+
                 sheetFrame.cutWidth = destWidth;
                 sheetFrame.cutHeight = destHeight;
 
@@ -152,7 +158,7 @@ var SpriteSheetFromAtlas = function (texture, frame, config)
             }
             else if (rightRow)
             {
-                frameX += rightRow;
+                frameX += rightWidth;
             }
             else
             {

src/tilemaps/components/CullTiles.js

@@ -71,15 +71,15 @@ var CullTiles = function (layer, camera, outputArray, renderOrder)
 
         for (y = drawTop; y < drawBottom; y++)
         {
-            for (x = drawLeft; x < drawRight; x++)
+            for (x = drawLeft; mapData[y] && x < drawRight; x++)
             {
                 tile = mapData[y][x];
-    
+
                 if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
                 {
                     continue;
                 }
-    
+
                 outputArray.push(tile);
             }
         }
@@ -90,15 +90,15 @@ var CullTiles = function (layer, camera, outputArray, renderOrder)
 
         for (y = drawTop; y < drawBottom; y++)
         {
-            for (x = drawRight; x >= drawLeft; x--)
+            for (x = drawRight; mapData[y] && x >= drawLeft; x--)
             {
                 tile = mapData[y][x];
-    
+
                 if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
                 {
                     continue;
                 }
-    
+
                 outputArray.push(tile);
             }
         }
@@ -109,15 +109,15 @@ var CullTiles = function (layer, camera, outputArray, renderOrder)
 
         for (y = drawBottom; y >= drawTop; y--)
         {
-            for (x = drawLeft; x < drawRight; x++)
+            for (x = drawLeft; mapData[y] && x < drawRight; x++)
             {
                 tile = mapData[y][x];
-    
+
                 if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
                 {
                     continue;
                 }
-    
+
                 outputArray.push(tile);
             }
         }
@@ -128,15 +128,15 @@ var CullTiles = function (layer, camera, outputArray, renderOrder)
 
         for (y = drawBottom; y >= drawTop; y--)
         {
-            for (x = drawRight; x >= drawLeft; x--)
+            for (x = drawRight; mapData[y] && x >= drawLeft; x--)
             {
                 tile = mapData[y][x];
-    
+
                 if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
                 {
                     continue;
                 }
-    
+
                 outputArray.push(tile);
             }
         }

src/tilemaps/parsers/tiled/ParseTilesets.js

@@ -78,6 +78,16 @@ var ParseTilesets = function (json)
                                 tiles[tile.id].objectgroup.objects = parsedObjects2;
                             }
                         }
+
+                        // Copy animation data
+                        if(tile.animation) {
+                            if(tiles.hasOwnProperty(tile.id)){
+                                tiles[tile.id].animation = tile.animation;
+                            }
+                            else {
+                                tiles[tile.id] = { animation: tile.animation };
+                            }
+                        }
                     }
 
                     newSet.tileData = tiles;