Merge remote-tracking branch 'origin/dev'

Author: photonstorm

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## Version 2.2.1 - "Danabar" - 4th December 2014
+
+### Bug Fixes
+
+* Fixed Pixi.js issue with `alpha` not working on any display object.
+* Fixed TweenManager.isTweening() and .removeFrom() (thanks @jotson #1408)
+* Added Game.debug reset method for when the debug manager is disabled (thanks @DanielSitarz #1407)
+* Custom Particle classes that used a BitmapData wouldn't work (thanks @hardalias #1402)
+
 ## Version 2.2.0 - "Bethal" - 3rd December 2014
 
 ### New Features

README.md

@@ -21,11 +21,11 @@
 - [License](#license)
 
 <a name="about"></a>
-# Phaser 2.2.0
+# Phaser 2.2.1
 
 Phaser is a fast, free and fun open source game framework for making desktop and mobile browser HTML5 games. It uses [Pixi.js](https://github.com/GoodBoyDigital/pixi.js/) internally for fast 2D Canvas and WebGL rendering.
 
-Version: 2.2.0 "Bethal" - Released: 3rd December 2014
+Version: 2.2.1 "Danabar" - Released: 4th December 2014
 
 By Richard Davey, [Photon Storm](http://www.photonstorm.com)
 
@@ -43,7 +43,7 @@ By Richard Davey, [Photon Storm](http://www.photonstorm.com)
 ![div](http://phaser.io/images/div4.png)
 
 <a name="whats-new"></a>
-## Welcome to Phaser and What's new in 2.2.0?
+## Welcome to Phaser and What's new in 2.2.1?
 
 One of the nicest and most surprising things about a truly open-source project like Phaser is that you never know who might jump on for the ride. I've been extremely lucky with the support I've received over the years - fellow developers both fixing bugs and reporting issues, all helping to make Phaser  stronger as a result.
 
@@ -85,7 +85,16 @@ Finally the list of [community authored Phaser Tutorials](http://www.lessmilk.co
 <a name="change-log"></a>
 ## Change Log
 
-Version 2.2.0 - "Bethal" - 3rd December 2014
+Version 2.2.1 - "Danabar" - 4th December 2014
+
+### Bug Fixes
+
+* Fixed Pixi.js issue with `alpha` not working on any display object.
+* Fixed TweenManager.isTweening() and .removeFrom() (thanks @jotson #1408)
+* Added Game.debug reset method for when the debug manager is disabled (thanks @DanielSitarz #1407)
+* Custom Particle classes that used a BitmapData wouldn't work (thanks @hardalias #1402)
+
+## Version 2.2.0 - "Bethal" - 3rd December 2014
 
 ### New Features
 
@@ -350,11 +359,11 @@ Nice and easy :)
 
 Phaser is now available on [CDNJS](http://cdnjs.com). You can include the following in your html:
 
-`http://cdnjs.cloudflare.com/ajax/libs/phaser/2.2.0/phaser.min.js`
+`http://cdnjs.cloudflare.com/ajax/libs/phaser/2.2.1/phaser.min.js`
 
 Or if you prefer you can leave the protocol off, so it works via http and https:
 
-`//cdnjs.cloudflare.com/ajax/libs/phaser/2.2.0/phaser.min.js`
+`//cdnjs.cloudflare.com/ajax/libs/phaser/2.2.1/phaser.min.js`
 
 ![div](http://phaser.io/images/div1.png)
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "phaser",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "homepage": "http://phaser.io",
   "authors": [
     "photonstorm <rich@photonstorm.com>"

build/custom/ninja.min.js

@@ -7,7 +7,7 @@
 *
 * Phaser - http://phaser.io
 *
-* v2.2.0 "Bethal" - Built: Wed Dec 03 2014 09:34:03
+* v2.2.1 "Danabar" - Built: Thu Dec 04 2014 11:31:00
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *
@@ -4782,7 +4782,7 @@ PIXI.PixiShader.defaultVertexSrc = [
     'void main(void) {',
     '   gl_Position = vec4( ((aVertexPosition + offsetVector) / projectionVector) + center , 0.0, 1.0);',
     '   vTextureCoord = aTextureCoord;',
-    '   vColor = aColor;',
+    '   vColor = vec4(aColor.rgb * aColor.a, aColor.a);',
     '}'
 ];
 /**
@@ -7648,7 +7648,7 @@ PIXI.WebGLSpriteBatch.prototype.render = function(sprite)
 
     // color and alpha
     var tint = sprite.tint;
-    colors[index+4] = colors[index+9] = colors[index+14] = colors[index+19] = (tint >> 16) + (tint & 0xff00) + ((tint & 0xff) << 16) + (sprite.alpha * 255 << 24);
+    colors[index+4] = colors[index+9] = colors[index+14] = colors[index+19] = (tint >> 16) + (tint & 0xff00) + ((tint & 0xff) << 16) + (sprite.worldAlpha * 255 << 24);
 
     // increment the batchsize
     this.sprites[this.currentBatchSize++] = sprite;
@@ -12225,7 +12225,7 @@ PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
 *
 * Phaser - http://phaser.io
 *
-* v2.2.0 "Bethal" - Built: Wed Dec 03 2014 09:34:03
+* v2.2.1 "Danabar" - Built: Thu Dec 04 2014 11:31:00
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *
@@ -12268,7 +12268,7 @@ PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
 */
 var Phaser = Phaser || {
 
-	VERSION: '2.2.0',
+	VERSION: '2.2.1',
 	GAMES: [],
 
     AUTO: 0,
@@ -26250,7 +26250,7 @@ Phaser.Game.prototype = {
         }
         else
         {
-            this.debug = { preUpdate: function () {}, update: function () {} };
+            this.debug = { preUpdate: function () {}, update: function () {}, reset: function () {} };
         }
 
         this.showDebugHeader();
@@ -48634,15 +48634,15 @@ Phaser.TweenManager.prototype = {
         {
             for (i = 0, len = this._tweens.length; i < len; i++)
             {
-                if (obj === this._tweens[i]._object)
+                if (obj === this._tweens[i].target)
                 {
                     this.remove(this._tweens[i]);
                 }
             }
 
             for (i = 0, len = this._add.length; i < len; i++)
             {
-                if (obj === this._add[i]._object)
+                if (obj === this._add[i].target)
                 {
                     this.remove(this._add[i]);
                 }
@@ -48757,7 +48757,7 @@ Phaser.TweenManager.prototype = {
     isTweening: function(object) {
 
         return this._tweens.some(function(tween) {
-            return tween._object === object;
+            return tween.target === object;
         });
 
     },
@@ -52675,7 +52675,7 @@ Object.defineProperty(Phaser.AnimationManager.prototype, 'frame', {
 
     set: function (value) {
 
-        if (typeof value === 'number' && this._frameData.getFrame(value) !== null)
+        if (typeof value === 'number' && this._frameData && this._frameData.getFrame(value) !== null)
         {
             this.currentFrame = this._frameData.getFrame(value);
 

build/custom/p2.min.js

@@ -7,7 +7,7 @@
 *
 * Phaser - http://phaser.io
 *
-* v2.2.0 "Bethal" - Built: Wed Dec 03 2014 09:34:03
+* v2.2.1 "Danabar" - Built: Thu Dec 04 2014 11:31:00
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *
@@ -4782,7 +4782,7 @@ PIXI.PixiShader.defaultVertexSrc = [
     'void main(void) {',
     '   gl_Position = vec4( ((aVertexPosition + offsetVector) / projectionVector) + center , 0.0, 1.0);',
     '   vTextureCoord = aTextureCoord;',
-    '   vColor = aColor;',
+    '   vColor = vec4(aColor.rgb * aColor.a, aColor.a);',
     '}'
 ];
 /**
@@ -7648,7 +7648,7 @@ PIXI.WebGLSpriteBatch.prototype.render = function(sprite)
 
     // color and alpha
     var tint = sprite.tint;
-    colors[index+4] = colors[index+9] = colors[index+14] = colors[index+19] = (tint >> 16) + (tint & 0xff00) + ((tint & 0xff) << 16) + (sprite.alpha * 255 << 24);
+    colors[index+4] = colors[index+9] = colors[index+14] = colors[index+19] = (tint >> 16) + (tint & 0xff00) + ((tint & 0xff) << 16) + (sprite.worldAlpha * 255 << 24);
 
     // increment the batchsize
     this.sprites[this.currentBatchSize++] = sprite;
@@ -12225,7 +12225,7 @@ PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
 *
 * Phaser - http://phaser.io
 *
-* v2.2.0 "Bethal" - Built: Wed Dec 03 2014 09:34:03
+* v2.2.1 "Danabar" - Built: Thu Dec 04 2014 11:31:00
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *
@@ -12268,7 +12268,7 @@ PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
 */
 var Phaser = Phaser || {
 
-	VERSION: '2.2.0',
+	VERSION: '2.2.1',
 	GAMES: [],
 
     AUTO: 0,
@@ -26250,7 +26250,7 @@ Phaser.Game.prototype = {
         }
         else
         {
-            this.debug = { preUpdate: function () {}, update: function () {} };
+            this.debug = { preUpdate: function () {}, update: function () {}, reset: function () {} };
         }
 
         this.showDebugHeader();
@@ -48634,15 +48634,15 @@ Phaser.TweenManager.prototype = {
         {
             for (i = 0, len = this._tweens.length; i < len; i++)
             {
-                if (obj === this._tweens[i]._object)
+                if (obj === this._tweens[i].target)
                 {
                     this.remove(this._tweens[i]);
                 }
             }
 
             for (i = 0, len = this._add.length; i < len; i++)
             {
-                if (obj === this._add[i]._object)
+                if (obj === this._add[i].target)
                 {
                     this.remove(this._add[i]);
                 }
@@ -48757,7 +48757,7 @@ Phaser.TweenManager.prototype = {
     isTweening: function(object) {
 
         return this._tweens.some(function(tween) {
-            return tween._object === object;
+            return tween.target === object;
         });
 
     },
@@ -52675,7 +52675,7 @@ Object.defineProperty(Phaser.AnimationManager.prototype, 'frame', {
 
     set: function (value) {
 
-        if (typeof value === 'number' && this._frameData.getFrame(value) !== null)
+        if (typeof value === 'number' && this._frameData && this._frameData.getFrame(value) !== null)
         {
             this.currentFrame = this._frameData.getFrame(value);
 

build/custom/phaser-arcade-physics.js

@@ -7,7 +7,7 @@
 *
 * Phaser - http://phaser.io
 *
-* v2.2.0 "Bethal" - Built: Wed Dec 03 2014 09:34:03
+* v2.2.1 "Danabar" - Built: Thu Dec 04 2014 11:31:00
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *
@@ -50,7 +50,7 @@
 */
 var Phaser = Phaser || {
 
-	VERSION: '2.2.0',
+	VERSION: '2.2.1',
 	GAMES: [],
 
     AUTO: 0,
@@ -14032,7 +14032,7 @@ Phaser.Game.prototype = {
         }
         else
         {
-            this.debug = { preUpdate: function () {}, update: function () {} };
+            this.debug = { preUpdate: function () {}, update: function () {}, reset: function () {} };
         }
 
         this.showDebugHeader();
@@ -36416,15 +36416,15 @@ Phaser.TweenManager.prototype = {
         {
             for (i = 0, len = this._tweens.length; i < len; i++)
             {
-                if (obj === this._tweens[i]._object)
+                if (obj === this._tweens[i].target)
                 {
                     this.remove(this._tweens[i]);
                 }
             }
 
             for (i = 0, len = this._add.length; i < len; i++)
             {
-                if (obj === this._add[i]._object)
+                if (obj === this._add[i].target)
                 {
                     this.remove(this._add[i]);
                 }
@@ -36539,7 +36539,7 @@ Phaser.TweenManager.prototype = {
     isTweening: function(object) {
 
         return this._tweens.some(function(tween) {
-            return tween._object === object;
+            return tween.target === object;
         });
 
     },
@@ -40457,7 +40457,7 @@ Object.defineProperty(Phaser.AnimationManager.prototype, 'frame', {
 
     set: function (value) {
 
-        if (typeof value === 'number' && this._frameData.getFrame(value) !== null)
+        if (typeof value === 'number' && this._frameData && this._frameData.getFrame(value) !== null)
         {
             this.currentFrame = this._frameData.getFrame(value);