Johannes Schmelz 12c1c97a99 Merge branch 'logic' into 'gui' ...

# Conflicts:
#   Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java
#   Projekte/monopoly/model/src/main/java/pp/monopoly/notification/Sound.java

2024-11-18 03:50:41 +00:00

..

client

Resolve merge conflicts

2024-11-18 04:42:30 +01:00

model

Merge branch 'logic' into 'gui'

2024-11-18 03:50:41 +00:00

server

Server bug fix. Add player did not correspond with the params

2024-11-18 00:24:15 +01:00

run-mac.sh

init for monopoly

2024-11-12 14:53:04 +01:00

run.sh

init for monopoly

2024-11-12 14:53:04 +01:00