Merge branch 'ui' into 'development'
Merge ui into development See merge request !32
Showing
- README.md 1 addition, 1 deletionREADME.md
- src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java 10 additions, 2 deletions...hdm_stuttgart/battlearena/Controller/IntroController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java 11 additions, 2 deletions...tgart/battlearena/Controller/LoadingScreenController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/LoginController.java 4 additions, 0 deletions...hdm_stuttgart/battlearena/Controller/LoginController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java 7 additions, 7 deletions..._stuttgart/battlearena/Controller/MainMenuController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java 1 addition, 1 deletion..._stuttgart/battlearena/Controller/MapForgeController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapSelectionController.java 2 additions, 2 deletions...ttgart/battlearena/Controller/MapSelectionController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java 4 additions, 4 deletions...gart/battlearena/Controller/MenuBorderPaneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java 0 additions, 1 deletionsrc/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 1 addition, 1 deletion...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
- src/main/resources/fxml/LocalCreate.fxml 12 additions, 6 deletionssrc/main/resources/fxml/LocalCreate.fxml
- src/main/resources/fxml/Login.fxml 1 addition, 1 deletionsrc/main/resources/fxml/Login.fxml
- src/main/resources/fxml/MainMenu.fxml 6 additions, 2 deletionssrc/main/resources/fxml/MainMenu.fxml
- src/main/resources/fxml/MapSelection.fxml 1 addition, 1 deletionsrc/main/resources/fxml/MapSelection.fxml
- src/main/resources/fxml/MultiplayerCreate.fxml 4 additions, 4 deletionssrc/main/resources/fxml/MultiplayerCreate.fxml
- src/main/resources/fxml/MultiplayerJoin.fxml 1 addition, 1 deletionsrc/main/resources/fxml/MultiplayerJoin.fxml
- src/main/resources/fxml/SkinSelection.fxml 1 addition, 1 deletionsrc/main/resources/fxml/SkinSelection.fxml
- src/main/resources/player/playerAccount.json 1 addition, 1 deletionsrc/main/resources/player/playerAccount.json
- src/main/resources/styles/style.css 1 addition, 1 deletionsrc/main/resources/styles/style.css
- src/main/resources/videos/black.mp4 0 additions, 0 deletionssrc/main/resources/videos/black.mp4
Loading
Please register or sign in to comment