234 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Johannes Schmelz	0e405d2f90	send PlayerHandler in GameStart	2024-11-25 22:11:35 +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	1a62b76104	corrected map size	2024-11-25 16:28:50 +01:00
Johannes Schmelz	cc7f277bef	fixed b button	2024-11-25 15:05:02 +01:00
Johannes Schmelz	274df8dfd1	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-25 06:50:05 +01:00
Johannes Schmelz	2e256f4ff5	Merge branch 'gui' into 'main' ... Gui v1.0 See merge request progproj/gruppen-ht24/Gruppe-02!16	2024-11-25 05:33:36 +00:00
Johannes Schmelz	d10111d2ab	Gui v1.0	2024-11-25 05:33:36 +00:00
Johannes Schmelz	0c2b266f5e	Merge branch 'main' into 'gui' ... # Conflicts: # Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java # Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy # Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/Player.java	2024-11-25 05:33:21 +00:00
Simon Wilkening	16b4dbae18	Deckhelper korrigiert	2024-11-25 06:30:04 +01:00
Johannes Schmelz	88409dcc99	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-25 05:42:49 +01:00
Johannes Schmelz	5cacff39b7	refactor typo	2024-11-25 05:42:45 +01:00
Yvonne Schmidt	093723a9d0	added outline for ChoosePartner Menu	2024-11-25 05:40:49 +01:00
Johannes Schmelz	f67ce6be44	Merge branch 'Testhandbuch' into 'main' ... newest version of tests See merge request progproj/gruppen-ht24/Gruppe-02!15	2024-11-25 04:34:06 +00:00
Johannes Schmelz	1be29b8b7a	newest version of tests	2024-11-25 04:34:06 +00:00
Johannes Schmelz	dfdbcdc9f3	board visible again	2024-11-25 05:16:24 +01:00
Johannes Schmelz	bd725e2dc4	refactor	2024-11-25 04:54:35 +01:00
Johannes Schmelz	dd9d9144dd	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-25 04:52:56 +01:00
Johannes Schmelz	1a429e4bb6	fixed settings in toolbar	2024-11-25 04:52:53 +01:00
Yvonne Schmidt	ad6fb5e926	added dice containers	2024-11-25 04:52:34 +01:00
Johannes Schmelz	72cb7049ba	remove demo cube	2024-11-25 04:19:13 +01:00
Johannes Schmelz	2e42f3afac	added testing shortcuts	2024-11-25 04:09:48 +01:00
Yvonne Schmidt	8474c9f5bc	fixed EventCard sizing	2024-11-25 03:56:07 +01:00
Johannes Schmelz	b7ed03f7e8	resolve merge conflicts	2024-11-25 03:55:06 +01:00
Johannes Schmelz	a44b6b5e4c	Merge branch 'connect' into 'gui' ... Client connect to server See merge request progproj/gruppen-ht24/Gruppe-02!14	2024-11-25 02:46:03 +00:00
Johannes Schmelz	5268f75e17	Client connect to server	2024-11-25 02:46:03 +00:00
Simon Wilkening	687d1621fc	EventCard erweitert	2024-11-25 00:06:12 +01:00
Johannes Schmelz	a6944aa6e3	added dice images	2024-11-24 23:38:22 +01:00
Johannes Schmelz	b8365c76a1	fix mac executable	2024-11-24 22:58:47 +01:00
Johannes Schmelz	19216cc174	refactor	2024-11-24 22:57:19 +01:00
Johannes Schmelz	c6a23b9b8e	execute for apple	2024-11-24 22:56:52 +01:00
Johannes Schmelz	c0f42fb1eb	refactor	2024-11-24 22:50:52 +01:00
Tamino Mueller	160873e2cc	added pictures and popups fixed	2024-11-24 22:42:32 +01:00
Tamino Mueller	8df859bbef	Merge remote-tracking branch 'origin/gui' into gui	2024-11-24 22:34:54 +01:00
Tamino Mueller	e30d10a85d	Pop-Up hinzugefügt	2024-11-24 22:34:19 +01:00
Yvonne Schmidt	bafc3f1db6	Merge remote-tracking branch 'origin/gui' into gui	2024-11-24 19:25:12 +01:00
Yvonne Schmidt	03571fcf74	code cleanup in der lobby	2024-11-24 19:24:51 +01:00