1.1.6 release. The final of the 1.1 branch.

This commit is contained in:
photonstorm
2014-02-24 01:28:13 +00:00
parent 529d210006
commit f4ff4d88fe
194 changed files with 4070 additions and 2236 deletions
+6 -35
View File
@@ -1127,14 +1127,8 @@ Phaser.Physics.Arcade.prototype = {
return;
}
if (this._mapData.length > 1)
for (var i = 0; i < this._mapData.length; i++)
{
this.separateTiles(sprite.body, this._mapData);
}
else
{
var i = 0;
if (this.separateTile(sprite.body, this._mapData[i]))
{
// They collided, is there a custom process callback?
@@ -1162,6 +1156,8 @@ Phaser.Physics.Arcade.prototype = {
}
}
return true;
},
/**
@@ -1248,7 +1244,7 @@ Phaser.Physics.Arcade.prototype = {
if (a.width <= 0 || a.height <= 0 || b.width <= 0 || b.height <= 0)
{
result = false;
return false;
}
result = !(a.right < b.left || a.bottom < b.top || a.left > b.right || a.top > b.bottom);
@@ -1258,6 +1254,7 @@ Phaser.Physics.Arcade.prototype = {
a.removeContact(b);
}
return result;
},
/**
@@ -1293,32 +1290,6 @@ Phaser.Physics.Arcade.prototype = {
},
/**
* The core separation function to separate a physics body and an array of tiles.
* @method Phaser.Physics.Arcade#separateTiles
* @param {Phaser.Physics.Arcade.Body} body - The Body object to separate.
* @param {array<Phaser.Tile>} tiles - The array of tiles to collide against.
* @returns {boolean} Returns true if the body was separated, otherwise false.
*/
separateTiles: function (body, tiles) {
var tile;
var result = false;
for (var i = 0; i < tiles.length; i++)
{
tile = tiles[i];
if (this.separateTile(body, tile))
{
result = true;
}
}
return result;
},
/**
* The core separation function to separate a physics body and a tile.
* @method Phaser.Physics.Arcade#separateTile
@@ -1881,7 +1852,7 @@ Phaser.Physics.Arcade.prototype.constructor = Phaser.Physics.Arcade;
<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a>
on Wed Feb 12 2014 15:32:11 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
on Mon Feb 24 2014 01:12:21 GMT-0000 (GMT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
</span>
</footer>
</div>