Merge branch 'ui' into 'development' (16ba4c37) · 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

16ba4c37

Commit 16ba4c37 authored 1 year ago by Tran Peter

Downloads
- Plain Diff

Merge branch 'ui' into 'development'

Merge ui into development

See merge request !47

parents 47bae667 f04affe5

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java 3 additions, 0 deletions

...m_stuttgart/battlearena/Controller/CreditsController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 0 additions, 4 deletions

...stuttgart/battlearena/Controller/GameSceneController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java 3 additions, 2 deletions

...tgart/battlearena/Controller/LoadingScreenController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java 1 addition, 0 deletions

...gart/battlearena/Controller/MenuBorderPaneController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java 3 additions, 0 deletions

..._stuttgart/battlearena/Controller/SettingsController.java
src/main/resources/textures/images/background.png 0 additions, 0 deletions

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

with 10 additions and 6 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