Update: Persistence.java (fixed appSettings reset method)
Update: Parser.java (added method for parsing volume)
Update: ParserTest.java (added test for testing volume parser)
Update: RuntimeInfo.java (moved method to calculate ingametime in hours to PlayerStatistics.java)

# Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java

Update. Persistence.java (implemented methods to reset settings)
Update: PlayerStatistics.java (moved method to calculate ingametime in hours from Persistence.java to here)
Update: RuntimeInfo.java (changed method "setGameMap" to get whole instance of MapData Class of chosen map instead of only the string of the actual mapdata; moved method to calculate ingametime in hours to PlayerStatistics.java)

merge LokalGameplay into development

See merge request !12

# Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java

TileManager.java: Changed: tileMap to public static, Added: new Tile and 1 new TileType from TileFactory.java
TileFactory.java: Added: new Tiletype "destructible"
TileType.java: Added 2 new enumTypes
GameSceneController.java: Changed: diffTileCount to 6, Added checkHealTile in renderContent Method
Player.java: Added TileManager import, checkHealTile Method, Added new Code in attack Method to make a heart spawn when attacking an enemy, started using healPlayer Method
NetworkPlayerTwo.java: Added checkHealTile Method and healPlayerMethod
ITile.java: Added getDestruction Method
IEntity.java: Added checkHealTile and healPlayer
BackgroundTile.java: Added Methods for destruction type

Merge DataBase to development

See merge request !11

Update. AzureDB.java (cosmetic fixes)

Update: PlayerStatistics.java (remade methods to add changes)

Update: Persistence.java (added getter methods)
Update: pom.xml (added dependency "mockito")
Add: PersistenceTest.java

Update: ParserTest.java (change text of an exception)
Update: AzureDB.java (rephrased some exceptions; fixed SQL statement of "uploadCommunityMap" method)
Update: OracleDB.java (rephrased some exceptions; fixed SQL statement of "uploadCommunityMap" method)
Update: GsonHandler.java (rephrased some exceptions)
Update: DDL_Script_Oracle.sql (added second community map)
Update: DDL_Script_AzureDB.sql (added second community map)
Update: Persistence.java (added method to verify core maps and community maps; moved methods from RuntimeInfo.java for creating RemoteMapsList and setting map for next game round)
Update: RuntimeInfo.java (moved methods from RuntimeInfo.java for creating RemoteMapsList and setting map for next game round; added method to calculate game time)
Update: log4j2.xml (enabled logging to file)

Update: ParserTest.java (change text of an exception)
Update: AzureDB.java (added method to reset stats)
Update: OracleDB.java (added method to reset stats)
Update: ISQLDataBase.java (added method to reset stats)
Update: DDL_Script_Oracle.sql (changed max length for mapData; added new test maps)
Update: DDL_Script_AzureDB.sql (changed max length for mapData; added new test maps)
Update: Persistence.java (added method to reset locally stored mapData if corrupted)

Update: ParserTest.java (added a lot of new tests and changed tests for mapData Strings for changed specifications)

Update: Parser.java (method for parsing IP now contains additional check; method for parsing mapData completely rebuilt to allow different map sizes and Tile-Numbers from 0 to 99)

delete: LocalPlayerTwo.java, update: Player.java implemented different stats for EntityClass.java and connected inputs for local game mode, add: PlayerMode.java #70 #71 #72 #73

create: GameMode.java, create: GameState.java, update: RuntimeInfo.java implementation of different game modes and states, update: GameSceneController.java implementation of RuntimeInfo, create: LocalPlayerTwo.java

Update: Parser.java (method for parsing IP now contains additional check; method for parsing mapData completely rebuilt to allow different map sizes and Tile-Numbers from 0 to 99)

Mergin ui into development

See merge request !10

# Conflicts:
#   src/main/java/module-info.java

Merge database branch into development branch

See merge request !8

# Conflicts:
#   src/main/java/module-info.java

Update: Persistence.java (new method to update and save statistics)

Update: OracleDB.java (changed Exceptions
Update: Parser.java (renamed method)
Update: Persistence.java (methods now public. Moved some methods from RuntimeInfo.java to Persistence.java)
Update: RuntimeInfo.java (Moved methods from RuntimeInfo.java to Persistence.java)

Update: CryptoUtils.java (Nof differentiate between Files that can be encrypted multiple times, Files that can only be encrypted once and Files that have already been encrypted)
Update: CryptoUtilsTest.java (Added new UnitTests and a RepeatedTest more to come yet) #60

Update: CryptoUtils.java (Nof differentiate between Files that can be encrypted multiple times, Files that can only be encrypted once and Files that have already been encrypted)
Update: CryptoUtilsTest.java (Added new UnitTests and a RepeatedTest more to come yet) #60

Update: OracleDB.java (fixed methods, changed Exception type)
Update: Renamed DatabaseError.java to DatabaseException.java
Update: Renamed ParserError.java to ParserException.java
Update: GsonHandler.java (fixed methods, changed Exception type)
Update: ISQLDataBase.java (changed Exception type)
Update: PlayerStatistics.java (removed field "statsLoaded")
Update: Persistence.java (updated methods)
Update: RuntimeInfo.java (updated methods)

Update: Code for working encryption while not interfering with already encrypted code in CryptoUtils.java
Add: CryptoUtilsTest.java (Added UnitTests for CryptoUtils.java Class)
Add: files for UnitTestsencryptedtestFile

Update: Code for working encryption while not interfering with already encrypted code in CryptoUtils.java which has also been done for not yet pushed java Tests

Update: DDL_Script_Oracle.sql (Minor fix to allow UPDATE privilege in communitymaps table in "map_downloads" column)
Update: AzureDB.java (minor fixes + code to update download-counter when downloading community map from SQL Server)
Update: OracleDB.java (minor fixes + code to update download-counter when downloading community map from SQL Server)