# Conflicts:
#   src/main/resources/maps/coreMaps.json

New Maps and Tile-Images

See merge request !40

Update: ParserTest.java (minimum map-name length changed to 3 characters)
Update: coreMaps.json (new Maps added)

Issue: #89

Merge Request

See merge request !39

Issue: #89

# Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/Server.java

Issue: #89

Merge game scene into development

See merge request !34

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

Added pngs to forrest Biom and Bomberman
#83 #79

Merge ui into development

See merge request !32

Merge ui gameScene into development

See merge request !31

Issue: #89

Sound: Music is playing, fuiyoh:

See merge request !30

eb093: Added: All other important values like Health, player direction etc are now sent to the other player.

Issue: #89

Update: Spawn/ Spawnrate of different items
Fix: Destruction of Boxes behind Boxes

Forgot #83 #79

Update: Spawn/ Spawnrate of different items
Fix: Destruction of Boxes behind Boxes