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

0ada6782

Commit 0ada6782 authored 1 year ago by Schuh Martin

Downloads
- Plain Diff

Merge branch 'DataBase' into 'development'

Finishing Touch

See merge request !13

parents 1b694101 e1408de6

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/Model/DataStorage/Classes/AppSettings.java 11 additions, 3 deletions

...rt/battlearena/Model/DataStorage/Classes/AppSettings.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java 11 additions, 4 deletions

...rt/battlearena/Model/DataStorage/Classes/Persistence.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/PlayerStatistics.java 4 additions, 0 deletions

...ttlearena/Model/DataStorage/Classes/PlayerStatistics.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 5 additions, 3 deletions

...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java

with 31 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