Merge branch 'ui' into 'development'
Merge ui into development See merge request !59
No related branches found
No related tags found
Checking pipeline status
Showing
- src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 6 additions, 2 deletions...stuttgart/battlearena/Controller/GameSceneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java 10 additions, 2 deletions...uttgart/battlearena/Controller/LocalCreateController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapSelectionController.java 24 additions, 15 deletions...ttgart/battlearena/Controller/MapSelectionController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java 18 additions, 10 deletions...gart/battlearena/Controller/MenuBorderPaneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java 12 additions, 3 deletions..._stuttgart/battlearena/Controller/SettingsController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java 11 additions, 4 deletions...tgart/battlearena/Controller/SkinSelectionController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/CreateMediaPlayer.java 2 additions, 1 deletion...t/battlearena/Controller/Utilities/CreateMediaPlayer.java
- src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java 7 additions, 2 deletionssrc/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java
- src/main/resources/fxml/LocalCreate.fxml 3 additions, 0 deletionssrc/main/resources/fxml/LocalCreate.fxml
- src/main/resources/fxml/MapSelection.fxml 2 additions, 1 deletionsrc/main/resources/fxml/MapSelection.fxml
- src/main/resources/fxml/SkinSelection.fxml 1 addition, 0 deletionssrc/main/resources/fxml/SkinSelection.fxml
- src/main/resources/videos/rainbow.mp4 0 additions, 0 deletionssrc/main/resources/videos/rainbow.mp4
Loading
Please register or sign in to comment