Merge branch 'ui' into 'development'
Merge ui into development See merge request !41
No related branches found
Tags v0.4.6
Showing
- src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java 0 additions, 2 deletions...m_stuttgart/battlearena/Controller/CreditsController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 8 additions, 2 deletions...stuttgart/battlearena/Controller/GameSceneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java 21 additions, 17 deletions...tgart/battlearena/Controller/LoadingScreenController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java 0 additions, 2 deletions..._stuttgart/battlearena/Controller/MapForgeController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapSelectionController.java 0 additions, 2 deletions...ttgart/battlearena/Controller/MapSelectionController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java 1 addition, 4 deletions...gart/battlearena/Controller/MenuBorderPaneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/PauseSettingsController.java 0 additions, 4 deletions...tgart/battlearena/Controller/PauseSettingsController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java 0 additions, 3 deletions..._stuttgart/battlearena/Controller/SettingsController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java 0 additions, 4 deletions...tgart/battlearena/Controller/SkinSelectionController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/MusicPlayerSingleton.java 0 additions, 23 deletions...attlearena/Controller/Utilities/MusicPlayerSingleton.java
- src/main/resources/fxml/MapSelection.fxml 1 addition, 1 deletionsrc/main/resources/fxml/MapSelection.fxml
- src/main/resources/fxml/Pause.fxml 4 additions, 5 deletionssrc/main/resources/fxml/Pause.fxml
- src/main/resources/fxml/PauseSettings.fxml 1 addition, 1 deletionsrc/main/resources/fxml/PauseSettings.fxml
- src/main/resources/maps/coreMaps.json 2 additions, 9 deletionssrc/main/resources/maps/coreMaps.json
- src/main/resources/player/appSettings.json 1 addition, 1 deletionsrc/main/resources/player/appSettings.json
- src/main/resources/styles/style.css 1 addition, 1 deletionsrc/main/resources/styles/style.css
Loading
Please register or sign in to comment