Skip to content

Commit ee3f6d8

Browse files
photonstormphotonstorm
committed
Tilemap had the wrong @method signatures so most were missing from the docs.
1 parent 67bd653 commit ee3f6d8

175 files changed

Lines changed: 46839 additions & 12389 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ Bug Fixes:
100100
* Added TimerEvent.pendingDelete and checks in Timer.update, so that removing an event in a callback no longer throws an exception (thanks georgiee)
101101
* Fixed TypeScript defs on lines 1741-1748 (thanks wombatbuddy)
102102
* Previously if you used Sprite.crop() it would crop all Sprites using the same base image. It now takes a local copy of the texture data and crops just that.
103+
* Tilemap had the wrong @method signatures so most were missing from the docs.
103104

104105

105106
You can view the Change Log for all previous versions at https://github.com/photonstorm/phaser/changelog.md

‎docs/Animation.js.html‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@
182182
<a href="Phaser.Group.html">Group</a>
183183
</li>
184184

185+
<li>
186+
<a href="Phaser.Image.html">Image</a>
187+
</li>
188+
185189
<li>
186190
<a href="Phaser.Input.html">Input</a>
187191
</li>
@@ -398,6 +402,36 @@
398402
</ul>
399403
</li>
400404

405+
<li class="dropdown">
406+
<a href="global.html" class="dropdown-toggle" data-toggle="dropdown">Global<b
407+
class="caret"></b></a>
408+
409+
<ul class="dropdown-menu ">
410+
411+
<li>
412+
<a href="global.html#canUseNewCanvasBlendModes">canUseNewCanvasBlendModes</a>
413+
</li>
414+
415+
<li>
416+
<a href="global.html#getNextPowerOfTwo">getNextPowerOfTwo</a>
417+
</li>
418+
419+
<li>
420+
<a href="global.html#hex2rgb">hex2rgb</a>
421+
</li>
422+
423+
<li>
424+
<a href="global.html#hitTest">hitTest</a>
425+
</li>
426+
427+
<li>
428+
<a href="global.html#rgb2hex">rgb2hex</a>
429+
</li>
430+
431+
432+
</ul>
433+
</li>
434+
401435
</ul>
402436
</div>
403437
</div>
@@ -909,7 +943,7 @@ <h1 class="page-title">Source: animation/Animation.js</h1>
909943

910944
<span class="jsdoc-message">
911945
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
912-
on Wed Feb 05 2014 06:28:24 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
946+
on Sat Feb 08 2014 07:19:40 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
913947
</span>
914948
</footer>
915949
</div>

‎docs/AnimationManager.js.html‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@
182182
<a href="Phaser.Group.html">Group</a>
183183
</li>
184184

185+
<li>
186+
<a href="Phaser.Image.html">Image</a>
187+
</li>
188+
185189
<li>
186190
<a href="Phaser.Input.html">Input</a>
187191
</li>
@@ -398,6 +402,36 @@
398402
</ul>
399403
</li>
400404

405+
<li class="dropdown">
406+
<a href="global.html" class="dropdown-toggle" data-toggle="dropdown">Global<b
407+
class="caret"></b></a>
408+
409+
<ul class="dropdown-menu ">
410+
411+
<li>
412+
<a href="global.html#canUseNewCanvasBlendModes">canUseNewCanvasBlendModes</a>
413+
</li>
414+
415+
<li>
416+
<a href="global.html#getNextPowerOfTwo">getNextPowerOfTwo</a>
417+
</li>
418+
419+
<li>
420+
<a href="global.html#hex2rgb">hex2rgb</a>
421+
</li>
422+
423+
<li>
424+
<a href="global.html#hitTest">hitTest</a>
425+
</li>
426+
427+
<li>
428+
<a href="global.html#rgb2hex">rgb2hex</a>
429+
</li>
430+
431+
432+
</ul>
433+
</li>
434+
401435
</ul>
402436
</div>
403437
</div>
@@ -683,7 +717,7 @@ <h1 class="page-title">Source: animation/AnimationManager.js</h1>
683717
*
684718
* @method Phaser.AnimationManager#getAnimation
685719
* @param {string} name - The name of the animation to be returned, e.g. "fire".
686-
* @return {Phaser.Animation|boolean} The Animation instance, if found, otherwise false.
720+
* @return {Phaser.Animation} The Animation instance, if found, otherwise null.
687721
*/
688722
getAnimation: function (name) {
689723

@@ -695,7 +729,7 @@ <h1 class="page-title">Source: animation/AnimationManager.js</h1>
695729
}
696730
}
697731

698-
return false;
732+
return null;
699733

700734
},
701735

@@ -865,7 +899,7 @@ <h1 class="page-title">Source: animation/AnimationManager.js</h1>
865899

866900
<span class="jsdoc-message">
867901
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
868-
on Wed Feb 05 2014 06:28:24 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
902+
on Sat Feb 08 2014 07:19:40 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
869903
</span>
870904
</footer>
871905
</div>

‎docs/AnimationParser.js.html‎

Lines changed: 56 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@
182182
<a href="Phaser.Group.html">Group</a>
183183
</li>
184184

185+
<li>
186+
<a href="Phaser.Image.html">Image</a>
187+
</li>
188+
185189
<li>
186190
<a href="Phaser.Input.html">Input</a>
187191
</li>
@@ -398,6 +402,36 @@
398402
</ul>
399403
</li>
400404

405+
<li class="dropdown">
406+
<a href="global.html" class="dropdown-toggle" data-toggle="dropdown">Global<b
407+
class="caret"></b></a>
408+
409+
<ul class="dropdown-menu ">
410+
411+
<li>
412+
<a href="global.html#canUseNewCanvasBlendModes">canUseNewCanvasBlendModes</a>
413+
</li>
414+
415+
<li>
416+
<a href="global.html#getNextPowerOfTwo">getNextPowerOfTwo</a>
417+
</li>
418+
419+
<li>
420+
<a href="global.html#hex2rgb">hex2rgb</a>
421+
</li>
422+
423+
<li>
424+
<a href="global.html#hitTest">hitTest</a>
425+
</li>
426+
427+
<li>
428+
<a href="global.html#rgb2hex">rgb2hex</a>
429+
</li>
430+
431+
432+
</ul>
433+
</li>
434+
401435
</ul>
402436
</div>
403437
</div>
@@ -570,10 +604,14 @@ <h1 class="page-title">Source: animation/AnimationParser.js</h1>
570604
frames[i].spriteSourceSize.h
571605
);
572606

573-
// We had to hack Pixi to get this to work :(
574607
PIXI.TextureCache[uuid].trimmed = true;
575-
PIXI.TextureCache[uuid].trim.x = frames[i].spriteSourceSize.x;
576-
PIXI.TextureCache[uuid].trim.y = frames[i].spriteSourceSize.y;
608+
609+
PIXI.TextureCache[uuid].trim = {
610+
x: frames[i].spriteSourceSize.x,
611+
y: frames[i].spriteSourceSize.y,
612+
realWidth: frames[i].sourceSize.w,
613+
realHeight: frames[i].sourceSize.h
614+
}
577615

578616
}
579617
}
@@ -642,10 +680,14 @@ <h1 class="page-title">Source: animation/AnimationParser.js</h1>
642680
frames[key].spriteSourceSize.h
643681
);
644682

645-
// We had to hack Pixi to get this to work :(
646683
PIXI.TextureCache[uuid].trimmed = true;
647-
PIXI.TextureCache[uuid].trim.x = frames[key].spriteSourceSize.x;
648-
PIXI.TextureCache[uuid].trim.y = frames[key].spriteSourceSize.y;
684+
685+
PIXI.TextureCache[uuid].trim = {
686+
x: frames[i].spriteSourceSize.x,
687+
y: frames[i].spriteSourceSize.y,
688+
realWidth: frames[i].sourceSize.w,
689+
realHeight: frames[i].sourceSize.h
690+
}
649691

650692
}
651693

@@ -730,10 +772,14 @@ <h1 class="page-title">Source: animation/AnimationParser.js</h1>
730772

731773
PIXI.TextureCache[uuid].realSize = { x: frameX, y: frameY, w: frameWidth, h: frameHeight };
732774

733-
// We had to hack Pixi to get this to work :(
734775
PIXI.TextureCache[uuid].trimmed = true;
735-
PIXI.TextureCache[uuid].trim.x = frameX;
736-
PIXI.TextureCache[uuid].trim.y = frameY;
776+
777+
PIXI.TextureCache[uuid].trim = {
778+
x: frameX,
779+
y: frameY,
780+
realWidth: width,
781+
realHeight: height
782+
}
737783
}
738784
}
739785

@@ -763,7 +809,7 @@ <h1 class="page-title">Source: animation/AnimationParser.js</h1>
763809

764810
<span class="jsdoc-message">
765811
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
766-
on Wed Feb 05 2014 06:28:24 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
812+
on Sat Feb 08 2014 07:19:40 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
767813
</span>
768814
</footer>
769815
</div>

‎docs/ArcadePhysics.js.html‎

Lines changed: 46 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@
182182
<a href="Phaser.Group.html">Group</a>
183183
</li>
184184

185+
<li>
186+
<a href="Phaser.Image.html">Image</a>
187+
</li>
188+
185189
<li>
186190
<a href="Phaser.Input.html">Input</a>
187191
</li>
@@ -398,6 +402,36 @@
398402
</ul>
399403
</li>
400404

405+
<li class="dropdown">
406+
<a href="global.html" class="dropdown-toggle" data-toggle="dropdown">Global<b
407+
class="caret"></b></a>
408+
409+
<ul class="dropdown-menu ">
410+
411+
<li>
412+
<a href="global.html#canUseNewCanvasBlendModes">canUseNewCanvasBlendModes</a>
413+
</li>
414+
415+
<li>
416+
<a href="global.html#getNextPowerOfTwo">getNextPowerOfTwo</a>
417+
</li>
418+
419+
<li>
420+
<a href="global.html#hex2rgb">hex2rgb</a>
421+
</li>
422+
423+
<li>
424+
<a href="global.html#hitTest">hitTest</a>
425+
</li>
426+
427+
<li>
428+
<a href="global.html#rgb2hex">rgb2hex</a>
429+
</li>
430+
431+
432+
</ul>
433+
</li>
434+
401435
</ul>
402436
</div>
403437
</div>
@@ -1053,15 +1087,15 @@ <h1 class="page-title">Source: physics/arcade/ArcadePhysics.js</h1>
10531087
return;
10541088
}
10551089

1056-
var len = group._container.children.length;
1090+
var len = group.children.length;
10571091

10581092
for (var i = 0; i &lt; len; i++)
10591093
{
10601094
for (var j = i + 1; j &lt;= len; j++)
10611095
{
1062-
if (group._container.children[i] && group._container.children[j] && group._container.children[i].exists && group._container.children[j].exists)
1096+
if (group.children[i] && group.children[j] && group.children[i].exists && group.children[j].exists)
10631097
{
1064-
this.collideSpriteVsSprite(group._container.children[i], group._container.children[j], collideCallback, processCallback, callbackContext, overlapOnly);
1098+
this.collideSpriteVsSprite(group.children[i], group.children[j], collideCallback, processCallback, callbackContext, overlapOnly);
10651099
}
10661100
}
10671101
}
@@ -1081,19 +1115,12 @@ <h1 class="page-title">Source: physics/arcade/ArcadePhysics.js</h1>
10811115
return;
10821116
}
10831117

1084-
if (group1._container.first._iNext)
1118+
for (var i = 0, len = group1.children.length; i &lt; len; i++)
10851119
{
1086-
var currentNode = group1._container.first._iNext;
1087-
1088-
do
1120+
if (group1.children[i].exists)
10891121
{
1090-
if (currentNode.exists)
1091-
{
1092-
this.collideSpriteVsGroup(currentNode, group2, collideCallback, processCallback, callbackContext, overlapOnly);
1093-
}
1094-
currentNode = currentNode._iNext;
1122+
this.collideSpriteVsGroup(group1.children[i], group2, collideCallback, processCallback, callbackContext, overlapOnly);
10951123
}
1096-
while (currentNode != group1._container.last._iNext);
10971124
}
10981125

10991126
},
@@ -1163,19 +1190,12 @@ <h1 class="page-title">Source: physics/arcade/ArcadePhysics.js</h1>
11631190
return;
11641191
}
11651192

1166-
if (group._container.first._iNext)
1193+
for (var i = 0, len = group.children.length; i &lt; len; i++)
11671194
{
1168-
var currentNode = group._container.first._iNext;
1169-
1170-
do
1195+
if (group.children[i].exists)
11711196
{
1172-
if (currentNode.exists)
1173-
{
1174-
this.collideSpriteVsTilemapLayer(currentNode, tilemapLayer, collideCallback, processCallback, callbackContext);
1175-
}
1176-
currentNode = currentNode._iNext;
1197+
this.collideSpriteVsTilemapLayer(group.children[i], tilemapLayer, collideCallback, processCallback, callbackContext);
11771198
}
1178-
while (currentNode != group._container.last._iNext);
11791199
}
11801200

11811201
},
@@ -1473,6 +1493,8 @@ <h1 class="page-title">Source: physics/arcade/ArcadePhysics.js</h1>
14731493
body.blocked.down = true;
14741494
}
14751495

1496+
body.reboundCheck(body.overlapX, body.overlapY, true);
1497+
14761498
return true;
14771499

14781500
},
@@ -1865,7 +1887,7 @@ <h1 class="page-title">Source: physics/arcade/ArcadePhysics.js</h1>
18651887

18661888
<span class="jsdoc-message">
18671889
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
1868-
on Wed Feb 05 2014 06:28:24 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
1890+
on Sat Feb 08 2014 07:19:40 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
18691891
</span>
18701892
</footer>
18711893
</div>

0 commit comments

Comments
 (0)