# 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 |
||
---|---|---|
.. | ||
PlayableCaracter.ts | ||
SpeechBubble.ts | ||
Sprite.ts |
# 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 |
||
---|---|---|
.. | ||
PlayableCaracter.ts | ||
SpeechBubble.ts | ||
Sprite.ts |