71 Commits

Author	SHA1	Message	Date
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
Yvonne Schmidt	8698eed273	Tooolbar implementiert	2024-11-17 22:33:58 +01:00
Yvonne Schmidt	1af8614b35	Tooolbar in Testworld implementiert	2024-11-17 22:33:12 +01:00
Yvonne Schmidt	61b88f6bf8	Merge remote-tracking branch 'origin/gui' into gui	2024-11-15 18:39:47 +01:00
Yvonne Schmidt	8ab37e73c1	Anpassung des Button designs	2024-11-15 18:39:21 +01:00
Luca Puderbach	afdf43ebf1	Übergang zu TestMap verbessert	2024-11-15 08:36:16 +01:00
Luca Puderbach	2e0d1c059d	TestWord eingefügt	2024-11-15 07:00:55 +01:00
Yvonne Schmidt	2b772199b0	Merge remote-tracking branch 'origin/gui' into gui ... # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java	2024-11-15 06:49:13 +01:00
Yvonne Schmidt	c37b850798	Buttons im Startmenü angepasst	2024-11-15 06:48:25 +01:00
Luca Puderbach	c31f924d77	CreateGame fertig für feinschliff (Icon test)	2024-11-15 06:25:21 +01:00
Luca Puderbach	ed87a6167d	Verbesserung SettingsMenu	2024-11-15 05:36:57 +01:00
Luca Puderbach	f2fd283d06	Positionierung StartMenu Buttons & SettingsMenu	2024-11-15 05:04:25 +01:00
Luca Puderbach	85756713df	Erweitern des Setting und CreateGameMenü	2024-11-15 03:23:27 +01:00
Luca Puderbach	15b3902bd3	SettingsMenü Anpassungen	2024-11-15 02:31:12 +01:00
Luca Puderbach	12ef219064	Änderungs des StartBildschirms	2024-11-15 01:25:09 +01:00
Luca Puderbach	853b52b52d	Implementierung eines grundlegenden Startmenüs	2024-11-15 00:39:47 +01:00
Yvonne Schmidt	caa45097c3	klassen angepasst	2024-11-14 21:31:47 +01:00
Johannes Schmelz	7ee2273761	First compileable version of Client	2024-11-13 12:42:37 +00:00
Johannes Schmelz	86b8297c9d	fixed bugs, game now compiles	2024-11-13 13:31:02 +01:00
Yvonne Schmidt	17533112a1	Startmenü implementiert und Spielmenü Stummel erstellt	2024-11-12 23:30:44 +01:00
Johannes Schmelz	3784348f91	init for monopoly	2024-11-12 14:53:04 +01:00