Merge branch 'ui-gameScene' into 'development' (041cee7a) · Commits · Scherbaum Maximilian / BattleArena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BattleArena
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

041cee7a

Commit 041cee7a authored 1 year ago by Tran Peter

Downloads
- Plain Diff

Merge branch 'ui-gameScene' into 'development'

Merge ui gameScene into development

See merge request !31

parents 7a88b7b2 24c9b300

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 54 additions, 8 deletions

...stuttgart/battlearena/Controller/GameSceneController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/PauseController.java 32 additions, 0 deletions

...hdm_stuttgart/battlearena/Controller/PauseController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/PauseSettingsController.java 54 additions, 0 deletions

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

...tgart/battlearena/Controller/Utilities/ScreenClasses.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Inputs/InputHandler.java 4 additions, 0 deletions

.../hdm_stuttgart/battlearena/Model/Inputs/InputHandler.java
src/main/resources/fxml/Pause.fxml 14 additions, 0 deletions

src/main/resources/fxml/Pause.fxml
src/main/resources/fxml/PauseSettings.fxml 33 additions, 0 deletions

src/main/resources/fxml/PauseSettings.fxml
src/main/resources/styles/style.css 1 addition, 1 deletion

src/main/resources/styles/style.css
src/main/resources/textures/images/game_scene_backgorund.png 0 additions, 0 deletions

src/main/resources/textures/images/game_scene_backgorund.png

with 192 additions and 37 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment