gparant 01dbff7aee 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		2020-04-13 13:42:21 +02:00
..
Animation.ts	Merge branch 'interaction' into kharhamel-interaction	2020-04-13 13:42:21 +02:00
Player.ts	Merge branch 'interaction' into kharhamel-interaction	2020-04-13 13:42:21 +02:00