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

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

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.

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

UPDATE: One-Time Sounds now added

Player can now place bombs that have a explosion radius that dont go through the wall.

See merge request !27

# Conflicts:
#   pom.xml
#   src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java
#   src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileFactory.java
#   src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java
#   src/main/java/module-info.java
#   src/main/resources/player/appSettings.json

This reverts commit 8035eae5.

Schlütter Yannik authored 1 year ago and Gehrung Jonas committed 1 year ago

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