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

Author: photonstorm

v3/src/gameobjects/tilemap/Tile.js

@@ -139,14 +139,6 @@ var Tile = new Class({
          */
         this.collideDown = false;
 
-        /**
-         * An array of collision objects from Tiled. These are defined on the tileset. Each tile
-         * just gets a references to the objects stored in the tileset, so this is readonly.
-         * @property {array|null} collisionObjects
-         * @readonly
-         */
-        this.collisionObjects = null;
-
         /**
          * Whether the tile's left edge is interesting for collisions.
          * @property {boolean} faceLeft

v3/src/gameobjects/tilemap/Tileset.js

@@ -147,6 +147,20 @@ var Tileset = new Class({
         return this.tileData[tileIndex - this.firstgid];
     },
 
+    /**
+     * Get a tile's data that is stored in the Tileset. Returns null if tile index is not
+     * contained in this Tileset.
+     *
+     * @param {integer} tileIndex - The unique id of the tile across all tilesets in the map.
+     * @returns {object|null}
+     */
+    getTileCollisionGroup: function (tileIndex)
+    {
+        var data = this.getTileData(tileIndex);
+        return (data && data.objectgroup) ? data.objectgroup : null;
+    },
+
+
     /**
      * Returns true if and only if this Tileset contains the given tile index.
      *

v3/src/gameobjects/tilemap/parsers/parsetiledjson/AssignTileProperties.js

@@ -47,17 +47,6 @@ var AssignTileProperties = function (mapData)
                         tile.properties, set.tileProperties[tile.index - set.firstgid]
                     );
                 }
-
-                // If that tile type has any collision info, add that to the tile object
-                if (set.tileData && set.tileData[tile.index - set.firstgid])
-                {
-                    var tileData = set.tileData[tile.index - set.firstgid];
-                    var objects = GetValue(tileData, 'objectgroup.objects', null);
-                    if (objects && objects.length > 0)
-                    {
-                        tile.collisionObjects = objects;
-                    }
-                }
             }
         }
     }