Skip to content

Commit a3533b9

Browse files
photonstormphotonstorm
committed
Phaser 2.2.1.
1 parent d206e3c commit a3533b9

16 files changed

+109
-109
lines changed

‎build/custom/ninja.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/p2.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/phaser-arcade-physics.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.2.0 "Bethal" - Built: Wed Dec 03 2014 09:34:03
10+
* v2.2.1 "Danabar" - Built: Thu Dec 04 2014 11:31:00
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -4782,7 +4782,7 @@ PIXI.PixiShader.defaultVertexSrc = [
47824782
'void main(void) {',
47834783
' gl_Position = vec4( ((aVertexPosition + offsetVector) / projectionVector) + center , 0.0, 1.0);',
47844784
' vTextureCoord = aTextureCoord;',
4785-
' vColor = aColor;',
4785+
' vColor = vec4(aColor.rgb * aColor.a, aColor.a);',
47864786
'}'
47874787
];
47884788
/**
@@ -7648,7 +7648,7 @@ PIXI.WebGLSpriteBatch.prototype.render = function(sprite)
76487648

76497649
// color and alpha
76507650
var tint = sprite.tint;
7651-
colors[index+4] = colors[index+9] = colors[index+14] = colors[index+19] = (tint >> 16) + (tint & 0xff00) + ((tint & 0xff) << 16) + (sprite.alpha * 255 << 24);
7651+
colors[index+4] = colors[index+9] = colors[index+14] = colors[index+19] = (tint >> 16) + (tint & 0xff00) + ((tint & 0xff) << 16) + (sprite.worldAlpha * 255 << 24);
76527652

76537653
// increment the batchsize
76547654
this.sprites[this.currentBatchSize++] = sprite;
@@ -12225,7 +12225,7 @@ PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
1222512225
*
1222612226
* Phaser - http://phaser.io
1222712227
*
12228-
* v2.2.0 "Bethal" - Built: Wed Dec 03 2014 09:34:03
12228+
* v2.2.1 "Danabar" - Built: Thu Dec 04 2014 11:31:00
1222912229
*
1223012230
* By Richard Davey http://www.photonstorm.com @photonstorm
1223112231
*
@@ -12268,7 +12268,7 @@ PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
1226812268
*/
1226912269
var Phaser = Phaser || {
1227012270

12271-
VERSION: '2.2.0',
12271+
VERSION: '2.2.1',
1227212272
GAMES: [],
1227312273

1227412274
AUTO: 0,
@@ -26250,7 +26250,7 @@ Phaser.Game.prototype = {
2625026250
}
2625126251
else
2625226252
{
26253-
this.debug = { preUpdate: function () {}, update: function () {} };
26253+
this.debug = { preUpdate: function () {}, update: function () {}, reset: function () {} };
2625426254
}
2625526255

2625626256
this.showDebugHeader();
@@ -48634,15 +48634,15 @@ Phaser.TweenManager.prototype = {
4863448634
{
4863548635
for (i = 0, len = this._tweens.length; i < len; i++)
4863648636
{
48637-
if (obj === this._tweens[i]._object)
48637+
if (obj === this._tweens[i].target)
4863848638
{
4863948639
this.remove(this._tweens[i]);
4864048640
}
4864148641
}
4864248642

4864348643
for (i = 0, len = this._add.length; i < len; i++)
4864448644
{
48645-
if (obj === this._add[i]._object)
48645+
if (obj === this._add[i].target)
4864648646
{
4864748647
this.remove(this._add[i]);
4864848648
}
@@ -48757,7 +48757,7 @@ Phaser.TweenManager.prototype = {
4875748757
isTweening: function(object) {
4875848758

4875948759
return this._tweens.some(function(tween) {
48760-
return tween._object === object;
48760+
return tween.target === object;
4876148761
});
4876248762

4876348763
},
@@ -52675,7 +52675,7 @@ Object.defineProperty(Phaser.AnimationManager.prototype, 'frame', {
5267552675

5267652676
set: function (value) {
5267752677

52678-
if (typeof value === 'number' && this._frameData.getFrame(value) !== null)
52678+
if (typeof value === 'number' && this._frameData && this._frameData.getFrame(value) !== null)
5267952679
{
5268052680
this.currentFrame = this._frameData.getFrame(value);
5268152681

‎build/custom/phaser-arcade-physics.min.js‎

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/phaser-ninja-physics.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.2.0 "Bethal" - Built: Wed Dec 03 2014 09:34:03
10+
* v2.2.1 "Danabar" - Built: Thu Dec 04 2014 11:31:00
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -4782,7 +4782,7 @@ PIXI.PixiShader.defaultVertexSrc = [
47824782
'void main(void) {',
47834783
' gl_Position = vec4( ((aVertexPosition + offsetVector) / projectionVector) + center , 0.0, 1.0);',
47844784
' vTextureCoord = aTextureCoord;',
4785-
' vColor = aColor;',
4785+
' vColor = vec4(aColor.rgb * aColor.a, aColor.a);',
47864786
'}'
47874787
];
47884788
/**
@@ -7648,7 +7648,7 @@ PIXI.WebGLSpriteBatch.prototype.render = function(sprite)
76487648

76497649
// color and alpha
76507650
var tint = sprite.tint;
7651-
colors[index+4] = colors[index+9] = colors[index+14] = colors[index+19] = (tint >> 16) + (tint & 0xff00) + ((tint & 0xff) << 16) + (sprite.alpha * 255 << 24);
7651+
colors[index+4] = colors[index+9] = colors[index+14] = colors[index+19] = (tint >> 16) + (tint & 0xff00) + ((tint & 0xff) << 16) + (sprite.worldAlpha * 255 << 24);
76527652

76537653
// increment the batchsize
76547654
this.sprites[this.currentBatchSize++] = sprite;
@@ -12225,7 +12225,7 @@ PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
1222512225
*
1222612226
* Phaser - http://phaser.io
1222712227
*
12228-
* v2.2.0 "Bethal" - Built: Wed Dec 03 2014 09:34:03
12228+
* v2.2.1 "Danabar" - Built: Thu Dec 04 2014 11:31:00
1222912229
*
1223012230
* By Richard Davey http://www.photonstorm.com @photonstorm
1223112231
*
@@ -12268,7 +12268,7 @@ PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
1226812268
*/
1226912269
var Phaser = Phaser || {
1227012270

12271-
VERSION: '2.2.0',
12271+
VERSION: '2.2.1',
1227212272
GAMES: [],
1227312273

1227412274
AUTO: 0,
@@ -26250,7 +26250,7 @@ Phaser.Game.prototype = {
2625026250
}
2625126251
else
2625226252
{
26253-
this.debug = { preUpdate: function () {}, update: function () {} };
26253+
this.debug = { preUpdate: function () {}, update: function () {}, reset: function () {} };
2625426254
}
2625526255

2625626256
this.showDebugHeader();
@@ -48634,15 +48634,15 @@ Phaser.TweenManager.prototype = {
4863448634
{
4863548635
for (i = 0, len = this._tweens.length; i < len; i++)
4863648636
{
48637-
if (obj === this._tweens[i]._object)
48637+
if (obj === this._tweens[i].target)
4863848638
{
4863948639
this.remove(this._tweens[i]);
4864048640
}
4864148641
}
4864248642

4864348643
for (i = 0, len = this._add.length; i < len; i++)
4864448644
{
48645-
if (obj === this._add[i]._object)
48645+
if (obj === this._add[i].target)
4864648646
{
4864748647
this.remove(this._add[i]);
4864848648
}
@@ -48757,7 +48757,7 @@ Phaser.TweenManager.prototype = {
4875748757
isTweening: function(object) {
4875848758

4875948759
return this._tweens.some(function(tween) {
48760-
return tween._object === object;
48760+
return tween.target === object;
4876148761
});
4876248762

4876348763
},
@@ -52675,7 +52675,7 @@ Object.defineProperty(Phaser.AnimationManager.prototype, 'frame', {
5267552675

5267652676
set: function (value) {
5267752677

52678-
if (typeof value === 'number' && this._frameData.getFrame(value) !== null)
52678+
if (typeof value === 'number' && this._frameData && this._frameData.getFrame(value) !== null)
5267952679
{
5268052680
this.currentFrame = this._frameData.getFrame(value);
5268152681

‎build/custom/phaser-ninja-physics.min.js‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/phaser-no-libs.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.2.0 "Bethal" - Built: Wed Dec 03 2014 09:34:03
10+
* v2.2.1 "Danabar" - Built: Thu Dec 04 2014 11:31:00
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -50,7 +50,7 @@
5050
*/
5151
var Phaser = Phaser || {
5252

53-
VERSION: '2.2.0',
53+
VERSION: '2.2.1',
5454
GAMES: [],
5555

5656
AUTO: 0,
@@ -14032,7 +14032,7 @@ Phaser.Game.prototype = {
1403214032
}
1403314033
else
1403414034
{
14035-
this.debug = { preUpdate: function () {}, update: function () {} };
14035+
this.debug = { preUpdate: function () {}, update: function () {}, reset: function () {} };
1403614036
}
1403714037

1403814038
this.showDebugHeader();
@@ -36416,15 +36416,15 @@ Phaser.TweenManager.prototype = {
3641636416
{
3641736417
for (i = 0, len = this._tweens.length; i < len; i++)
3641836418
{
36419-
if (obj === this._tweens[i]._object)
36419+
if (obj === this._tweens[i].target)
3642036420
{
3642136421
this.remove(this._tweens[i]);
3642236422
}
3642336423
}
3642436424

3642536425
for (i = 0, len = this._add.length; i < len; i++)
3642636426
{
36427-
if (obj === this._add[i]._object)
36427+
if (obj === this._add[i].target)
3642836428
{
3642936429
this.remove(this._add[i]);
3643036430
}
@@ -36539,7 +36539,7 @@ Phaser.TweenManager.prototype = {
3653936539
isTweening: function(object) {
3654036540

3654136541
return this._tweens.some(function(tween) {
36542-
return tween._object === object;
36542+
return tween.target === object;
3654336543
});
3654436544

3654536545
},
@@ -40457,7 +40457,7 @@ Object.defineProperty(Phaser.AnimationManager.prototype, 'frame', {
4045740457

4045840458
set: function (value) {
4045940459

40460-
if (typeof value === 'number' && this._frameData.getFrame(value) !== null)
40460+
if (typeof value === 'number' && this._frameData && this._frameData.getFrame(value) !== null)
4046140461
{
4046240462
this.currentFrame = this._frameData.getFrame(value);
4046340463

‎build/custom/phaser-no-libs.min.js‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/phaser-no-physics.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.2.0 "Bethal" - Built: Wed Dec 03 2014 09:34:03
10+
* v2.2.1 "Danabar" - Built: Thu Dec 04 2014 11:31:00
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -4782,7 +4782,7 @@ PIXI.PixiShader.defaultVertexSrc = [
47824782
'void main(void) {',
47834783
' gl_Position = vec4( ((aVertexPosition + offsetVector) / projectionVector) + center , 0.0, 1.0);',
47844784
' vTextureCoord = aTextureCoord;',
4785-
' vColor = aColor;',
4785+
' vColor = vec4(aColor.rgb * aColor.a, aColor.a);',
47864786
'}'
47874787
];
47884788
/**
@@ -7648,7 +7648,7 @@ PIXI.WebGLSpriteBatch.prototype.render = function(sprite)
76487648

76497649
// color and alpha
76507650
var tint = sprite.tint;
7651-
colors[index+4] = colors[index+9] = colors[index+14] = colors[index+19] = (tint >> 16) + (tint & 0xff00) + ((tint & 0xff) << 16) + (sprite.alpha * 255 << 24);
7651+
colors[index+4] = colors[index+9] = colors[index+14] = colors[index+19] = (tint >> 16) + (tint & 0xff00) + ((tint & 0xff) << 16) + (sprite.worldAlpha * 255 << 24);
76527652

76537653
// increment the batchsize
76547654
this.sprites[this.currentBatchSize++] = sprite;
@@ -12238,7 +12238,7 @@ PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
1223812238
*/
1223912239
var Phaser = Phaser || {
1224012240

12241-
VERSION: '2.2.0',
12241+
VERSION: '2.2.1',
1224212242
GAMES: [],
1224312243

1224412244
AUTO: 0,
@@ -26220,7 +26220,7 @@ Phaser.Game.prototype = {
2622026220
}
2622126221
else
2622226222
{
26223-
this.debug = { preUpdate: function () {}, update: function () {} };
26223+
this.debug = { preUpdate: function () {}, update: function () {}, reset: function () {} };
2622426224
}
2622526225

2622626226
this.showDebugHeader();
@@ -48604,15 +48604,15 @@ Phaser.TweenManager.prototype = {
4860448604
{
4860548605
for (i = 0, len = this._tweens.length; i < len; i++)
4860648606
{
48607-
if (obj === this._tweens[i]._object)
48607+
if (obj === this._tweens[i].target)
4860848608
{
4860948609
this.remove(this._tweens[i]);
4861048610
}
4861148611
}
4861248612

4861348613
for (i = 0, len = this._add.length; i < len; i++)
4861448614
{
48615-
if (obj === this._add[i]._object)
48615+
if (obj === this._add[i].target)
4861648616
{
4861748617
this.remove(this._add[i]);
4861848618
}
@@ -48727,7 +48727,7 @@ Phaser.TweenManager.prototype = {
4872748727
isTweening: function(object) {
4872848728

4872948729
return this._tweens.some(function(tween) {
48730-
return tween._object === object;
48730+
return tween.target === object;
4873148731
});
4873248732

4873348733
},
@@ -52645,7 +52645,7 @@ Object.defineProperty(Phaser.AnimationManager.prototype, 'frame', {
5264552645

5264652646
set: function (value) {
5264752647

52648-
if (typeof value === 'number' && this._frameData.getFrame(value) !== null)
52648+
if (typeof value === 'number' && this._frameData && this._frameData.getFrame(value) !== null)
5264952649
{
5265052650
this.currentFrame = this._frameData.getFrame(value);
5265152651

‎build/custom/phaser-no-physics.min.js‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)