Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-28 05:17:16 +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:
Felipe Alfonso 2018-01-25 21:05:57 -03:00
commit 63b3bfe6c3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gameobjects/GameObject.js
View file

@ -296,7 +296,7 @@ var GameObject = new Class({
// TODO Keep a reference to the manager in Body, so body can remove itself, not via System // TODO Keep a reference to the manager in Body, so body can remove itself, not via System
if (this.body) if (this.body)
{ {
sys.physicsManager.remove(this); // sys.physicsManager.remove(this);
this.body = undefined; this.body = undefined;
} }

3
src/loader/MergeXHRSettings.js
View file

@ -1,3 +1,4 @@
var Extend = require('../utils/object/Extend');
var XHRSettings = require('./XHRSettings'); var XHRSettings = require('./XHRSettings');
// Takes two XHR Objects and creates a new object // Takes two XHR Objects and creates a new object
@ -7,7 +8,7 @@ var XHRSettings = require('./XHRSettings');
var MergeXHRSettings = function (global, local) var MergeXHRSettings = function (global, local)
{ {
var output = (global === undefined) ? XHRSettings() : Object.assign(global); var output = (global === undefined) ? XHRSettings() : Extend(global);
if (local) if (local)
{ {