Johannes Schmelz 4ecccc5951 Merge branch 'gui' into 'connect' ... # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuildingPropertyCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/FoodFieldCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/GateFieldCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java # Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java		2024-11-25 02:45:02 +00:00
..
client	Merge branch 'gui' into 'connect'	2024-11-25 02:45:02 +00:00
model	Merge branch 'gui' into 'connect'	2024-11-25 02:45:02 +00:00
server	added serialisables	2024-11-25 03:07:57 +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