Merge branch 'ui' into 'development'
Merge ui into development See merge request !76
Showing
- src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 9 additions, 2 deletions...stuttgart/battlearena/Controller/GameSceneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/PauseController.java 5 additions, 4 deletions...hdm_stuttgart/battlearena/Controller/PauseController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/PauseSettingsController.java 4 additions, 0 deletions...tgart/battlearena/Controller/PauseSettingsController.java
- src/main/resources/player/appSettings.json 1 addition, 1 deletionsrc/main/resources/player/appSettings.json
- src/main/resources/player/playerAccount.json 3 additions, 3 deletionssrc/main/resources/player/playerAccount.json
Loading
Please register or sign in to comment