Merge branch 'development' into ui (454ec314) · Commits · Scherbaum Maximilian / BattleArena

Commit 454ec314 authored 1 year ago by Tran Peter

Browse files

Merge branch 'development' into ui

parents d75ace79 d688a7a7

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 1 addition, 0 deletions

pom.xml
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ENUMs/AccountType.java 9 additions, 0 deletions

...tlearena/Model/DataStorage/Classes/ENUMs/AccountType.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ENUMs/MapType.java 8 additions, 0 deletions

.../battlearena/Model/DataStorage/Classes/ENUMs/MapType.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ENUMs/ThreadStatus.java 9 additions, 0 deletions

...learena/Model/DataStorage/Classes/ENUMs/ThreadStatus.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/GsonHandler.java 1 addition, 1 deletion

...rt/battlearena/Model/DataStorage/Classes/GsonHandler.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java 36 additions, 52 deletions

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

.../battlearena/Model/DataStorage/Classes/PlayerAccount.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 238 additions, 4 deletions

...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadCreateAcc.java 42 additions, 0 deletions

...attlearena/Model/DataStorage/Classes/ThreadCreateAcc.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadDLCommMap.java 37 additions, 0 deletions

...attlearena/Model/DataStorage/Classes/ThreadDLCommMap.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadGetMapList.java 31 additions, 0 deletions

...ttlearena/Model/DataStorage/Classes/ThreadGetMapList.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadRstStats.java 31 additions, 0 deletions

...battlearena/Model/DataStorage/Classes/ThreadRstStats.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadSaveCommMap.java 39 additions, 0 deletions

...tlearena/Model/DataStorage/Classes/ThreadSaveCommMap.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadSaveStats.java 31 additions, 0 deletions

...attlearena/Model/DataStorage/Classes/ThreadSaveStats.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadStartup1.java 10 additions, 2 deletions

...battlearena/Model/DataStorage/Classes/ThreadStartup1.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadStartup2.java 31 additions, 0 deletions

...battlearena/Model/DataStorage/Classes/ThreadStartup2.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadUpdateMaps.java 31 additions, 0 deletions

...ttlearena/Model/DataStorage/Classes/ThreadUpdateMaps.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadUpdateStats.java 36 additions, 0 deletions

...tlearena/Model/DataStorage/Classes/ThreadUpdateStats.java
src/main/java/module-info.java 2 additions, 1 deletion

src/main/java/module-info.java

with 625 additions and 60 deletions

Please register or to comment