Merge branch 'ui-gameScene' into 'development' (547ff325) · 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

547ff325

Commit 547ff325 authored 1 year ago by Tran Peter

Downloads
- Plain Diff

Merge branch 'ui-gameScene' into 'development'

Merge game scene into development

See merge request !26

parents 06b5fe89 dcb0ab89

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 72 additions, 0 deletions

...stuttgart/battlearena/Controller/GameSceneController.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java 0 additions, 2 deletions

...tgart/battlearena/Controller/SkinSelectionController.java
src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java 1 addition, 1 deletion

src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java
src/main/resources/fxml/GameScene.fxml 75 additions, 6 deletions

src/main/resources/fxml/GameScene.fxml
src/main/resources/styles/style.css 5 additions, 0 deletions

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

src/main/resources/textures/images/game_scene_backgorund.jpg
src/main/resources/textures/images/test.jpg 0 additions, 0 deletions

src/main/resources/textures/images/test.jpg

with 153 additions and 9 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