Merge branch 'development' into 'sound'
# Conflicts: # src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
Showing
- .idea/misc.xml 1 addition, 1 deletion.idea/misc.xml
- README.md 1 addition, 1 deletionREADME.md
- 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 107 additions, 53 deletions...stuttgart/battlearena/Controller/GameSceneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java 10 additions, 2 deletions...hdm_stuttgart/battlearena/Controller/IntroController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java 34 additions, 19 deletions...tgart/battlearena/Controller/LoadingScreenController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/LoginController.java 4 additions, 0 deletions...hdm_stuttgart/battlearena/Controller/LoginController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java 7 additions, 7 deletions..._stuttgart/battlearena/Controller/MainMenuController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java 1 addition, 3 deletions..._stuttgart/battlearena/Controller/MapForgeController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapSelectionController.java 42 additions, 8 deletions...ttgart/battlearena/Controller/MapSelectionController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java 5 additions, 8 deletions...gart/battlearena/Controller/MenuBorderPaneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/PauseController.java 36 additions, 0 deletions...hdm_stuttgart/battlearena/Controller/PauseController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/PauseSettingsController.java 53 additions, 0 deletions...tgart/battlearena/Controller/PauseSettingsController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java 4 additions, 4 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/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ScreenClasses.java 0 additions, 28 deletions...tgart/battlearena/Controller/Utilities/ScreenClasses.java
- src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java 3 additions, 2 deletionssrc/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 4 additions, 22 deletions...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/Parser.java 1 addition, 1 deletion...ttlearena/Model/DataStorage/Classes/Utilities/Parser.java
Loading
Please register or sign in to comment