Skip to content

Commit 486153d

Browse files
photonstormphotonstorm
committed
Patching back into 2.0.4 master release a couple of important updates.
1 parent 55dc748 commit 486153d

11 files changed

Lines changed: 73 additions & 34 deletions

‎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.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14149,7 +14149,7 @@ Phaser.Physics.P2.Body.prototype = {
1414914149
*/
1415014150
applyForce: function (force, worldX, worldY) {
1415114151

14152-
this.data.applyForce(force, [this.world.pxm(worldX), this.world.pxm(worldY)]);
14152+
this.data.applyForce(force, [this.world.pxmi(worldX), this.world.pxmi(worldY)]);
1415314153

1415414154
},
1415514155

@@ -16334,7 +16334,7 @@ Phaser.Physics.P2.RevoluteConstraint = function (world, bodyA, pivotA, bodyB, pi
1633416334
pivotA = [ world.pxmi(pivotA[0]), world.pxmi(pivotA[1]) ];
1633516335
pivotB = [ world.pxmi(pivotB[0]), world.pxmi(pivotB[1]) ];
1633616336

16337-
p2.RevoluteConstraint.call(this, bodyA, pivotA, bodyB, pivotB, maxForce);
16337+
p2.RevoluteConstraint.call(this, bodyA, pivotA, bodyB, pivotB, {maxForce: maxForce});
1633816338

1633916339
};
1634016340

‎build/custom/p2.min.js‎

Lines changed: 3 additions & 3 deletions
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: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.0.4 "Mos Shirare" - Built: Tue Apr 29 2014 15:39:24
10+
* v2.0.5 "Tanchico" - Built: Tue Apr 29 2014 21:59:33
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -9764,7 +9764,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
97649764
*
97659765
* Phaser - http://phaser.io
97669766
*
9767-
* v2.0.4 "Mos Shirare" - Built: Tue Apr 29 2014 15:39:24
9767+
* v2.0.5 "Tanchico" - Built: Tue Apr 29 2014 21:59:33
97689768
*
97699769
* By Richard Davey http://www.photonstorm.com @photonstorm
97709770
*
@@ -9807,7 +9807,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
98079807
*/
98089808
var Phaser = Phaser || {
98099809

9810-
VERSION: '2.0.4',
9810+
VERSION: '2.0.5',
98119811
GAMES: [],
98129812

98139813
AUTO: 0,
@@ -18534,6 +18534,12 @@ Phaser.ScaleManager = function (game, width, height) {
1853418534
*/
1853518535
this._height = 0;
1853618536

18537+
/**
18538+
* @property {number} _check - Cached size interval var.
18539+
* @private
18540+
*/
18541+
this._check = null;
18542+
1853718543
var _this = this;
1853818544

1853918545
window.addEventListener('orientationchange', function (event) {
@@ -52719,7 +52725,14 @@ Phaser.Tilemap.prototype = {
5271952725

5272052726
if (x >= 0 && x < this.layers[layer].width && y >= 0 && y < this.layers[layer].height)
5272152727
{
52722-
return this.layers[layer].data[y][x];
52728+
if (this.layers[layer].data[y][x].index === -1)
52729+
{
52730+
return null;
52731+
}
52732+
else
52733+
{
52734+
return this.layers[layer].data[y][x];
52735+
}
5272352736
}
5272452737

5272552738
},

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

Lines changed: 4 additions & 4 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: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.0.4 "Mos Shirare" - Built: Tue Apr 29 2014 15:39:24
10+
* v2.0.5 "Tanchico" - Built: Tue Apr 29 2014 21:59:33
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -50,7 +50,7 @@
5050
*/
5151
var Phaser = Phaser || {
5252

53-
VERSION: '2.0.4',
53+
VERSION: '2.0.5',
5454
GAMES: [],
5555

5656
AUTO: 0,
@@ -8777,6 +8777,12 @@ Phaser.ScaleManager = function (game, width, height) {
87778777
*/
87788778
this._height = 0;
87798779

8780+
/**
8781+
* @property {number} _check - Cached size interval var.
8782+
* @private
8783+
*/
8784+
this._check = null;
8785+
87808786
var _this = this;
87818787

87828788
window.addEventListener('orientationchange', function (event) {
@@ -42962,7 +42968,14 @@ Phaser.Tilemap.prototype = {
4296242968

4296342969
if (x >= 0 && x < this.layers[layer].width && y >= 0 && y < this.layers[layer].height)
4296442970
{
42965-
return this.layers[layer].data[y][x];
42971+
if (this.layers[layer].data[y][x].index === -1)
42972+
{
42973+
return null;
42974+
}
42975+
else
42976+
{
42977+
return this.layers[layer].data[y][x];
42978+
}
4296642979
}
4296742980

4296842981
},

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

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

‎build/custom/pixi.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/phaser.js‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.0.4 "Mos Shirare" - Built: Tue Apr 29 2014 15:39:24
10+
* v2.0.5 "Tanchico" - Built: Tue Apr 29 2014 21:59:33
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -9764,7 +9764,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
97649764
*
97659765
* Phaser - http://phaser.io
97669766
*
9767-
* v2.0.4 "Mos Shirare" - Built: Tue Apr 29 2014 15:39:24
9767+
* v2.0.5 "Tanchico" - Built: Tue Apr 29 2014 21:59:33
97689768
*
97699769
* By Richard Davey http://www.photonstorm.com @photonstorm
97709770
*
@@ -9807,7 +9807,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
98079807
*/
98089808
var Phaser = Phaser || {
98099809

9810-
VERSION: '2.0.4',
9810+
VERSION: '2.0.5',
98119811
GAMES: [],
98129812

98139813
AUTO: 0,
@@ -18534,6 +18534,12 @@ Phaser.ScaleManager = function (game, width, height) {
1853418534
*/
1853518535
this._height = 0;
1853618536

18537+
/**
18538+
* @property {number} _check - Cached size interval var.
18539+
* @private
18540+
*/
18541+
this._check = null;
18542+
1853718543
var _this = this;
1853818544

1853918545
window.addEventListener('orientationchange', function (event) {
@@ -52719,7 +52725,14 @@ Phaser.Tilemap.prototype = {
5271952725

5272052726
if (x >= 0 && x < this.layers[layer].width && y >= 0 && y < this.layers[layer].height)
5272152727
{
52722-
return this.layers[layer].data[y][x];
52728+
if (this.layers[layer].data[y][x].index === -1)
52729+
{
52730+
return null;
52731+
}
52732+
else
52733+
{
52734+
return this.layers[layer].data[y][x];
52735+
}
5272352736
}
5272452737

5272552738
},
@@ -74327,7 +74340,7 @@ Phaser.Physics.P2.Body.prototype = {
7432774340
*/
7432874341
applyForce: function (force, worldX, worldY) {
7432974342

74330-
this.data.applyForce(force, [this.world.pxm(worldX), this.world.pxm(worldY)]);
74343+
this.data.applyForce(force, [this.world.pxmi(worldX), this.world.pxmi(worldY)]);
7433174344

7433274345
},
7433374346

@@ -76512,7 +76525,7 @@ Phaser.Physics.P2.RevoluteConstraint = function (world, bodyA, pivotA, bodyB, pi
7651276525
pivotA = [ world.pxmi(pivotA[0]), world.pxmi(pivotA[1]) ];
7651376526
pivotB = [ world.pxmi(pivotB[0]), world.pxmi(pivotB[1]) ];
7651476527

76515-
p2.RevoluteConstraint.call(this, bodyA, pivotA, bodyB, pivotB, maxForce);
76528+
p2.RevoluteConstraint.call(this, bodyA, pivotA, bodyB, pivotB, {maxForce: maxForce});
7651676529

7651776530
};
7651876531

‎build/phaser.map‎

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

0 commit comments

Comments
 (0)