Emitter.setScale fixed minX minY order presedence (thanks spayton)

This commit is contained in:
photonstorm 2014-11-18 15:38:08 +00:00
parent 07d43934c6
commit aa72cf63c1
2 changed files with 2 additions and 1 deletions

View file

@ -183,6 +183,7 @@ This fixes a bug in FF where it would use the default DOMMouseWheel (thanks @pns
* Sprite.autoCull now properly works if the camera moves around the world.
* Sprite.inCamera uses a much faster check if auto culling or world bounds checks are enabled and properly adjusts for camera position.
* Camera.totalInView is a new property that contains the total number of Sprites rendered that have `autoCull` set to true and are within the Cameras view.
* Emitter.setScale fixed minX minY order presedence (thanks spayton)
### Pixi 2.1.0 New Features

View file

@ -663,7 +663,7 @@ Phaser.Particles.Arcade.Emitter.prototype.setScale = function (minX, maxX, minY,
this.autoScale = false;
if (rate > 0 && (minX !== maxX) || (minY !== maxY))
if (rate > 0 && ((minX !== maxX) || (minY !== maxY)))
{
var tweenData = { x: minX, y: minY };
var tween = this.game.make.tween(tweenData).to( { x: maxX, y: maxY }, rate, ease);