Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-27 07:01:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/photonstorm/phaser

Browse source
This commit is contained in:
Richard Davey 2018-05-18 13:16:21 +01:00
commit bfa2902304
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/physics/arcade/World.js
View file

@ -1410,8 +1410,17 @@ var World = new Class({
collideObjects: function (object1, object2, collideCallback, processCallback, callbackContext, overlapOnly)
{
var i;
object1 = object1.isParent && typeof(object1.physicsType) === 'undefined' ? object1.children.entries : object1;
object2 = object2.isParent && typeof(object2.physicsType) === 'undefined' ? object2.children.entries : object2;
if (object1.isParent && object1.physicsType === undefined)
{
object1 = object1.children.entries;
}
if (object2 && object2.isParent && object2.physicsType === undefined)
{
object2 = object2.children.entries;
}
var object1isArray = Array.isArray(object1);
var object2isArray = Array.isArray(object2);

4
src/scene/ScenePlugin.js
View file

@ -249,8 +249,8 @@ var ScenePlugin = new Class({
* @property {integer} [duration=1000] - The duration, in ms, for the transition to last.
* @property {boolean} [sleep=false] - Will the Scene responsible for the transition be sent to sleep on completion (`true`), or stopped? (`false`)
* @property {boolean} [allowInput=false] - Will the Scenes Input system be able to process events while it is transitioning in or out?
* @property {boolean} [moveAbove] - More the target Scene to be above this one before the transition starts.
* @property {boolean} [moveBelow] - More the target Scene to be below this one before the transition starts.
* @property {boolean} [moveAbove] - Move the target Scene to be above this one before the transition starts.
* @property {boolean} [moveBelow] - Move the target Scene to be below this one before the transition starts.
* @property {function} [onUpdate] - This callback is invoked every frame for the duration of the transition.
* @property {any} [onUpdateScope] - The context in which the callback is invoked.
* @property {any} [data] - An object containing any data you wish to be passed to the target Scenes init / create methods.