Merge branch 'development' into 'sound'
# Conflicts: # src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java # src/main/resources/player/appSettings.json
Showing
- src/main/java/de/hdm_stuttgart/battlearena/Controller/Enum/GameState.java 3 additions, 1 deletion.../hdm_stuttgart/battlearena/Controller/Enum/GameState.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java 1 addition, 1 deletion...hdm_stuttgart/battlearena/Controller/IntroController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java 2 additions, 2 deletions...tgart/battlearena/Controller/LoadingScreenController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java 1 addition, 12 deletions..._stuttgart/battlearena/Controller/MainMenuController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java 3 additions, 0 deletions..._stuttgart/battlearena/Controller/MapForgeController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java 12 additions, 28 deletions...gart/battlearena/Controller/MenuBorderPaneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/PlaceholderController.java 3 additions, 6 deletions...uttgart/battlearena/Controller/PlaceholderController.java
- src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java 1 addition, 0 deletionssrc/main/java/de/hdm_stuttgart/battlearena/Main/Main.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java 1 addition, 1 deletion...a/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java
- src/main/resources/fxml/MapSelection.fxml 2 additions, 2 deletionssrc/main/resources/fxml/MapSelection.fxml
- src/main/resources/player/appSettings.json 1 addition, 1 deletionsrc/main/resources/player/appSettings.json
- src/main/resources/sound/music/License Information.txt 14 additions, 1 deletionsrc/main/resources/sound/music/License Information.txt
- src/main/resources/sound/music/game/Introspective Demon.mp3 0 additions, 0 deletionssrc/main/resources/sound/music/game/Introspective Demon.mp3
- src/main/resources/sound/music/memes/cocBackgroundMusicTest.mp3 0 additions, 0 deletions...in/resources/sound/music/memes/cocBackgroundMusicTest.mp3
- src/main/resources/sound/music/memes/spongeBob.mp3 0 additions, 0 deletionssrc/main/resources/sound/music/memes/spongeBob.mp3
- src/main/resources/sound/music/memes/stadiumRave.mp3 0 additions, 0 deletionssrc/main/resources/sound/music/memes/stadiumRave.mp3
- src/main/resources/sound/music/memes/wii.mp3 0 additions, 0 deletionssrc/main/resources/sound/music/memes/wii.mp3
- src/main/resources/sound/music/menu/Tempest Overture - A BattleArena Medley.mp3 0 additions, 0 deletions...nd/music/menu/Tempest Overture - A BattleArena Medley.mp3
- src/main/resources/sound/music/placeholder/constructionJazz.mp3 0 additions, 0 deletions...in/resources/sound/music/placeholder/constructionJazz.mp3
- src/main/resources/videos/BattleArenaIntro.mp4 0 additions, 0 deletionssrc/main/resources/videos/BattleArenaIntro.mp4
Loading
Please register or sign in to comment