Merge branch 'main' into 'gui'

Browse Source

# Conflicts:
#   Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameSound.java
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java
#   Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java
#   Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/ServerGameLogic.java
#   Projekte/monopoly/model/src/main/resources/monopoly.properties

...

This commit is contained in:

Johannes Schmelz

2024-11-18 03:14:07 +00:00

parent 8698eed273 951b4c198c

commit fffd32e13c

53 changed files with 3611 additions and 203 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Projekte/monopoly/client/src/main/resources/Pictures/unibw-Bib.jpeg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 144 KiB