Skip to content

Commit

Permalink
Tidying up the repo, moving old wip stuff out, clearing up the docs.
Browse files Browse the repository at this point in the history
  • Loading branch information
@photonstorm
photonstorm committed Feb 24, 2014
1 parent 46e85c8 commit 9d9fd06
Show file tree
Hide file tree
Showing 774 changed files with 1,718 additions and 123,046 deletions.
2 changes: 1 addition & 1 deletion docs/Animation.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@ <h1 class="page-title">Source: animation/Animation.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/AnimationManager.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ <h1 class="page-title">Source: animation/AnimationManager.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/AnimationParser.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ <h1 class="page-title">Source: animation/AnimationParser.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/ArcadePhysics.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1927,7 +1927,7 @@ <h1 class="page-title">Source: physics/arcade/ArcadePhysics.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:22 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/BitmapData.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ <h1 class="page-title">Source: gameobjects/BitmapData.js</h1>
if (this._dirty)
{
// Only needed if running in WebGL, otherwise this array will never get cleared down
if (this.game.renderType == Phaser.WEBGL)
if (this.game.renderType === Phaser.WEBGL)
{
PIXI.texturesToUpdate.push(this.baseTexture);
}
Expand Down Expand Up @@ -890,7 +890,7 @@ <h1 class="page-title">Source: gameobjects/BitmapData.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/BitmapFont.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,7 @@ <h1 class="page-title">Source: gameobjects/BitmapFont.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/BitmapText.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ <h1 class="page-title">Source: gameobjects/BitmapText.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
10 changes: 5 additions & 5 deletions docs/Body.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1958,13 +1958,13 @@ <h1 class="page-title">Source: physics/Body.js</h1>

get: function () {

return this.p2px(this.data.position[0]);
return this.p2pxi(this.data.position[0]);

},

set: function (value) {

this.data.position[0] = this.px2p(value);
this.data.position[0] = this.px2pi(value);

}

Expand All @@ -1978,13 +1978,13 @@ <h1 class="page-title">Source: physics/Body.js</h1>

get: function () {

return this.p2px(this.data.position[1]);
return this.p2pxi(this.data.position[1]);

},

set: function (value) {

this.data.position[1] = this.px2p(value);
this.data.position[1] = this.px2pi(value);

}

Expand All @@ -2010,7 +2010,7 @@ <h1 class="page-title">Source: physics/Body.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:22 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/Button.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1147,7 +1147,7 @@ <h1 class="page-title">Source: gameobjects/Button.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
67 changes: 66 additions & 1 deletion docs/Cache.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,12 @@ <h1 class="page-title">Source: loader/Cache.js</h1>
*/
this._text = {};

/**
* @property {object} _text - Text key-value container.
* @private
*/
this._json = {};

/**
* @property {object} _physics - Physics data key-value container.
* @private
Expand Down Expand Up @@ -640,6 +646,12 @@ <h1 class="page-title">Source: loader/Cache.js</h1>
*/
Phaser.Cache.BITMAPFONT = 10;

/**
* @constant
* @type {number}
*/
Phaser.Cache.JSON = 11;

Phaser.Cache.prototype = {

/**
Expand Down Expand Up @@ -873,6 +885,20 @@ <h1 class="page-title">Source: loader/Cache.js</h1>

},

/**
* Add a new json object into the cache.
*
* @method Phaser.Cache#addJSON
* @param {string} key - Asset key for the text data.
* @param {string} url - URL of this text data file.
* @param {object} data - Extra text data.
*/
addJSON: function (key, url, data) {

this._json[key] = { url: url, data: data };

},

/**
* Add a new image.
*
Expand Down Expand Up @@ -1371,6 +1397,26 @@ <h1 class="page-title">Source: loader/Cache.js</h1>

},

/**
* Get a JSON object by key from the cache.
*
* @method Phaser.Cache#getJSON
* @param {string} key - Asset key of the json object to retrieve from the Cache.
* @return {object} The JSON object.
*/
getJSON: function (key) {

if (this._json[key])
{
return this._json[key].data;
}
else
{
console.warn('Phaser.Cache.getJSON: Invalid key: "' + key + '"');
}

},

/**
* Get binary data by key.
*
Expand Down Expand Up @@ -1443,6 +1489,10 @@ <h1 class="page-title">Source: loader/Cache.js</h1>
case Phaser.Cache.BITMAPFONT:
array = this._bitmapFont;
break;

case Phaser.Cache.JSON:
array = this._json;
break;
}

if (!array)
Expand Down Expand Up @@ -1504,6 +1554,16 @@ <h1 class="page-title">Source: loader/Cache.js</h1>
delete this._text[key];
},

/**
* Removes a json object from the cache.
*
* @method Phaser.Cache#removeJSON
* @param {string} key - Key of the asset you want to remove.
*/
removeJSON: function (key) {
delete this._json[key];
},

/**
* Removes a physics data file from the cache.
*
Expand Down Expand Up @@ -1581,6 +1641,11 @@ <h1 class="page-title">Source: loader/Cache.js</h1>
delete this._text[item['key']];
}

for (var item in this._json)
{
delete this._json[item['key']];
}

for (var item in this._textures)
{
delete this._textures[item['key']];
Expand Down Expand Up @@ -1637,7 +1702,7 @@ <h1 class="page-title">Source: loader/Cache.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/Camera.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ <h1 class="page-title">Source: core/Camera.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/Canvas.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ <h1 class="page-title">Source: system/Canvas.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/Circle.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ <h1 class="page-title">Source: geom/Circle.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/CollisionGroup.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ <h1 class="page-title">Source: physics/CollisionGroup.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:22 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/Color.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ <h1 class="page-title">Source: utils/Color.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/ContactMaterial.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ <h1 class="page-title">Source: physics/ContactMaterial.js</h1>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Fri Feb 21 2014 15:36:22 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 12:11:34 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>
Expand Down
Loading

0 comments on commit 9d9fd06

Please sign in to comment.