Update: RuntimeInfo.java (moved fields for thread information to new Singleton "Threads")
Add: ThreadLogin.java
Add: Threads.java (new Singleton to store information about threads)
Add: ThreadStartup3.java
Update: ThreadStatus.java (added value "NONE")

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

Update: Persistence.java (consolidated methods "saveMapLocally" und "uploadCreatedMap" into one method)
Update: RuntimeInfo.java (added fields for additional Thread classes + getter/setter)
Update: ThreadUpdateStats.java (added lines to reset stats counter after updating stats)
Add: ThreadCreateAcc.java
Add: ThreadDLCommMap.java
Add: ThreadGetMapList.java
Add: ThreadRstStats.java
Add: ThreadSaveCommMap.java
Add: ThreadSaveStats.java

Update: MapType.java (moved to package "ENUMs")
Update: Persistence.java (removed obsolete method)
Update: PlayerAccount.java
Update: RuntimeInfo.java (added fields for thread status-updates and messages + fields for tracking stats during game)
Update: ThreadStartup1.java (renamed StartupThread.java to ThreadStartup1.java)
Add: ThreadStatus.java (ENUMs to reflect current status of a thread)
Add: ThreadUpdateMaps.java (thread for updating core-maps)
Add: ThreadStartup2.java (thread for loading player-account and player-statistics at startup)

Sound: Music is playing, fuiyoh

See merge request !18

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