Merge branch 'development' into 'LocalGameplay'
# Conflicts: # src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
No related branches found
No related tags found
Showing
- pom.xml 13 additions, 0 deletionspom.xml
- 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 215 additions, 48 deletions...rt/battlearena/Model/DataStorage/Classes/Persistence.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/PlayerStatistics.java 13 additions, 13 deletions...ttlearena/Model/DataStorage/Classes/PlayerStatistics.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 6 additions, 39 deletions...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/Parser.java 219 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/resources/log4j2.xml 1 addition, 0 deletionssrc/main/resources/log4j2.xml
- src/main/resources/maps/communityMaps.json 16 additions, 0 deletionssrc/main/resources/maps/communityMaps.json
- src/main/resources/maps/coreMaps.json 4 additions, 4 deletionssrc/main/resources/maps/coreMaps.json
- src/test/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/PersistenceTest.java 48 additions, 0 deletions...attlearena/Model/DataStorage/Classes/PersistenceTest.java
- src/test/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/ParserTest.java 136 additions, 48 deletions...arena/Model/DataStorage/Classes/Utilities/ParserTest.java
Loading
Please register or sign in to comment