88 Commits

Author	SHA1	Message	Date
Yvonne Schmidt	227a7a027f	added comments	2024-11-27 23:40:16 +01:00
Luca Puderbach	c346058631	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-27 17:34:52 +01:00
Luca Puderbach	f2678ea33d	doppelwürfel	2024-11-27 17:34:41 +01:00
Yvonne Schmidt	45a43d6998	Merge remote-tracking branch 'origin/gui' into gui	2024-11-27 00:17:31 +01:00
Yvonne Schmidt	cb9888af7a	completed BuildingAdminMenu	2024-11-27 00:17:04 +01:00
Johannes Schmelz	93b183254f	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-27 00:11:11 +01:00
Johannes Schmelz	e92b305a56	cleanup	2024-11-27 00:11:07 +01:00
Johannes Schmelz	5b0628da15	dynamically get the fieldid for by popups	2024-11-27 00:10:59 +01:00
Yvonne Schmidt	8d087a8e84	added framework for BuildingAdminMenu	2024-11-26 23:15:14 +01:00
Johannes Schmelz	1715926c1c	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-26 23:01:59 +01:00
Johannes Schmelz	c8b69efca2	added correct colors in LobbyMenu	2024-11-26 23:01:55 +01:00
Yvonne Schmidt	7f6011720c	lobbyMenu ready button toggles to grey	2024-11-26 22:30:13 +01:00
Yvonne Schmidt	bdc5f0269f	fixed cancel button position	2024-11-26 22:27:55 +01:00
Yvonne Schmidt	a6054e825e	fixed trade display	2024-11-26 22:24:03 +01:00
Johannes Schmelz	156e76fe0a	cleanup	2024-11-26 21:31:21 +01:00
Johannes Schmelz	89587a4c78	set default value for drop down selection	2024-11-26 21:28:41 +01:00
Johannes Schmelz	29cc73e83b	automaticyally set player name as 'Spieler'+ id+1	2024-11-26 20:58:57 +01:00
Johannes Schmelz	e56cdb1dcb	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-26 20:00:54 +01:00
Johannes Schmelz	9107a08011	dynamically set players in ChoosePatner	2024-11-26 20:00:50 +01:00
Yvonne Schmidt	0242587a5f	added groundwork for selection listeners	2024-11-26 19:54:02 +01:00
Yvonne Schmidt	3ce27023c2	Merge remote-tracking branch 'origin/gui' into gui	2024-11-26 19:42:01 +01:00
Johannes Schmelz	174958c6b1	can now dynamically update toolbar view	2024-11-26 18:50:24 +01:00
Yvonne Schmidt	ada067a2a0	added and centered buttons	2024-11-26 18:25:23 +01:00
Johannes Schmelz	f4c4f6bc93	cleanup	2024-11-26 17:53:49 +01:00
Simon Wilkening	efba3c496a	Deckhelper korrigiert, Properties angepasst	2024-11-26 15:15:29 +01:00
Johannes Schmelz	27a0ab52e6	dice button now works and update dice images accordingly	2024-11-26 14:59:48 +01:00
Yvonne Schmidt	d6ce859fcd	ChoosePartner accept-button opens TradeMenu	2024-11-26 01:12:29 +01:00
Yvonne Schmidt	e5f69c9536	Merge remote-tracking branch 'origin/gui' into gui ... # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/ChoosePartner.java	2024-11-26 01:08:59 +01:00
Yvonne Schmidt	d8a2225038	added framework for TradeMenu	2024-11-26 01:07:59 +01:00
Johannes Schmelz	7b91a679f5	abbrechen button in chossePatner	2024-11-26 00:57:22 +01:00
Yvonne Schmidt	840658b590	fixed background location again	2024-11-26 00:34:49 +01:00
Yvonne Schmidt	c5e7ef855e	fixed background location	2024-11-26 00:25:31 +01:00
Yvonne Schmidt	170227c97f	fixed header in ChoosePartner menu	2024-11-26 00:21:13 +01:00
Johannes Schmelz	379803278b	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-26 00:11:42 +01:00
Johannes Schmelz	3956d8efa7	show all playe stats in toolbar	2024-11-26 00:11:37 +01:00
Yvonne Schmidt	269aceaf1a	added ChoosePartner menu	2024-11-26 00:11:01 +01:00
Yvonne Schmidt	41127565fc	Merge remote-tracking branch 'origin/gui' into gui	2024-11-26 00:10:52 +01:00
Yvonne Schmidt	f67810b288	fixed toolbar buttons	2024-11-25 21:29:54 +01:00
Johannes Schmelz	4095d9e79d	fixed buyCard color and button function	2024-11-25 21:29:00 +01:00
Johannes Schmelz	547a4c2353	cleanup toolbar	2024-11-25 21:14:38 +01:00
Johannes Schmelz	9120e4d53c	show test world when GameStart message is recieved	2024-11-25 17:50:54 +01:00
Johannes Schmelz	cc7f277bef	fixed b button	2024-11-25 15:05:02 +01:00
Johannes Schmelz	d10111d2ab	Gui v1.0	2024-11-25 05:33:36 +00:00
Johannes Schmelz	1be29b8b7a	newest version of tests	2024-11-25 04:34:06 +00:00
Johannes Schmelz	dbd9dd0001	refactor models	2024-11-18 16:43:54 +01:00
Dennis_Malkmus	4ac897693c	Merge remote-tracking branch 'origin/gui' into gui	2024-11-18 14:56:48 +01:00
Dennis_Malkmus	dfb962e9fe	Einfügen Übergangsmodell (6 gefärbte Spielsteine)	2024-11-18 14:53:51 +01:00
Luca Puderbach	f97cbd778d	Hintergrund + Felder ID hinzugefügt	2024-11-18 09:09:05 +01:00
Luca Puderbach	e889a61d43	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-18 08:14:10 +01:00
Luca Puderbach	a33d422547	Protoyp Würfel eingefügt	2024-11-18 08:14:05 +01:00