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

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

Merge game scene into development

See merge request !26

Update: coreMaps.json (added new maps)

See merge request !25

Update: GameSceneController.java (selected map will now be loaded for game)
Update: Persistence.java (added call of "resetGameStats()" method from RuntimeInfo.java at end of updateStats method)
Update: RuntimeInfo.java (added method to reset game-stats)

Issue: #89

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

See merge request !24

Update: coreMaps.json (added final mapdata to Arena1)

See merge request !23

Update DDL_Script_AzureDB.sql (added new map "Outpost")
Update DDL_Script_Oracle.sql (added new map "Outpost")
Update Persistence.java (added new map "Outpost" to "resetCoreMaps" method)

Issue: #89

Update: DDL_Script_Oracle.sql (added final mapdata to Arena1)
Update: DDL_Script_AzureDB.sql (added final mapdata to Arena1)
Update: ParserTest.java (added final mapdata of Arena1 to test)
Update: Persistence.java (added final mapdata of Arena1 to reset method; added "synchronized" to all methods)

Issues: #89