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

962ef964

Commit 962ef964 authored 1 year ago by Tran Peter

Downloads
- Plain Diff

Merge branch 'ui' into 'development'

Merge ui into development

See merge request !49

parents 764a4863 42b98d43

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 10 additions, 4 deletions

...stuttgart/battlearena/Controller/GameSceneController.java
src/main/resources/fxml/LocalCreate.fxml 2 additions, 2 deletions

src/main/resources/fxml/LocalCreate.fxml
src/main/resources/fxml/MapSelection.fxml 66 additions, 59 deletions

src/main/resources/fxml/MapSelection.fxml
src/main/resources/styles/style.css 2 additions, 2 deletions

src/main/resources/styles/style.css
src/main/resources/textures/images/background.jpg 0 additions, 0 deletions

src/main/resources/textures/images/background.jpg
src/main/resources/textures/images/background.png 0 additions, 0 deletions

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

with 80 additions and 67 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