peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2024-11-24 23:59:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
5189c74058
Gruppe-02-clone/Projekte/monopoly
History
Johannes Schmelz fffd32e13c Merge branch 'main' into 'gui' 
# 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
2024-11-18 03:14:07 +00:00
..
client Merge branch 'main' into 'gui' 2024-11-18 03:14:07 +00:00
model Merge branch 'main' into 'gui' 2024-11-18 03:14:07 +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