Merge branch 'interaction' into kharhamel-interaction
authorgparant <g.parant@thecodingmachine.com>
Mon, 13 Apr 2020 11:42:21 +0000 (13:42 +0200)
committergparant <g.parant@thecodingmachine.com>
Mon, 13 Apr 2020 11:42:21 +0000 (13:42 +0200)
commit01dbff7aee268820620aae3c76bd89ff2c5014c7
tree790709fcfe6336687ef32cbd63855be5c69cdc4f
parentb3afc877c7eb5d4933288394de0a7c9aa8af9bd8
parentc51f5f4aa9977e542f6e5c571709555978d0df35
Merge branch 'interaction' into kharhamel-interaction

# Conflicts:
# front/src/Phaser/Game/CameraManager.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/Phaser/Game/MapManager.ts
# front/src/Phaser/Player/Player.ts
front/src/Phaser/Entity/PlayableCaracter.ts
front/src/Phaser/Game/GameManager.ts
front/src/Phaser/Game/GameScene.ts
front/src/Phaser/Game/MapManager.ts
front/src/Phaser/NonPlayer/NonPlayer.ts
front/src/Phaser/Player/Animation.ts
front/src/Phaser/Player/Player.ts
front/src/Phaser/UserInput/UserInputManager.ts
front/src/index.ts