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

Author: photonstorm

src/gameobjects/GameObject.js

@@ -378,7 +378,7 @@ var GameObject = new Class({
     {
         if (this.input)
         {
-            this.input.enabled = (this.input.enabled) ? false : true;
+            this.input.enabled = false;
         }
 
         return this;

src/gameobjects/particles/ParticleEmitter.js

@@ -635,7 +635,7 @@ var ParticleEmitter = new Class({
         /**
          * Controls if the emitter is currently emitting a particle flow (when frequency >= 0).
          * Already alive particles will continue to update until they expire.
-         * Controlled by {@link Phaser.GameObjects.Particles.ParticleEmitter#start}.
+         * Controlled by {@link Phaser.GameObjects.Particles.ParticleEmitter#start} and {@link Phaser.GameObjects.Particles.ParticleEmitter#stop}.
          *
          * @name Phaser.GameObjects.Particles.ParticleEmitter#on
          * @type {boolean}
@@ -1862,6 +1862,21 @@ var ParticleEmitter = new Class({
         return this;
     },
 
+    /**
+     * Turns {@link Phaser.GameObjects.Particles.ParticleEmitter#on off} the emitter.
+     *
+     * @method Phaser.GameObjects.Particles.ParticleEmitter#stop
+     * @since 3.11.0
+     *
+     * @return {Phaser.GameObjects.Particles.ParticleEmitter} This Particle Emitter.
+     */
+    stop: function ()
+    {
+        this.on = false;
+
+        return this;
+    },
+
     /**
      * {@link Phaser.GameObjects.Particles.ParticleEmitter#active Deactivates} the emitter.
      *

src/tilemaps/components/CullTiles.js

@@ -70,8 +70,10 @@ var CullTiles = function (layer, camera, outputArray)
                 continue;
             }
 
-            var tileX = tile.pixelX * a + tile.pixelY * c + e;
-            var tileY = tile.pixelX * b + tile.pixelY * d + f;
+            var tilePixelX = (tile.pixelX + tilemapLayer.x);
+            var tilePixelY = (tile.pixelY + tilemapLayer.y);
+            var tileX = (tilePixelX * a + tilePixelY * c + e);
+            var tileY = (tilePixelX * b + tilePixelY * d + f);
 
             if (tile.visible &&
                 tileX >= tCullX &&