Merge branch 'master' into subbodies

This commit is contained in:
Jeena 2015-08-02 16:06:57 +02:00
commit 0b8d885d48
7 changed files with 56 additions and 30 deletions

View file

@ -79,15 +79,14 @@ function (PhysicsEngine, TiledLevel, Player, Nc, Doll, GameObject, Item, Assert)
continue;
}
gameObject.setUpdateData(updateData[uid]);
this.updateGameObject(gameObject, updateData[uid]);
}
};
/*
GameController.prototype.onWorldUpdateGameObject = function(body, gameObject, update) {
FIXME : call gameObject.setUpdateData(updateData[uid]);
};
*/
GameController.prototype.updateGameObject = function(gameObject, gameObjectUpdate) {
gameObject.setUpdateData(gameObjectUpdate);
}
GameController.prototype.onResetLevel = function() {
this.loadLevel(this.level.uid);