Merge branch 'development' into ui (56660b4c) · Commits · Scherbaum Maximilian / BattleArena

Commit 56660b4c authored 1 year ago by Tran Peter

Browse files

Merge branch 'development' into ui

parents 250d6294 125a1777

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

README.md 3 additions, 0 deletions

README.md
pom.xml 13 additions, 0 deletions

pom.xml
src/main/java/de/hdm_stuttgart/battlearena/Controller/Enum/GameMode.java 6 additions, 0 deletions

...e/hdm_stuttgart/battlearena/Controller/Enum/GameMode.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/Enum/GameState.java 9 additions, 0 deletions

.../hdm_stuttgart/battlearena/Controller/Enum/GameState.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/Enum/PlayerMode.java 6 additions, 0 deletions

...hdm_stuttgart/battlearena/Controller/Enum/PlayerMode.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 30 additions, 6 deletions

...stuttgart/battlearena/Controller/GameSceneController.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/AppSettings.java 12 additions, 4 deletions

...rt/battlearena/Model/DataStorage/Classes/AppSettings.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/AzureDB.java 97 additions, 84 deletions

...ttgart/battlearena/Model/DataStorage/Classes/AzureDB.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/GsonHandler.java 36 additions, 24 deletions

...rt/battlearena/Model/DataStorage/Classes/GsonHandler.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ISQLDataBase.java 1 addition, 0 deletions

...t/battlearena/Model/DataStorage/Classes/ISQLDataBase.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/OracleDB.java 93 additions, 78 deletions

...tgart/battlearena/Model/DataStorage/Classes/OracleDB.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java 230 additions, 45 deletions

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

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

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

.../battlearena/Model/DataStorage/Classes/StartupThread.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/Parser.java 227 additions, 60 deletions

...ttlearena/Model/DataStorage/Classes/Utilities/Parser.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Scripts/DDL_Script_AzureDB.sql 17 additions, 9 deletions

...tlearena/Model/DataStorage/Scripts/DDL_Script_AzureDB.sql
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Scripts/DDL_Script_Oracle.sql 17 additions, 9 deletions

...ttlearena/Model/DataStorage/Scripts/DDL_Script_Oracle.sql
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/EntityFactory.java 6 additions, 4 deletions

...hdm_stuttgart/battlearena/Model/Entity/EntityFactory.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/EntityType.java 2 additions, 1 deletion

...de/hdm_stuttgart/battlearena/Model/Entity/EntityType.java

with 894 additions and 378 deletions

Please register or to comment