Merge branch 'development' into 'ui'
# Conflicts: # src/main/java/module-info.java
Showing
- .idea/.gitignore 2 additions, 0 deletions.idea/.gitignore
- .idea/dataSources.xml 12 additions, 0 deletions.idea/dataSources.xml
- .idea/misc.xml 1 addition, 1 deletion.idea/misc.xml
- .idea/sqldialects.xml 7 additions, 0 deletions.idea/sqldialects.xml
- pom.xml 25 additions, 0 deletionspom.xml
- 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/AccountType.java 9 additions, 0 deletions...rt/battlearena/Model/DataStorage/Classes/AccountType.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/AppSettings.java 22 additions, 0 deletions...rt/battlearena/Model/DataStorage/Classes/AppSettings.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/AzureDB.java 258 additions, 0 deletions...ttgart/battlearena/Model/DataStorage/Classes/AzureDB.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Exceptions/CryptoException.java 7 additions, 0 deletions...Model/DataStorage/Classes/Exceptions/CryptoException.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Exceptions/DatabaseException.java 12 additions, 0 deletions...del/DataStorage/Classes/Exceptions/DatabaseException.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Exceptions/GSONException.java 12 additions, 0 deletions...a/Model/DataStorage/Classes/Exceptions/GSONException.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Exceptions/ParserException.java 12 additions, 0 deletions...Model/DataStorage/Classes/Exceptions/ParserException.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Exceptions/SQLException.java 12 additions, 0 deletions...na/Model/DataStorage/Classes/Exceptions/SQLException.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/GsonHandler.java 137 additions, 0 deletions...rt/battlearena/Model/DataStorage/Classes/GsonHandler.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ISQLDataBase.java 23 additions, 0 deletions...t/battlearena/Model/DataStorage/Classes/ISQLDataBase.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/MapData.java 38 additions, 0 deletions...ttgart/battlearena/Model/DataStorage/Classes/MapData.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/MapInfo.java 40 additions, 0 deletions...ttgart/battlearena/Model/DataStorage/Classes/MapInfo.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/MapType.java 8 additions, 0 deletions...ttgart/battlearena/Model/DataStorage/Classes/MapType.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/OracleDB.java 257 additions, 0 deletions...tgart/battlearena/Model/DataStorage/Classes/OracleDB.java
Loading
Please register or sign in to comment