Skip to content

Commit 3db5d27

Browse files
committed
ArrayList.callAll check added (ping @jflowers45 phaserjs#746)
1 parent b6c2b4e commit 3db5d27

3 files changed

Lines changed: 50 additions & 1 deletion

File tree

src/core/ArrayList.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,10 @@ Phaser.ArrayList.prototype = {
126126

127127
while (i--)
128128
{
129-
this.list[i][callback].apply(this.list[i], args);
129+
if (this.list[i][callback])
130+
{
131+
this.list[i][callback].apply(this.list[i], args);
132+
}
130133
}
131134

132135
}

src/pixi/extras/SPINE-LICENSE

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Spine Runtimes Software License
2+
Version 2.1
3+
4+
Copyright (c) 2013, Esoteric Software
5+
All rights reserved.
6+
7+
You are granted a perpetual, non-exclusive, non-sublicensable and
8+
non-transferable license to install, execute and perform the Spine Runtimes
9+
Software (the "Software") solely for internal use. Without the written
10+
permission of Esoteric Software (typically granted by licensing Spine), you
11+
may not (a) modify, translate, adapt or otherwise create derivative works,
12+
improvements of the Software or develop new applications using the Software
13+
or (b) remove, delete, alter or obscure any trademarks or any copyright,
14+
trademark, patent or other intellectual property or proprietary rights notices
15+
on or in the Software, including any copy thereof. Redistributions in binary
16+
or source form must include this license and terms.
17+
18+
THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "AS IS" AND ANY EXPRESS OR
19+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
20+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
21+
EVENT SHALL ESOTERIC SOFTARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
23+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
24+
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
25+
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
26+
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27+
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

src/utils/Debug.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,25 @@ Phaser.Utils.Debug.prototype = {
273273

274274
},
275275

276+
/**
277+
* Render Timer information.
278+
*
279+
* @method Phaser.Utils.Debug#timer
280+
* @param {Phaser.Timer} timer - The Phaser.Timer to show the debug information for.
281+
* @param {number} x - X position of the debug info to be rendered.
282+
* @param {number} y - Y position of the debug info to be rendered.
283+
* @param {string} [color='rgb(255,255,255)'] - color of the debug info to be rendered. (format is css color string).
284+
*/
285+
timer: function (timer, x, y, color) {
286+
287+
this.start(x, y, color);
288+
this.line('Timer (running: ' + timer.running + ' expired: ' + timer.expired + ')');
289+
this.line('Next Tick: ' + timer.next + ' Duration: ' + timer.duration);
290+
this.line('Paused: ' + timer.paused + ' Length: ' + timer.length);
291+
this.stop();
292+
293+
},
294+
276295
/**
277296
* Renders the Pointer.circle object onto the stage in green if down or red if up along with debug text.
278297
*

0 commit comments

Comments
 (0)