195 Commits

Author	SHA1	Message	Date
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	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	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
Johannes Schmelz	e7a6802488	fixed buyProperty	2024-11-24 19:14:56 +01:00
Yvonne Schmidt	a6e6b5e158	lobby übergibt figur	2024-11-24 19:05:28 +01:00
Simon Wilkening	74c3d925e6	TODOs und Kommentare ergänst	2024-11-24 19:04:58 +01:00
Yvonne Schmidt	f67fa4d7f0	lobby übergibt namen	2024-11-24 18:39:32 +01:00
Simon Wilkening	225a8c0e08	BuildingPropertyCard adjusted	2024-11-24 18:11:42 +01:00
Yvonne Schmidt	9a6ce27fe1	lobby uebergibt farbe und startgeld	2024-11-24 18:07:39 +01:00
Johannes Schmelz	437114704a	get client id	2024-11-24 17:20:35 +01:00
Johannes Schmelz	9b4cac4e56	send PlayerHandler when starting game	2024-11-24 16:51:00 +01:00
Johannes Schmelz	e780513b35	saving the players	2024-11-24 00:32:16 +01:00
Johannes Schmelz	d582c59a7d	added playerState changes	2024-11-24 00:29:48 +01:00
Johannes Schmelz	7d2c85f617	fixed card bug	2024-11-24 00:13:32 +01:00
Johannes Schmelz	4a882bc4ac	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-24 00:11:18 +01:00
Johannes Schmelz	3c4eac1fcd	added logic for visiting event field	2024-11-24 00:11:14 +01:00
Yvonne Schmidt	75d5a15bdb	defaultwerte in die Lobby eingefügt	2024-11-23 23:19:53 +01:00
Yvonne Schmidt	17f121f7d1	Merge remote-tracking branch 'origin/gui' into gui	2024-11-23 23:15:04 +01:00
Johannes Schmelz	a66c570b51	remove 2d map view	2024-11-23 23:09:02 +01:00
Yvonne Schmidt	e1e7f2eaf6	überschneidungen von elementen beseitigt	2024-11-23 23:07:42 +01:00
Johannes Schmelz	46d2dce372	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-23 22:12:39 +01:00
Johannes Schmelz	c39f1f6d4c	tweaked camera params	2024-11-23 22:12:34 +01:00
Yvonne Schmidt	738b04f2d9	oberfläche der lobby fertig	2024-11-23 21:29:14 +01:00
Simon Wilkening	ecba1c3135	GateField korrigiert	2024-11-23 21:22:54 +01:00
Johannes Schmelz	748226f4ed	added Move Camera based on player position	2024-11-23 19:27:04 +01:00
Johannes Schmelz	f658f53ba9	refactor	2024-11-23 19:26:36 +01:00
Johannes Schmelz	4a8304ee4f	relabled FoodField	2024-11-23 18:53:29 +01:00
Simon Wilkening	7fe9604338	FoodField korrigiert	2024-11-23 18:28:28 +01:00