Merge branch 'development' into 'sound'
Development See merge request !48
Showing
- README.md 12 additions, 0 deletionsREADME.md
- src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java 3 additions, 0 deletions...m_stuttgart/battlearena/Controller/CreditsController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 0 additions, 4 deletions...stuttgart/battlearena/Controller/GameSceneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java 3 additions, 2 deletions...tgart/battlearena/Controller/LoadingScreenController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java 3 additions, 0 deletions..._stuttgart/battlearena/Controller/MainMenuController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java 1 addition, 0 deletions...gart/battlearena/Controller/MenuBorderPaneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java 3 additions, 0 deletions..._stuttgart/battlearena/Controller/SettingsController.java
- src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java 5 additions, 0 deletionssrc/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Sound/MusicPlayer.java 4 additions, 1 deletion...de/hdm_stuttgart/battlearena/Model/Sound/MusicPlayer.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Sound/MusicType.java 0 additions, 16 deletions...a/de/hdm_stuttgart/battlearena/Model/Sound/MusicType.java
- src/main/resources/player/appSettings.json 2 additions, 2 deletionssrc/main/resources/player/appSettings.json
- src/main/resources/textures/images/background.png 0 additions, 0 deletionssrc/main/resources/textures/images/background.png
- src/test/java/MusicPlayerTest.java 26 additions, 0 deletionssrc/test/java/MusicPlayerTest.java
Loading
Please register or sign in to comment