# Conflicts:
#   pom.xml
#   src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java
#   src/main/java/module-info.java

Merge ui into development

See merge request !17

Fixes for UI-Database integration

See merge request !16

Update: Persistence.java (added method for saving settings to json; added method for resetting playerAccount.json; removed unnecessary fields and methods for creating list of mapNames; commented out method to get chosen map, is now obsolet)
Update: Parser.java (fixed Exception message for sha1hashhex method)
Update: Parser.java (fixed Exception message for sha1hashhex method and renamed these methods)
Update: DDL_Script_Oracle.sql (changed test-player password to hashed password)
Update: DDL_Script_AzureDB.sql (changed test-player password to hashed password)
Update: RuntimeInfo.java (changed method to set selected map; removed reference to Persistence.java Singleton from fields)

Thread added

See merge request !15

Add: StartupThread.java (new class for loading some startup methods in separate thread)

Finishing Touch II

See merge request !14

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)

Finishing Touch

See merge request !13

# 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)