Quentin Legot 3a31f8485d Merge branch 'testplay' ... # Conflicts: # server/src/main/java/fr/lnl/game/server/games/Game.java # server/src/main/java/fr/lnl/game/server/games/action/DeployShield.java # server/src/main/java/fr/lnl/game/server/games/action/DropMine.java		2021-10-26 17:08:38 +02:00
..
src	Merge branch 'testplay'	2021-10-26 17:08:38 +02:00
build.gradle	Added very basic view support + reworked players' fields in Game.java and Grid.java	2021-10-23 19:15:08 +02:00