Merge branch 'ui' into 'development'
Merge ui into development See merge request !17
Showing
- README.md 3 additions, 0 deletionsREADME.md
- src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java 1 addition, 1 deletion...ttgart/battlearena/Controller/CommunityMapController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java 42 additions, 9 deletions...hdm_stuttgart/battlearena/Controller/IntroController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java 6 additions, 1 deletion..._stuttgart/battlearena/Controller/MainMenuController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java 6 additions, 7 deletions..._stuttgart/battlearena/Controller/MapForgeController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapSelectionController.java 72 additions, 0 deletions...ttgart/battlearena/Controller/MapSelectionController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java 4 additions, 1 deletion...gart/battlearena/Controller/MenuBorderPaneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java 16 additions, 10 deletions..._stuttgart/battlearena/Controller/SettingsController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java 4 additions, 6 deletions...tgart/battlearena/Controller/SkinSelectionController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java 21 additions, 8 deletions...tuttgart/battlearena/Controller/StatisticsController.java
- src/main/java/module-info.java 0 additions, 1 deletionsrc/main/java/module-info.java
- src/main/resources/fxml/MapSelection.fxml 50 additions, 0 deletionssrc/main/resources/fxml/MapSelection.fxml
- src/main/resources/fxml/MultiplayerCreate.fxml 1 addition, 1 deletionsrc/main/resources/fxml/MultiplayerCreate.fxml
- src/main/resources/fxml/PlayerCreateScene.fxml 0 additions, 1 deletionsrc/main/resources/fxml/PlayerCreateScene.fxml
- src/main/resources/fxml/Settings.fxml 2 additions, 2 deletionssrc/main/resources/fxml/Settings.fxml
- src/main/resources/player/appSettings.json 1 addition, 1 deletionsrc/main/resources/player/appSettings.json
- src/main/resources/player/playerAccount.json 1 addition, 1 deletionsrc/main/resources/player/playerAccount.json
- src/main/resources/player/playerStatsLocal.json 8 additions, 0 deletionssrc/main/resources/player/playerStatsLocal.json
- src/main/resources/styles/style.css 1 addition, 1 deletionsrc/main/resources/styles/style.css
- src/main/resources/videos/catJump.mp4 0 additions, 0 deletionssrc/main/resources/videos/catJump.mp4
Loading
Please register or sign in to comment