Skip to content

Commit 26e364a

Browse files
photonstormphotonstorm
committed
Build files for testing.
1 parent fd6c29e commit 26e364a

12 files changed

Lines changed: 196 additions & 124 deletions

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

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.4.1 "Ionin Spring" - Built: Fri Jul 24 2015 13:26:42
10+
* v2.4.2 "Altara" - Built: Mon Jul 27 2015 13:35:18
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -10383,7 +10383,7 @@ var Phaser = Phaser || {
1038310383
* @constant
1038410384
* @type {string}
1038510385
*/
10386-
VERSION: '2.4.1',
10386+
VERSION: '2.4.2-dev',
1038710387

1038810388
/**
1038910389
* An array of Phaser game instances.
@@ -27648,9 +27648,12 @@ Phaser.DeviceButton.prototype = {
2764827648
this.event = event;
2764927649
this.value = value;
2765027650

27651-
this.altKey = event.altKey;
27652-
this.shiftKey = event.shiftKey;
27653-
this.ctrlKey = event.ctrlKey;
27651+
if (event)
27652+
{
27653+
this.altKey = event.altKey;
27654+
this.shiftKey = event.shiftKey;
27655+
this.ctrlKey = event.ctrlKey;
27656+
}
2765427657

2765527658
this.onDown.dispatch(this, value);
2765627659

@@ -27679,9 +27682,12 @@ Phaser.DeviceButton.prototype = {
2767927682
this.event = event;
2768027683
this.value = value;
2768127684

27682-
this.altKey = event.altKey;
27683-
this.shiftKey = event.shiftKey;
27684-
this.ctrlKey = event.ctrlKey;
27685+
if (event)
27686+
{
27687+
this.altKey = event.altKey;
27688+
this.shiftKey = event.shiftKey;
27689+
this.ctrlKey = event.ctrlKey;
27690+
}
2768527691

2768627692
this.onUp.dispatch(this, value);
2768727693

@@ -28463,7 +28469,7 @@ Phaser.Pointer.prototype = {
2846328469
this.button = event.button;
2846428470
}
2846528471

28466-
if (fromClick)
28472+
if (fromClick && this.isMouse)
2846728473
{
2846828474
this.updateButtons(event);
2846928475
}
@@ -46711,7 +46717,7 @@ Phaser.Device.canPlayVideo = function (type) {
4671146717
{
4671246718
return true;
4671346719
}
46714-
else if (type === 'ogg' && this.oggVideo)
46720+
else if ((type === 'ogg' || type === 'ogv') && this.oggVideo)
4671546721
{
4671646722
return true;
4671746723
}
@@ -56909,11 +56915,14 @@ Phaser.Cache.prototype = {
5690956915
*
5691056916
* @method Phaser.Cache#getFrame
5691156917
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
56918+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
5691256919
* @return {Phaser.Frame} The frame data.
5691356920
*/
56914-
getFrame: function (key) {
56921+
getFrame: function (key, cache) {
56922+
56923+
if (cache === undefined) { cache = Phaser.Cache.IMAGE; }
5691556924

56916-
return this.getItem(key, Phaser.Cache.IMAGE, 'getFrame', 'frame');
56925+
return this.getItem(key, cache, 'getFrame', 'frame');
5691756926

5691856927
},
5691956928

@@ -56922,11 +56931,12 @@ Phaser.Cache.prototype = {
5692256931
*
5692356932
* @method Phaser.Cache#getFrameCount
5692456933
* @param {string} key - Asset key of the FrameData you want.
56934+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
5692556935
* @return {number} Then number of frames. 0 if the image is not found.
5692656936
*/
56927-
getFrameCount: function (key) {
56937+
getFrameCount: function (key, cache) {
5692856938

56929-
var data = this.getFrameData(key);
56939+
var data = this.getFrameData(key, cache);
5693056940

5693156941
if (data)
5693256942
{
@@ -56948,11 +56958,14 @@ Phaser.Cache.prototype = {
5694856958
*
5694956959
* @method Phaser.Cache#getFrameData
5695056960
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
56961+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
5695156962
* @return {Phaser.FrameData} The frame data.
5695256963
*/
56953-
getFrameData: function (key) {
56964+
getFrameData: function (key, cache) {
56965+
56966+
if (cache === undefined) { cache = Phaser.Cache.IMAGE; }
5695456967

56955-
return this.getItem(key, Phaser.Cache.IMAGE, 'getFrameData', 'frameData');
56968+
return this.getItem(key, cache, 'getFrameData', 'frameData');
5695656969

5695756970
},
5695856971

@@ -56961,11 +56974,14 @@ Phaser.Cache.prototype = {
5696156974
*
5696256975
* @method Phaser.Cache#hasFrameData
5696356976
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
56977+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
5696456978
* @return {boolean} True if the given key has frameData in the cache, otherwise false.
5696556979
*/
56966-
hasFrameData: function (key) {
56980+
hasFrameData: function (key, cache) {
56981+
56982+
if (cache === undefined) { cache = Phaser.Cache.IMAGE; }
5696756983

56968-
return (this.getItem(key, Phaser.Cache.IMAGE, '', 'frameData') !== null);
56984+
return (this.getItem(key, cache, '', 'frameData') !== null);
5696956985

5697056986
},
5697156987

@@ -56994,11 +57010,12 @@ Phaser.Cache.prototype = {
5699457010
* @method Phaser.Cache#getFrameByIndex
5699557011
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
5699657012
* @param {number} index - The index of the frame you want to get.
57013+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search. One of the Cache consts such as `Phaser.Cache.IMAGE` or `Phaser.Cache.SOUND`.
5699757014
* @return {Phaser.Frame} The frame object.
5699857015
*/
56999-
getFrameByIndex: function (key, index) {
57016+
getFrameByIndex: function (key, index, cache) {
5700057017

57001-
var data = this.getFrameData(key);
57018+
var data = this.getFrameData(key, cache);
5700257019

5700357020
if (data)
5700457021
{
@@ -57017,11 +57034,12 @@ Phaser.Cache.prototype = {
5701757034
* @method Phaser.Cache#getFrameByName
5701857035
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
5701957036
* @param {string} name - The name of the frame you want to get.
57037+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search. One of the Cache consts such as `Phaser.Cache.IMAGE` or `Phaser.Cache.SOUND`.
5702057038
* @return {Phaser.Frame} The frame object.
5702157039
*/
57022-
getFrameByName: function (key, name) {
57040+
getFrameByName: function (key, name, cache) {
5702357041

57024-
var data = this.getFrameData(key);
57042+
var data = this.getFrameData(key, cache);
5702557043

5702657044
if (data)
5702757045
{
@@ -72537,8 +72555,6 @@ Phaser.TilemapLayer.prototype.render = function () {
7253772555
return;
7253872556
}
7253972557

72540-
this.context.save();
72541-
7254272558
if (this.dirty || this.layer.dirty)
7254372559
{
7254472560
this.layer.dirty = false;
@@ -72564,6 +72580,8 @@ Phaser.TilemapLayer.prototype.render = function () {
7256472580
return;
7256572581
}
7256672582

72583+
this.context.save();
72584+
7256772585
mc.scrollX = scrollX;
7256872586
mc.scrollY = scrollY;
7256972587

‎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: 8 additions & 8 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: 40 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.4.1 "Ionin Spring" - Built: Fri Jul 24 2015 13:26:59
10+
* v2.4.2 "Altara" - Built: Mon Jul 27 2015 13:35:35
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -9189,7 +9189,7 @@ var Phaser = Phaser || {
91899189
* @constant
91909190
* @type {string}
91919191
*/
9192-
VERSION: '2.4.1',
9192+
VERSION: '2.4.2-dev',
91939193

91949194
/**
91959195
* An array of Phaser game instances.
@@ -26454,9 +26454,12 @@ Phaser.DeviceButton.prototype = {
2645426454
this.event = event;
2645526455
this.value = value;
2645626456

26457-
this.altKey = event.altKey;
26458-
this.shiftKey = event.shiftKey;
26459-
this.ctrlKey = event.ctrlKey;
26457+
if (event)
26458+
{
26459+
this.altKey = event.altKey;
26460+
this.shiftKey = event.shiftKey;
26461+
this.ctrlKey = event.ctrlKey;
26462+
}
2646026463

2646126464
this.onDown.dispatch(this, value);
2646226465

@@ -26485,9 +26488,12 @@ Phaser.DeviceButton.prototype = {
2648526488
this.event = event;
2648626489
this.value = value;
2648726490

26488-
this.altKey = event.altKey;
26489-
this.shiftKey = event.shiftKey;
26490-
this.ctrlKey = event.ctrlKey;
26491+
if (event)
26492+
{
26493+
this.altKey = event.altKey;
26494+
this.shiftKey = event.shiftKey;
26495+
this.ctrlKey = event.ctrlKey;
26496+
}
2649126497

2649226498
this.onUp.dispatch(this, value);
2649326499

@@ -27269,7 +27275,7 @@ Phaser.Pointer.prototype = {
2726927275
this.button = event.button;
2727027276
}
2727127277

27272-
if (fromClick)
27278+
if (fromClick && this.isMouse)
2727327279
{
2727427280
this.updateButtons(event);
2727527281
}
@@ -35960,7 +35966,7 @@ Phaser.Device.canPlayVideo = function (type) {
3596035966
{
3596135967
return true;
3596235968
}
35963-
else if (type === 'ogg' && this.oggVideo)
35969+
else if ((type === 'ogg' || type === 'ogv') && this.oggVideo)
3596435970
{
3596535971
return true;
3596635972
}
@@ -43649,11 +43655,14 @@ Phaser.Cache.prototype = {
4364943655
*
4365043656
* @method Phaser.Cache#getFrame
4365143657
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
43658+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
4365243659
* @return {Phaser.Frame} The frame data.
4365343660
*/
43654-
getFrame: function (key) {
43661+
getFrame: function (key, cache) {
43662+
43663+
if (cache === undefined) { cache = Phaser.Cache.IMAGE; }
4365543664

43656-
return this.getItem(key, Phaser.Cache.IMAGE, 'getFrame', 'frame');
43665+
return this.getItem(key, cache, 'getFrame', 'frame');
4365743666

4365843667
},
4365943668

@@ -43662,11 +43671,12 @@ Phaser.Cache.prototype = {
4366243671
*
4366343672
* @method Phaser.Cache#getFrameCount
4366443673
* @param {string} key - Asset key of the FrameData you want.
43674+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
4366543675
* @return {number} Then number of frames. 0 if the image is not found.
4366643676
*/
43667-
getFrameCount: function (key) {
43677+
getFrameCount: function (key, cache) {
4366843678

43669-
var data = this.getFrameData(key);
43679+
var data = this.getFrameData(key, cache);
4367043680

4367143681
if (data)
4367243682
{
@@ -43688,11 +43698,14 @@ Phaser.Cache.prototype = {
4368843698
*
4368943699
* @method Phaser.Cache#getFrameData
4369043700
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
43701+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
4369143702
* @return {Phaser.FrameData} The frame data.
4369243703
*/
43693-
getFrameData: function (key) {
43704+
getFrameData: function (key, cache) {
43705+
43706+
if (cache === undefined) { cache = Phaser.Cache.IMAGE; }
4369443707

43695-
return this.getItem(key, Phaser.Cache.IMAGE, 'getFrameData', 'frameData');
43708+
return this.getItem(key, cache, 'getFrameData', 'frameData');
4369643709

4369743710
},
4369843711

@@ -43701,11 +43714,14 @@ Phaser.Cache.prototype = {
4370143714
*
4370243715
* @method Phaser.Cache#hasFrameData
4370343716
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
43717+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search for the item in.
4370443718
* @return {boolean} True if the given key has frameData in the cache, otherwise false.
4370543719
*/
43706-
hasFrameData: function (key) {
43720+
hasFrameData: function (key, cache) {
4370743721

43708-
return (this.getItem(key, Phaser.Cache.IMAGE, '', 'frameData') !== null);
43722+
if (cache === undefined) { cache = Phaser.Cache.IMAGE; }
43723+
43724+
return (this.getItem(key, cache, '', 'frameData') !== null);
4370943725

4371043726
},
4371143727

@@ -43734,11 +43750,12 @@ Phaser.Cache.prototype = {
4373443750
* @method Phaser.Cache#getFrameByIndex
4373543751
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
4373643752
* @param {number} index - The index of the frame you want to get.
43753+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search. One of the Cache consts such as `Phaser.Cache.IMAGE` or `Phaser.Cache.SOUND`.
4373743754
* @return {Phaser.Frame} The frame object.
4373843755
*/
43739-
getFrameByIndex: function (key, index) {
43756+
getFrameByIndex: function (key, index, cache) {
4374043757

43741-
var data = this.getFrameData(key);
43758+
var data = this.getFrameData(key, cache);
4374243759

4374343760
if (data)
4374443761
{
@@ -43757,11 +43774,12 @@ Phaser.Cache.prototype = {
4375743774
* @method Phaser.Cache#getFrameByName
4375843775
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
4375943776
* @param {string} name - The name of the frame you want to get.
43777+
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search. One of the Cache consts such as `Phaser.Cache.IMAGE` or `Phaser.Cache.SOUND`.
4376043778
* @return {Phaser.Frame} The frame object.
4376143779
*/
43762-
getFrameByName: function (key, name) {
43780+
getFrameByName: function (key, name, cache) {
4376343781

43764-
var data = this.getFrameData(key);
43782+
var data = this.getFrameData(key, cache);
4376543783

4376643784
if (data)
4376743785
{

‎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: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)