Skip to content

Commit ded5eac

Browse files
photonstormphotonstorm
committed
Updated build files with patched Pixi UMD statement.
1 parent 7467992 commit ded5eac

12 files changed

Lines changed: 80 additions & 50 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.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: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.0.6 "Jornhill" - Built: Thu Jul 10 2014 20:17:38
10+
* v2.1.0 "Shienar" - Built: Fri Jul 11 2014 11:53:15
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -11421,7 +11421,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
1142111421
}
1142211422
exports.PIXI = PIXI;
1142311423
} else if (typeof define !== 'undefined' && define.amd) {
11424-
define(PIXI);
11424+
define('PIXI', (function() { return root.PIXI = PIXI; })() );
1142511425
} else {
1142611426
root.PIXI = PIXI;
1142711427
}
@@ -11435,7 +11435,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
1143511435
*
1143611436
* Phaser - http://phaser.io
1143711437
*
11438-
* v2.0.6 "Jornhill" - Built: Thu Jul 10 2014 20:17:38
11438+
* v2.1.0 "Shienar" - Built: Fri Jul 11 2014 11:53:15
1143911439
*
1144011440
* By Richard Davey http://www.photonstorm.com @photonstorm
1144111441
*
@@ -11478,7 +11478,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
1147811478
*/
1147911479
var Phaser = Phaser || {
1148011480

11481-
VERSION: '2.0.6',
11481+
VERSION: '2.1.0-dev',
1148211482
GAMES: [],
1148311483

1148411484
AUTO: 0,
@@ -21813,7 +21813,11 @@ Phaser.Game.prototype = {
2181321813
this.pendingStep = true;
2181421814
}
2181521815

21816-
this.debug.preUpdate();
21816+
if (this.config['enableDebug'])
21817+
{
21818+
this.debug.preUpdate();
21819+
}
21820+
2181721821
this.physics.preUpdate();
2181821822
this.state.preUpdate();
2181921823
this.plugins.preUpdate();
@@ -21834,8 +21838,11 @@ Phaser.Game.prototype = {
2183421838
else
2183521839
{
2183621840
this.state.pauseUpdate();
21837-
// this.input.update();
21838-
this.debug.preUpdate();
21841+
21842+
if (this.config['enableDebug'])
21843+
{
21844+
this.debug.preUpdate();
21845+
}
2183921846
}
2184021847

2184121848
if (this.renderType != Phaser.HEADLESS)
@@ -28245,7 +28252,7 @@ Phaser.InputHandler.prototype = {
2824528252
this.dragOffset = new Phaser.Point();
2824628253
this.dragFromCenter = lockCenter;
2824728254

28248-
this.pixelPerfect = pixelPerfect;
28255+
this.pixelPerfectClick = pixelPerfect;
2824928256
this.pixelPerfectAlpha = alphaThreshold;
2825028257

2825128258
if (boundsRect)
@@ -30841,6 +30848,7 @@ Phaser.Sprite.prototype.loadTexture = function (key, frame) {
3084130848
}
3084230849
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
3084330850
{
30851+
console.warn("Texture with key '" + key + "' not found.");
3084430852
this.key = '__missing';
3084530853
this.setTexture(PIXI.TextureCache[this.key]);
3084630854
}
@@ -31920,6 +31928,7 @@ Phaser.Image.prototype.loadTexture = function (key, frame) {
3192031928
}
3192131929
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
3192231930
{
31931+
console.warn("Texture with key '" + key + "' not found.");
3192331932
this.key = '__missing';
3192431933
this.setTexture(PIXI.TextureCache[this.key]);
3192531934
}
@@ -32733,6 +32742,7 @@ Phaser.TileSprite.prototype.loadTexture = function (key, frame) {
3273332742
}
3273432743
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
3273532744
{
32745+
console.warn("Texture with key '" + key + "' not found.");
3273632746
this.key = '__missing';
3273732747
this.setTexture(PIXI.TextureCache[this.key]);
3273832748
}

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

Lines changed: 6 additions & 6 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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.0.6 "Jornhill" - Built: Thu Jul 10 2014 20:17:38
10+
* v2.1.0 "Shienar" - Built: Fri Jul 11 2014 11:53:15
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.6',
53+
VERSION: '2.1.0-dev',
5454
GAMES: [],
5555

5656
AUTO: 0,
@@ -10385,7 +10385,11 @@ Phaser.Game.prototype = {
1038510385
this.pendingStep = true;
1038610386
}
1038710387

10388-
this.debug.preUpdate();
10388+
if (this.config['enableDebug'])
10389+
{
10390+
this.debug.preUpdate();
10391+
}
10392+
1038910393
this.physics.preUpdate();
1039010394
this.state.preUpdate();
1039110395
this.plugins.preUpdate();
@@ -10406,8 +10410,11 @@ Phaser.Game.prototype = {
1040610410
else
1040710411
{
1040810412
this.state.pauseUpdate();
10409-
// this.input.update();
10410-
this.debug.preUpdate();
10413+
10414+
if (this.config['enableDebug'])
10415+
{
10416+
this.debug.preUpdate();
10417+
}
1041110418
}
1041210419

1041310420
if (this.renderType != Phaser.HEADLESS)
@@ -16817,7 +16824,7 @@ Phaser.InputHandler.prototype = {
1681716824
this.dragOffset = new Phaser.Point();
1681816825
this.dragFromCenter = lockCenter;
1681916826

16820-
this.pixelPerfect = pixelPerfect;
16827+
this.pixelPerfectClick = pixelPerfect;
1682116828
this.pixelPerfectAlpha = alphaThreshold;
1682216829

1682316830
if (boundsRect)
@@ -19413,6 +19420,7 @@ Phaser.Sprite.prototype.loadTexture = function (key, frame) {
1941319420
}
1941419421
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
1941519422
{
19423+
console.warn("Texture with key '" + key + "' not found.");
1941619424
this.key = '__missing';
1941719425
this.setTexture(PIXI.TextureCache[this.key]);
1941819426
}
@@ -20492,6 +20500,7 @@ Phaser.Image.prototype.loadTexture = function (key, frame) {
2049220500
}
2049320501
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
2049420502
{
20503+
console.warn("Texture with key '" + key + "' not found.");
2049520504
this.key = '__missing';
2049620505
this.setTexture(PIXI.TextureCache[this.key]);
2049720506
}
@@ -21305,6 +21314,7 @@ Phaser.TileSprite.prototype.loadTexture = function (key, frame) {
2130521314
}
2130621315
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
2130721316
{
21317+
console.warn("Texture with key '" + key + "' not found.");
2130821318
this.key = '__missing';
2130921319
this.setTexture(PIXI.TextureCache[this.key]);
2131021320
}

‎build/custom/phaser-no-libs.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.

‎build/custom/pixi.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11391,7 +11391,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
1139111391
}
1139211392
exports.PIXI = PIXI;
1139311393
} else if (typeof define !== 'undefined' && define.amd) {
11394-
define(PIXI);
11394+
define('PIXI', (function() { return root.PIXI = PIXI; })() );
1139511395
} else {
1139611396
root.PIXI = PIXI;
1139711397
}

‎build/custom/pixi.min.js‎

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

‎build/phaser.js‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.0.6 "Jornhill" - Built: Thu Jul 10 2014 20:17:38
10+
* v2.1.0 "Shienar" - Built: Fri Jul 11 2014 11:53:15
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -11421,7 +11421,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
1142111421
}
1142211422
exports.PIXI = PIXI;
1142311423
} else if (typeof define !== 'undefined' && define.amd) {
11424-
define(PIXI);
11424+
define('PIXI', (function() { return root.PIXI = PIXI; })() );
1142511425
} else {
1142611426
root.PIXI = PIXI;
1142711427
}
@@ -11435,7 +11435,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
1143511435
*
1143611436
* Phaser - http://phaser.io
1143711437
*
11438-
* v2.0.6 "Jornhill" - Built: Thu Jul 10 2014 20:17:38
11438+
* v2.1.0 "Shienar" - Built: Fri Jul 11 2014 11:53:15
1143911439
*
1144011440
* By Richard Davey http://www.photonstorm.com @photonstorm
1144111441
*
@@ -11478,7 +11478,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
1147811478
*/
1147911479
var Phaser = Phaser || {
1148011480

11481-
VERSION: '2.0.6',
11481+
VERSION: '2.1.0-dev',
1148211482
GAMES: [],
1148311483

1148411484
AUTO: 0,
@@ -21813,7 +21813,11 @@ Phaser.Game.prototype = {
2181321813
this.pendingStep = true;
2181421814
}
2181521815

21816-
this.debug.preUpdate();
21816+
if (this.config['enableDebug'])
21817+
{
21818+
this.debug.preUpdate();
21819+
}
21820+
2181721821
this.physics.preUpdate();
2181821822
this.state.preUpdate();
2181921823
this.plugins.preUpdate();
@@ -21834,8 +21838,11 @@ Phaser.Game.prototype = {
2183421838
else
2183521839
{
2183621840
this.state.pauseUpdate();
21837-
// this.input.update();
21838-
this.debug.preUpdate();
21841+
21842+
if (this.config['enableDebug'])
21843+
{
21844+
this.debug.preUpdate();
21845+
}
2183921846
}
2184021847

2184121848
if (this.renderType != Phaser.HEADLESS)
@@ -28245,7 +28252,7 @@ Phaser.InputHandler.prototype = {
2824528252
this.dragOffset = new Phaser.Point();
2824628253
this.dragFromCenter = lockCenter;
2824728254

28248-
this.pixelPerfect = pixelPerfect;
28255+
this.pixelPerfectClick = pixelPerfect;
2824928256
this.pixelPerfectAlpha = alphaThreshold;
2825028257

2825128258
if (boundsRect)
@@ -30841,6 +30848,7 @@ Phaser.Sprite.prototype.loadTexture = function (key, frame) {
3084130848
}
3084230849
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
3084330850
{
30851+
console.warn("Texture with key '" + key + "' not found.");
3084430852
this.key = '__missing';
3084530853
this.setTexture(PIXI.TextureCache[this.key]);
3084630854
}
@@ -31920,6 +31928,7 @@ Phaser.Image.prototype.loadTexture = function (key, frame) {
3192031928
}
3192131929
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
3192231930
{
31931+
console.warn("Texture with key '" + key + "' not found.");
3192331932
this.key = '__missing';
3192431933
this.setTexture(PIXI.TextureCache[this.key]);
3192531934
}
@@ -32733,6 +32742,7 @@ Phaser.TileSprite.prototype.loadTexture = function (key, frame) {
3273332742
}
3273432743
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
3273532744
{
32745+
console.warn("Texture with key '" + key + "' not found.");
3273632746
this.key = '__missing';
3273732747
this.setTexture(PIXI.TextureCache[this.key]);
3273832748
}

‎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)