189 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Johannes Schmelz	7f09a6dae8	refactor	2024-11-23 18:02:46 +01:00
Johannes Schmelz	270129bc97	fixed typo	2024-11-23 17:58:56 +01:00
Johannes Schmelz	62ec6f6bef	dynamically allocate values	2024-11-23 17:58:17 +01:00
Johannes Schmelz	b24c14900c	food field dynamic value allocation	2024-11-23 17:54:11 +01:00
Johannes Schmelz	44c55ce3a6	refactor	2024-11-23 17:42:51 +01:00
Johannes Schmelz	895bea048c	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-23 17:41:47 +01:00
Johannes Schmelz	885ab5bdc9	dynamically allocate values	2024-11-23 17:41:20 +01:00
Yvonne Schmidt	c6355b2c09	dropdown lesbar	2024-11-23 17:37:27 +01:00
Yvonne Schmidt	ada6bf3f24	changed GateField font color	2024-11-23 17:24:41 +01:00
Simon Wilkening	db471ac679	Merge remote-tracking branch 'origin/gui' into gui	2024-11-23 17:22:37 +01:00
Simon Wilkening	84059c4085	GateField	2024-11-23 17:22:24 +01:00
Yvonne Schmidt	09b363f943	auswahllogik im dropdown implementiert	2024-11-23 17:03:56 +01:00
Simon Wilkening	fd347c7780	Building property eingefügt	2024-11-23 16:50:16 +01:00
Johannes Schmelz	b38a34efa5	add figure when player added	2024-11-23 16:35:33 +01:00
Johannes Schmelz	10e24cf30e	small bug fixes	2024-11-23 16:16:40 +01:00
Johannes Schmelz	3369057afb	update the players figure when moved	2024-11-23 16:08:46 +01:00
Johannes Schmelz	7ada56e215	limit the amount of players to 6	2024-11-23 14:41:17 +01:00
Johannes Schmelz	373b9e6d53	allow the host player to set start money	2024-11-23 13:20:05 +01:00
Johannes Schmelz	3de31de9f7	bind playercolor to join order	2024-11-23 12:46:20 +01:00
Johannes Schmelz	7252259ab3	updated trade and client logic	2024-11-23 09:15:57 +01:00