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

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

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

update: split collision detection in map and entity in CollisionHandler.java, implemented attack method in Player.java, updated key inputs in InputHandler.java #35 #34

Update: the client can now connect to the server and exchange coordinates depending on the client addressing the server.

Update: Added Getter/Setter to the ConnectionHandler class and added a stop method for the Thread in the server class.