Merge branch 'ui' into 'development' (0037c75c) · Commits · Scherbaum Maximilian / BattleArena

Commit 0037c75c authored 1 year ago by Tran Peter

Merge branch 'ui' into 'development'

Mergin ui into development

See merge request !10

parents 1df8acdc c9aab4ed

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java 73 additions, 0 deletions

...ttgart/battlearena/Controller/CommunityMapController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java 5 additions, 3 deletions

...m_stuttgart/battlearena/Controller/CreditsController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java 6 additions, 4 deletions

...hdm_stuttgart/battlearena/Controller/IntroController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java 28 additions, 7 deletions

...uttgart/battlearena/Controller/LocalCreateController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java 34 additions, 10 deletions

..._stuttgart/battlearena/Controller/MainMenuController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java 51 additions, 0 deletions

..._stuttgart/battlearena/Controller/MapForgeController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java 71 additions, 25 deletions

...gart/battlearena/Controller/MenuBorderPaneController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java 16 additions, 9 deletions

...uttgart/battlearena/Controller/MultiplayerController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java 5 additions, 2 deletions

...t/battlearena/Controller/MultiplayerCreateController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java 5 additions, 2 deletions

...art/battlearena/Controller/MultiplayerJoinController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java 16 additions, 9 deletions

.../hdm_stuttgart/battlearena/Controller/PlayController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayerCreateController.java 51 additions, 0 deletions

...ttgart/battlearena/Controller/PlayerCreateController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java 56 additions, 0 deletions

..._stuttgart/battlearena/Controller/SettingsController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java 28 additions, 8 deletions

...tgart/battlearena/Controller/SkinSelectionController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java 26 additions, 18 deletions

...tuttgart/battlearena/Controller/StatisticsController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ButtonTransition.java 1 addition, 1 deletion

...rt/battlearena/Controller/Utilities/ButtonTransition.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/CreateMediaPlayer.java 8 additions, 6 deletions

...t/battlearena/Controller/Utilities/CreateMediaPlayer.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/MusicPlayerSingleton.java 1 addition, 1 deletion

...attlearena/Controller/Utilities/MusicPlayerSingleton.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/SceneLoader.java 1 addition, 1 deletion

...uttgart/battlearena/Controller/Utilities/SceneLoader.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ScreenClasses.java 28 additions, 0 deletions

...tgart/battlearena/Controller/Utilities/ScreenClasses.java

with 510 additions and 106 deletions

Please register or to comment