Merge branch 'DataBase' into 'development' (90bbb69e) · 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

90bbb69e

Commit 90bbb69e authored 1 year ago by Schuh Martin

Downloads
- Plain Diff

Merge branch 'DataBase' into 'development'

Update: coreMaps.json (added new maps)

See merge request !25

parents 309190e0 3f01283c

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 1 addition, 1 deletion

...stuttgart/battlearena/Controller/GameSceneController.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java 1 addition, 0 deletions

...rt/battlearena/Model/DataStorage/Classes/Persistence.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 15 additions, 8 deletions

...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
src/main/resources/maps/coreMaps.json 22 additions, 1 deletion

src/main/resources/maps/coreMaps.json

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