Skip to content

Commit 76accf4

Browse files
photonstormphotonstorm
committed
New build of Phaser 2.4.
1 parent d2bcb35 commit 76accf4

12 files changed

Lines changed: 95 additions & 55 deletions

‎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.4.0 "Katar" - Built: Mon May 18 2015 12:54:55
10+
* v2.4.0 "Katar" - Built: Tue May 19 2015 14:19:52
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -37947,7 +37947,7 @@ Phaser.Rope = function (game, x, y, key, frame, points) {
3794737947
*/
3794837948
this._scroll = new Phaser.Point();
3794937949

37950-
PIXI.Rope.call(this, key, this.points);
37950+
PIXI.Rope.call(this, PIXI.TextureCache['__default'], this.points);
3795137951

3795237952
Phaser.Component.Core.init.call(this, game, x, y, key, frame);
3795337953

@@ -43473,6 +43473,12 @@ Phaser.Device = function () {
4347343473
*/
4347443474
this.firefox = false;
4347543475

43476+
/**
43477+
* @property {number} firefoxVersion - If running in Firefox this will contain the major version number.
43478+
* @default
43479+
*/
43480+
this.firefoxVersion = 0;
43481+
4347643482
/**
4347743483
* @property {boolean} ie - Set to true if running in Internet Explorer.
4347843484
* @default
@@ -44058,9 +44064,10 @@ Phaser.Device._initialize = function () {
4405844064
{
4405944065
device.epiphany = true;
4406044066
}
44061-
else if (/Firefox/.test(ua))
44067+
else if (/Firefox\D+(\d+)/.test(ua))
4406244068
{
4406344069
device.firefox = true;
44070+
device.firefoxVersion = parseInt(RegExp.$1, 10);
4406444071
}
4406544072
else if (/AppleWebKit/.test(ua) && device.iOS)
4406644073
{
@@ -44431,7 +44438,7 @@ Phaser.Device.canPlayVideo = function (type) {
4443144438
{
4443244439
return true;
4443344440
}
44434-
else if (type === 'mp4' && this.mp4Video)
44441+
else if (type === 'mp4' && (this.mp4Video || this.h264Video))
4443544442
{
4443644443
return true;
4443744444
}
@@ -52190,7 +52197,6 @@ Phaser.Animation.prototype = {
5219052197
// And what's left now?
5219152198
this._timeNextFrame = this.game.time.time + (this.delay - this._frameDiff);
5219252199

52193-
var fi = this._frameIndex;
5219452200
this._frameIndex += this._frameSkip;
5219552201

5219652202
if (this._frameIndex >= this._frames.length)
@@ -52246,7 +52252,7 @@ Phaser.Animation.prototype = {
5224652252
{
5224752253
this.currentFrame = this._frameData.getFrame(this._frames[this._frameIndex]);
5224852254

52249-
if (this.currentFrame && idx !== this.currentFrame.index)
52255+
if (this.currentFrame)
5225052256
{
5225152257
this._parent.setFrame(this.currentFrame);
5225252258
}
@@ -56987,10 +56993,15 @@ Phaser.Loader.prototype = {
5698756993
* @method Phaser.Loader#transformUrl
5698856994
* @protected
5698956995
* @param {string} url - The url to transform
56990-
* @return {string} The transformed url
56996+
* @return {string} The transformed url. In rare cases where the url isn't specified it will return false instead.
5699156997
*/
5699256998
transformUrl: function (url) {
5699356999

57000+
if (!url)
57001+
{
57002+
return false;
57003+
}
57004+
5699457005
if (url.substr(0, 4) === 'http' || url.substr(0, 2) === '//')
5699557006
{
5699657007
return url;
@@ -57184,7 +57195,6 @@ Phaser.Loader.prototype = {
5718457195
};
5718557196

5718657197
file.data.onerror = function () {
57187-
// file.data.removeEventListener('canplay', playThroughEvent, false);
5718857198
file.data.removeEventListener('canplaythrough', playThroughEvent, false);
5718957199
file.data.removeEventListener('loadeddata', playThroughEvent, false);
5719057200
file.data.onerror = null;

‎build/custom/phaser-arcade-physics.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.

‎build/custom/phaser-arcade-physics.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-minimum.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.4.0 "Katar" - Built: Mon May 18 2015 12:55:12
10+
* v2.4.0 "Katar" - Built: Tue May 19 2015 14:20:08
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -35455,7 +35455,7 @@ Phaser.Rope = function (game, x, y, key, frame, points) {
3545535455
*/
3545635456
this._scroll = new Phaser.Point();
3545735457

35458-
PIXI.Rope.call(this, key, this.points);
35458+
PIXI.Rope.call(this, PIXI.TextureCache['__default'], this.points);
3545935459

3546035460
Phaser.Component.Core.init.call(this, game, x, y, key, frame);
3546135461

@@ -36680,6 +36680,12 @@ Phaser.Device = function () {
3668036680
*/
3668136681
this.firefox = false;
3668236682

36683+
/**
36684+
* @property {number} firefoxVersion - If running in Firefox this will contain the major version number.
36685+
* @default
36686+
*/
36687+
this.firefoxVersion = 0;
36688+
3668336689
/**
3668436690
* @property {boolean} ie - Set to true if running in Internet Explorer.
3668536691
* @default
@@ -37265,9 +37271,10 @@ Phaser.Device._initialize = function () {
3726537271
{
3726637272
device.epiphany = true;
3726737273
}
37268-
else if (/Firefox/.test(ua))
37274+
else if (/Firefox\D+(\d+)/.test(ua))
3726937275
{
3727037276
device.firefox = true;
37277+
device.firefoxVersion = parseInt(RegExp.$1, 10);
3727137278
}
3727237279
else if (/AppleWebKit/.test(ua) && device.iOS)
3727337280
{
@@ -37638,7 +37645,7 @@ Phaser.Device.canPlayVideo = function (type) {
3763837645
{
3763937646
return true;
3764037647
}
37641-
else if (type === 'mp4' && this.mp4Video)
37648+
else if (type === 'mp4' && (this.mp4Video || this.h264Video))
3764237649
{
3764337650
return true;
3764437651
}
@@ -42899,7 +42906,6 @@ Phaser.Animation.prototype = {
4289942906
// And what's left now?
4290042907
this._timeNextFrame = this.game.time.time + (this.delay - this._frameDiff);
4290142908

42902-
var fi = this._frameIndex;
4290342909
this._frameIndex += this._frameSkip;
4290442910

4290542911
if (this._frameIndex >= this._frames.length)
@@ -42955,7 +42961,7 @@ Phaser.Animation.prototype = {
4295542961
{
4295642962
this.currentFrame = this._frameData.getFrame(this._frames[this._frameIndex]);
4295742963

42958-
if (this.currentFrame && idx !== this.currentFrame.index)
42964+
if (this.currentFrame)
4295942965
{
4296042966
this._parent.setFrame(this.currentFrame);
4296142967
}
@@ -47696,10 +47702,15 @@ Phaser.Loader.prototype = {
4769647702
* @method Phaser.Loader#transformUrl
4769747703
* @protected
4769847704
* @param {string} url - The url to transform
47699-
* @return {string} The transformed url
47705+
* @return {string} The transformed url. In rare cases where the url isn't specified it will return false instead.
4770047706
*/
4770147707
transformUrl: function (url) {
4770247708

47709+
if (!url)
47710+
{
47711+
return false;
47712+
}
47713+
4770347714
if (url.substr(0, 4) === 'http' || url.substr(0, 2) === '//')
4770447715
{
4770547716
return url;
@@ -47893,7 +47904,6 @@ Phaser.Loader.prototype = {
4789347904
};
4789447905

4789547906
file.data.onerror = function () {
47896-
// file.data.removeEventListener('canplay', playThroughEvent, false);
4789747907
file.data.removeEventListener('canplaythrough', playThroughEvent, false);
4789847908
file.data.removeEventListener('loadeddata', playThroughEvent, false);
4789947909
file.data.onerror = null;

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

‎build/custom/phaser-minimum.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-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.4.0 "Katar" - Built: Mon May 18 2015 12:55:04
10+
* v2.4.0 "Katar" - Built: Tue May 19 2015 14:20:01
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -37947,7 +37947,7 @@ Phaser.Rope = function (game, x, y, key, frame, points) {
3794737947
*/
3794837948
this._scroll = new Phaser.Point();
3794937949

37950-
PIXI.Rope.call(this, key, this.points);
37950+
PIXI.Rope.call(this, PIXI.TextureCache['__default'], this.points);
3795137951

3795237952
Phaser.Component.Core.init.call(this, game, x, y, key, frame);
3795337953

@@ -43473,6 +43473,12 @@ Phaser.Device = function () {
4347343473
*/
4347443474
this.firefox = false;
4347543475

43476+
/**
43477+
* @property {number} firefoxVersion - If running in Firefox this will contain the major version number.
43478+
* @default
43479+
*/
43480+
this.firefoxVersion = 0;
43481+
4347643482
/**
4347743483
* @property {boolean} ie - Set to true if running in Internet Explorer.
4347843484
* @default
@@ -44058,9 +44064,10 @@ Phaser.Device._initialize = function () {
4405844064
{
4405944065
device.epiphany = true;
4406044066
}
44061-
else if (/Firefox/.test(ua))
44067+
else if (/Firefox\D+(\d+)/.test(ua))
4406244068
{
4406344069
device.firefox = true;
44070+
device.firefoxVersion = parseInt(RegExp.$1, 10);
4406444071
}
4406544072
else if (/AppleWebKit/.test(ua) && device.iOS)
4406644073
{
@@ -44431,7 +44438,7 @@ Phaser.Device.canPlayVideo = function (type) {
4443144438
{
4443244439
return true;
4443344440
}
44434-
else if (type === 'mp4' && this.mp4Video)
44441+
else if (type === 'mp4' && (this.mp4Video || this.h264Video))
4443544442
{
4443644443
return true;
4443744444
}
@@ -52190,7 +52197,6 @@ Phaser.Animation.prototype = {
5219052197
// And what's left now?
5219152198
this._timeNextFrame = this.game.time.time + (this.delay - this._frameDiff);
5219252199

52193-
var fi = this._frameIndex;
5219452200
this._frameIndex += this._frameSkip;
5219552201

5219652202
if (this._frameIndex >= this._frames.length)
@@ -52246,7 +52252,7 @@ Phaser.Animation.prototype = {
5224652252
{
5224752253
this.currentFrame = this._frameData.getFrame(this._frames[this._frameIndex]);
5224852254

52249-
if (this.currentFrame && idx !== this.currentFrame.index)
52255+
if (this.currentFrame)
5225052256
{
5225152257
this._parent.setFrame(this.currentFrame);
5225252258
}
@@ -56987,10 +56993,15 @@ Phaser.Loader.prototype = {
5698756993
* @method Phaser.Loader#transformUrl
5698856994
* @protected
5698956995
* @param {string} url - The url to transform
56990-
* @return {string} The transformed url
56996+
* @return {string} The transformed url. In rare cases where the url isn't specified it will return false instead.
5699156997
*/
5699256998
transformUrl: function (url) {
5699356999

57000+
if (!url)
57001+
{
57002+
return false;
57003+
}
57004+
5699457005
if (url.substr(0, 4) === 'http' || url.substr(0, 2) === '//')
5699557006
{
5699657007
return url;
@@ -57184,7 +57195,6 @@ Phaser.Loader.prototype = {
5718457195
};
5718557196

5718657197
file.data.onerror = function () {
57187-
// file.data.removeEventListener('canplay', playThroughEvent, false);
5718857198
file.data.removeEventListener('canplaythrough', playThroughEvent, false);
5718957199
file.data.removeEventListener('loadeddata', playThroughEvent, false);
5719057200
file.data.onerror = null;

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

‎build/custom/phaser-no-physics.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/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.4.0 "Katar" - Built: Mon May 18 2015 12:54:41
10+
* v2.4.0 "Katar" - Built: Tue May 19 2015 14:19:39
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -37947,7 +37947,7 @@ Phaser.Rope = function (game, x, y, key, frame, points) {
3794737947
*/
3794837948
this._scroll = new Phaser.Point();
3794937949

37950-
PIXI.Rope.call(this, key, this.points);
37950+
PIXI.Rope.call(this, PIXI.TextureCache['__default'], this.points);
3795137951

3795237952
Phaser.Component.Core.init.call(this, game, x, y, key, frame);
3795337953

@@ -43473,6 +43473,12 @@ Phaser.Device = function () {
4347343473
*/
4347443474
this.firefox = false;
4347543475

43476+
/**
43477+
* @property {number} firefoxVersion - If running in Firefox this will contain the major version number.
43478+
* @default
43479+
*/
43480+
this.firefoxVersion = 0;
43481+
4347643482
/**
4347743483
* @property {boolean} ie - Set to true if running in Internet Explorer.
4347843484
* @default
@@ -44058,9 +44064,10 @@ Phaser.Device._initialize = function () {
4405844064
{
4405944065
device.epiphany = true;
4406044066
}
44061-
else if (/Firefox/.test(ua))
44067+
else if (/Firefox\D+(\d+)/.test(ua))
4406244068
{
4406344069
device.firefox = true;
44070+
device.firefoxVersion = parseInt(RegExp.$1, 10);
4406444071
}
4406544072
else if (/AppleWebKit/.test(ua) && device.iOS)
4406644073
{
@@ -44431,7 +44438,7 @@ Phaser.Device.canPlayVideo = function (type) {
4443144438
{
4443244439
return true;
4443344440
}
44434-
else if (type === 'mp4' && this.mp4Video)
44441+
else if (type === 'mp4' && (this.mp4Video || this.h264Video))
4443544442
{
4443644443
return true;
4443744444
}
@@ -52190,7 +52197,6 @@ Phaser.Animation.prototype = {
5219052197
// And what's left now?
5219152198
this._timeNextFrame = this.game.time.time + (this.delay - this._frameDiff);
5219252199

52193-
var fi = this._frameIndex;
5219452200
this._frameIndex += this._frameSkip;
5219552201

5219652202
if (this._frameIndex >= this._frames.length)
@@ -52246,7 +52252,7 @@ Phaser.Animation.prototype = {
5224652252
{
5224752253
this.currentFrame = this._frameData.getFrame(this._frames[this._frameIndex]);
5224852254

52249-
if (this.currentFrame && idx !== this.currentFrame.index)
52255+
if (this.currentFrame)
5225052256
{
5225152257
this._parent.setFrame(this.currentFrame);
5225252258
}
@@ -56987,10 +56993,15 @@ Phaser.Loader.prototype = {
5698756993
* @method Phaser.Loader#transformUrl
5698856994
* @protected
5698956995
* @param {string} url - The url to transform
56990-
* @return {string} The transformed url
56996+
* @return {string} The transformed url. In rare cases where the url isn't specified it will return false instead.
5699156997
*/
5699256998
transformUrl: function (url) {
5699356999

57000+
if (!url)
57001+
{
57002+
return false;
57003+
}
57004+
5699457005
if (url.substr(0, 4) === 'http' || url.substr(0, 2) === '//')
5699557006
{
5699657007
return url;
@@ -57184,7 +57195,6 @@ Phaser.Loader.prototype = {
5718457195
};
5718557196

5718657197
file.data.onerror = function () {
57187-
// file.data.removeEventListener('canplay', playThroughEvent, false);
5718857198
file.data.removeEventListener('canplaythrough', playThroughEvent, false);
5718957199
file.data.removeEventListener('loadeddata', playThroughEvent, false);
5719057200
file.data.onerror = null;

0 commit comments

Comments
 (0)