# Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java
#   src/main/java/module-info.java

# Conflicts:
#	src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/ConnectionHandler.java
#	src/main/java/module-info.java

Add: playerStats.json
Add: OracleDB.java (OracleDB communication added)
Update: AzureDB.java (Methods changed)
Update: DDL Script (optimised for OracleDB)
Update: GsonHandler.java (removed instance of "Persistence" Singleton as attribute
Update: module-info.java (added lines for OracleDB)
Update: Persistence.java (added methods for loading and saving data)
Update: pom.xml (added OracleDB as dependency)
Update: RuntimeInfo.java (added methods for analysing and utilizing data from persistence)
Update: MapData.java (changed attributes)

Merge UI into Development

See merge request !4

# Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java

Update: Server class and serverhandler class can now be started by creating a class instance, ipaddress can also be set each with a setter.

update: exports in module-info.java, fix: collisions with map not detected, fix: missing methods in IEntity.java #34

Add: RuntimeInfo.java
Update: MapData.java (Attributes + Methods added)
Update: PlayerStatistics.java
Update: Persistence.java
Update: localMaps.json (added test data)

update: added test map in GameSceneController.java, add: textures, update: variables in TileManager.java #41 #39

merging player for integration testing

See merge request !3