resolve merge conflict
No related branches found
No related tags found
Showing
- README.md 12 additions, 0 deletionsREADME.md
- 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/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/test/java/MusicPlayerTest.java 26 additions, 0 deletionssrc/test/java/MusicPlayerTest.java
src/test/java/MusicPlayerTest.java
0 → 100644
Please register or sign in to comment