Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-23 05:03:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated build files with patched Pixi UMD statement.

Browse source
This commit is contained in:
photonstorm 2014-07-11 11:52:14 +01:00 committed by Clark Stevenson
parent e0dce49024
commit 0d3b801768
12 changed files with 80 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/custom/ninja.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
build/custom/p2.min.js vendored
View file

File diff suppressed because one or more lines are too long

22
build/custom/phaser-arcade-physics.js
View file

@ -7,7 +7,7 @@
* *
* Phaser - http://phaser.io * Phaser - http://phaser.io
* *
* v2.0.6 "Jornhill" - Built: Thu Jul 10 2014 20:17:38 * v2.1.0 "Shienar" - Built: Fri Jul 11 2014 11:53:15
* *
* By Richard Davey http://www.photonstorm.com @photonstorm * By Richard Davey http://www.photonstorm.com @photonstorm
* *
@ -11421,7 +11421,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
} }
exports.PIXI = PIXI; exports.PIXI = PIXI;
} else if (typeof define !== 'undefined' && define.amd) { } else if (typeof define !== 'undefined' && define.amd) {
define(PIXI); define('PIXI', (function() { return root.PIXI = PIXI; })() );
} else { } else {
root.PIXI = PIXI; root.PIXI = PIXI;
} }
@ -11435,7 +11435,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
* *
* Phaser - http://phaser.io * Phaser - http://phaser.io
* *
* v2.0.6 "Jornhill" - Built: Thu Jul 10 2014 20:17:38 * v2.1.0 "Shienar" - Built: Fri Jul 11 2014 11:53:15
* *
* By Richard Davey http://www.photonstorm.com @photonstorm * By Richard Davey http://www.photonstorm.com @photonstorm
* *
@ -11478,7 +11478,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
*/ */
var Phaser = Phaser || { var Phaser = Phaser || {
VERSION: '2.0.6', VERSION: '2.1.0-dev',
GAMES: [], GAMES: [],
AUTO: 0, AUTO: 0,
@ -21813,7 +21813,11 @@ Phaser.Game.prototype = {
this.pendingStep = true; this.pendingStep = true;
} }
if (this.config['enableDebug'])
{
this.debug.preUpdate(); this.debug.preUpdate();
}
this.physics.preUpdate(); this.physics.preUpdate();
this.state.preUpdate(); this.state.preUpdate();
this.plugins.preUpdate(); this.plugins.preUpdate();
@ -21834,9 +21838,12 @@ Phaser.Game.prototype = {
else else
{ {
this.state.pauseUpdate(); this.state.pauseUpdate();
// this.input.update();
if (this.config['enableDebug'])
{
this.debug.preUpdate(); this.debug.preUpdate();
} }
}
if (this.renderType != Phaser.HEADLESS) if (this.renderType != Phaser.HEADLESS)
{ {
@ -28245,7 +28252,7 @@ Phaser.InputHandler.prototype = {
this.dragOffset = new Phaser.Point(); this.dragOffset = new Phaser.Point();
this.dragFromCenter = lockCenter; this.dragFromCenter = lockCenter;
this.pixelPerfect = pixelPerfect; this.pixelPerfectClick = pixelPerfect;
this.pixelPerfectAlpha = alphaThreshold; this.pixelPerfectAlpha = alphaThreshold;
if (boundsRect) if (boundsRect)
@ -30841,6 +30848,7 @@ Phaser.Sprite.prototype.loadTexture = function (key, frame) {
} }
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key)) else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
{ {
console.warn("Texture with key '" + key + "' not found.");
this.key = '__missing'; this.key = '__missing';
this.setTexture(PIXI.TextureCache[this.key]); this.setTexture(PIXI.TextureCache[this.key]);
} }
@ -31920,6 +31928,7 @@ Phaser.Image.prototype.loadTexture = function (key, frame) {
} }
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key)) else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
{ {
console.warn("Texture with key '" + key + "' not found.");
this.key = '__missing'; this.key = '__missing';
this.setTexture(PIXI.TextureCache[this.key]); this.setTexture(PIXI.TextureCache[this.key]);
} }
@ -32733,6 +32742,7 @@ Phaser.TileSprite.prototype.loadTexture = function (key, frame) {
} }
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key)) else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
{ {
console.warn("Texture with key '" + key + "' not found.");
this.key = '__missing'; this.key = '__missing';
this.setTexture(PIXI.TextureCache[this.key]); this.setTexture(PIXI.TextureCache[this.key]);
} }

12
build/custom/phaser-arcade-physics.min.js vendored
View file

File diff suppressed because one or more lines are too long

18
build/custom/phaser-no-libs.js
View file

@ -7,7 +7,7 @@
* *
* Phaser - http://phaser.io * Phaser - http://phaser.io
* *
* v2.0.6 "Jornhill" - Built: Thu Jul 10 2014 20:17:38 * v2.1.0 "Shienar" - Built: Fri Jul 11 2014 11:53:15
* *
* By Richard Davey http://www.photonstorm.com @photonstorm * By Richard Davey http://www.photonstorm.com @photonstorm
* *
@ -50,7 +50,7 @@
*/ */
var Phaser = Phaser || { var Phaser = Phaser || {
VERSION: '2.0.6', VERSION: '2.1.0-dev',
GAMES: [], GAMES: [],
AUTO: 0, AUTO: 0,
@ -10385,7 +10385,11 @@ Phaser.Game.prototype = {
this.pendingStep = true; this.pendingStep = true;
} }
if (this.config['enableDebug'])
{
this.debug.preUpdate(); this.debug.preUpdate();
}
this.physics.preUpdate(); this.physics.preUpdate();
this.state.preUpdate(); this.state.preUpdate();
this.plugins.preUpdate(); this.plugins.preUpdate();
@ -10406,9 +10410,12 @@ Phaser.Game.prototype = {
else else
{ {
this.state.pauseUpdate(); this.state.pauseUpdate();
// this.input.update();
if (this.config['enableDebug'])
{
this.debug.preUpdate(); this.debug.preUpdate();
} }
}
if (this.renderType != Phaser.HEADLESS) if (this.renderType != Phaser.HEADLESS)
{ {
@ -16817,7 +16824,7 @@ Phaser.InputHandler.prototype = {
this.dragOffset = new Phaser.Point(); this.dragOffset = new Phaser.Point();
this.dragFromCenter = lockCenter; this.dragFromCenter = lockCenter;
this.pixelPerfect = pixelPerfect; this.pixelPerfectClick = pixelPerfect;
this.pixelPerfectAlpha = alphaThreshold; this.pixelPerfectAlpha = alphaThreshold;
if (boundsRect) if (boundsRect)
@ -19413,6 +19420,7 @@ Phaser.Sprite.prototype.loadTexture = function (key, frame) {
} }
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key)) else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
{ {
console.warn("Texture with key '" + key + "' not found.");
this.key = '__missing'; this.key = '__missing';
this.setTexture(PIXI.TextureCache[this.key]); this.setTexture(PIXI.TextureCache[this.key]);
} }
@ -20492,6 +20500,7 @@ Phaser.Image.prototype.loadTexture = function (key, frame) {
} }
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key)) else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
{ {
console.warn("Texture with key '" + key + "' not found.");
this.key = '__missing'; this.key = '__missing';
this.setTexture(PIXI.TextureCache[this.key]); this.setTexture(PIXI.TextureCache[this.key]);
} }
@ -21305,6 +21314,7 @@ Phaser.TileSprite.prototype.loadTexture = function (key, frame) {
} }
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key)) else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
{ {
console.warn("Texture with key '" + key + "' not found.");
this.key = '__missing'; this.key = '__missing';
this.setTexture(PIXI.TextureCache[this.key]); this.setTexture(PIXI.TextureCache[this.key]);
} }

18
build/custom/phaser-no-libs.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
build/custom/pixi.js
View file

@ -11391,7 +11391,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
} }
exports.PIXI = PIXI; exports.PIXI = PIXI;
} else if (typeof define !== 'undefined' && define.amd) { } else if (typeof define !== 'undefined' && define.amd) {
define(PIXI); define('PIXI', (function() { return root.PIXI = PIXI; })() );
} else { } else {
root.PIXI = PIXI; root.PIXI = PIXI;
} }

4
build/custom/pixi.min.js vendored
View file

File diff suppressed because one or more lines are too long

22
build/phaser.js
View file

@ -7,7 +7,7 @@
* *
* Phaser - http://phaser.io * Phaser - http://phaser.io
* *
* v2.0.6 "Jornhill" - Built: Thu Jul 10 2014 20:17:38 * v2.1.0 "Shienar" - Built: Fri Jul 11 2014 11:53:15
* *
* By Richard Davey http://www.photonstorm.com @photonstorm * By Richard Davey http://www.photonstorm.com @photonstorm
* *
@ -11421,7 +11421,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
} }
exports.PIXI = PIXI; exports.PIXI = PIXI;
} else if (typeof define !== 'undefined' && define.amd) { } else if (typeof define !== 'undefined' && define.amd) {
define(PIXI); define('PIXI', (function() { return root.PIXI = PIXI; })() );
} else { } else {
root.PIXI = PIXI; root.PIXI = PIXI;
} }
@ -11435,7 +11435,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
* *
* Phaser - http://phaser.io * Phaser - http://phaser.io
* *
* v2.0.6 "Jornhill" - Built: Thu Jul 10 2014 20:17:38 * v2.1.0 "Shienar" - Built: Fri Jul 11 2014 11:53:15
* *
* By Richard Davey http://www.photonstorm.com @photonstorm * By Richard Davey http://www.photonstorm.com @photonstorm
* *
@ -11478,7 +11478,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
*/ */
var Phaser = Phaser || { var Phaser = Phaser || {
VERSION: '2.0.6', VERSION: '2.1.0-dev',
GAMES: [], GAMES: [],
AUTO: 0, AUTO: 0,
@ -21813,7 +21813,11 @@ Phaser.Game.prototype = {
this.pendingStep = true; this.pendingStep = true;
} }
if (this.config['enableDebug'])
{
this.debug.preUpdate(); this.debug.preUpdate();
}
this.physics.preUpdate(); this.physics.preUpdate();
this.state.preUpdate(); this.state.preUpdate();
this.plugins.preUpdate(); this.plugins.preUpdate();
@ -21834,9 +21838,12 @@ Phaser.Game.prototype = {
else else
{ {
this.state.pauseUpdate(); this.state.pauseUpdate();
// this.input.update();
if (this.config['enableDebug'])
{
this.debug.preUpdate(); this.debug.preUpdate();
} }
}
if (this.renderType != Phaser.HEADLESS) if (this.renderType != Phaser.HEADLESS)
{ {
@ -28245,7 +28252,7 @@ Phaser.InputHandler.prototype = {
this.dragOffset = new Phaser.Point(); this.dragOffset = new Phaser.Point();
this.dragFromCenter = lockCenter; this.dragFromCenter = lockCenter;
this.pixelPerfect = pixelPerfect; this.pixelPerfectClick = pixelPerfect;
this.pixelPerfectAlpha = alphaThreshold; this.pixelPerfectAlpha = alphaThreshold;
if (boundsRect) if (boundsRect)
@ -30841,6 +30848,7 @@ Phaser.Sprite.prototype.loadTexture = function (key, frame) {
} }
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key)) else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
{ {
console.warn("Texture with key '" + key + "' not found.");
this.key = '__missing'; this.key = '__missing';
this.setTexture(PIXI.TextureCache[this.key]); this.setTexture(PIXI.TextureCache[this.key]);
} }
@ -31920,6 +31928,7 @@ Phaser.Image.prototype.loadTexture = function (key, frame) {
} }
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key)) else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
{ {
console.warn("Texture with key '" + key + "' not found.");
this.key = '__missing'; this.key = '__missing';
this.setTexture(PIXI.TextureCache[this.key]); this.setTexture(PIXI.TextureCache[this.key]);
} }
@ -32733,6 +32742,7 @@ Phaser.TileSprite.prototype.loadTexture = function (key, frame) {
} }
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key)) else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
{ {
console.warn("Texture with key '" + key + "' not found.");
this.key = '__missing'; this.key = '__missing';
this.setTexture(PIXI.TextureCache[this.key]); this.setTexture(PIXI.TextureCache[this.key]);
} }

2
build/phaser.map
View file

File diff suppressed because one or more lines are too long

12
build/phaser.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
src/pixi/Outro.js
View file

@ -8,7 +8,7 @@
} }
exports.PIXI = PIXI; exports.PIXI = PIXI;
} else if (typeof define !== 'undefined' && define.amd) { } else if (typeof define !== 'undefined' && define.amd) {
define(PIXI); define('PIXI', (function() { return root.PIXI = PIXI; })() );
} else { } else {
root.PIXI = PIXI; root.PIXI = PIXI;
} }