EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-07-25 17:25:27 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/inf112-v20/Fiasko

Browse Source 
 Conflicts:
	src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java
	src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java
	src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java
	src/test/java/inf112/fiasko/roborally/objects/RoboRallyGameTest.java
This commit is contained in:
Steinar Aalstad Lillesund
2020-04-14 16:13:29 +02:00
parent 7c74af106c 5361546e4f
commit ec53519f3b
6 changed files with 133 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/inf112/fiasko/roborally/elementproperties/GameState.java
View File

@@ -20,5 +20,7 @@ public enum GameState {
//Indicates that the user is in the process of choosing whether to stay in power down
CHOOSING_STAY_IN_POWER_DOWN,
//Indicates that the user is in the process of sending their cards to the server
SENDING_CARDS
SENDING_CARDS,
//Indicates that the game is won by a player
GAME_IS_WON
}