resolved merge conflict
Showing
- .idea/inspectionProfiles/profiles_settings.xml 7 additions, 0 deletions.idea/inspectionProfiles/profiles_settings.xml
- README.md 13 additions, 1 deletionREADME.md
- src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java 2 additions, 2 deletions...ttgart/battlearena/Controller/CommunityMapController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/CreateAccountController.java 9 additions, 5 deletions...tgart/battlearena/Controller/CreateAccountController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java 3 additions, 2 deletions...m_stuttgart/battlearena/Controller/CreditsController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/Enum/GameState.java 17 additions, 5 deletions.../hdm_stuttgart/battlearena/Controller/Enum/GameState.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 126 additions, 75 deletions...stuttgart/battlearena/Controller/GameSceneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java 11 additions, 6 deletions...hdm_stuttgart/battlearena/Controller/IntroController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java 47 additions, 27 deletions...tgart/battlearena/Controller/LoadingScreenController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java 7 additions, 1 deletion...uttgart/battlearena/Controller/LocalCreateController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/LoginController.java 9 additions, 5 deletions...hdm_stuttgart/battlearena/Controller/LoginController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java 8 additions, 17 deletions..._stuttgart/battlearena/Controller/MainMenuController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java 5 additions, 4 deletions..._stuttgart/battlearena/Controller/MapForgeController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MapSelectionController.java 54 additions, 14 deletions...ttgart/battlearena/Controller/MapSelectionController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java 15 additions, 41 deletions...gart/battlearena/Controller/MenuBorderPaneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/PauseController.java 35 additions, 0 deletions...hdm_stuttgart/battlearena/Controller/PauseController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/PauseSettingsController.java 55 additions, 0 deletions...tgart/battlearena/Controller/PauseSettingsController.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/Controller/PlayerCreateController.java 1 addition, 2 deletions...ttgart/battlearena/Controller/PlayerCreateController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java 11 additions, 8 deletions..._stuttgart/battlearena/Controller/SettingsController.java
Loading
Please register or sign in to comment