141 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Yvonne Schmidt	f33c673a05	lobby für feinschliff vorbereitet	2024-11-22 07:15:25 +01:00
Yvonne Schmidt	65a7958b66	popup ebenen angepasst und dropdown entfernt	2024-11-22 05:28:51 +01:00
Simon Wilkening	91e4df7478	B-Taste um Karte Kaufen Popup zu öffnen	2024-11-22 05:23:52 +01:00
Yvonne Schmidt	399606d9a0	Toolbar-Design angepasst	2024-11-22 04:45:27 +01:00
Johannes Schmelz	559afcaffd	added NextPlayerTurn	2024-11-22 01:38:48 +01:00
Johannes Schmelz	15f5f91ddb	rename sound files	2024-11-22 01:02:48 +01:00
Johannes Schmelz	067a8063a5	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-22 00:54:13 +01:00
Johannes Schmelz	35e367ba24	added sounds	2024-11-22 00:54:09 +01:00
Simon Wilkening	fe68d991fc	Merge remote-tracking branch 'origin/gui' into gui	2024-11-22 00:44:55 +01:00
Simon Wilkening	88dc633e8e	Würfellogik mit toolbar erneut verbunden	2024-11-22 00:44:36 +01:00
Johannes Schmelz	0b9cbb0f5f	view assets response now send alls properties and fixed which players properties are sent	2024-11-22 00:42:07 +01:00
Johannes Schmelz	c3a33b4402	added house prices and color to buildingfields	2024-11-21 15:30:34 +01:00
Luca Puderbach	e12f00aad6	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-20 03:36:59 +01:00
Luca Puderbach	47bac0185f	Port fix	2024-11-20 03:36:54 +01:00
Yvonne Schmidt	dafe1dab2a	Merge remote-tracking branch 'origin/gui' into gui	2024-11-20 03:24:46 +01:00
Yvonne Schmidt	8ba4ea2819	menues angepasst und vorlage für dropdown implementiert	2024-11-20 03:24:27 +01:00
Simon Wilkening	f6f708fd5b	Angepasste Toolbar	2024-11-20 03:17:10 +01:00
Luca Puderbach	1203077aed	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-20 02:39:20 +01:00
Luca Puderbach	ddbf79c928	can now add players	2024-11-20 02:37:00 +01:00
Johannes Schmelz	aa47dd579f	added selenium dependecy for drop down menu	2024-11-20 02:21:23 +01:00
Johannes Schmelz	cdce478d77	send GameStart message with a list of all Players	2024-11-20 01:45:34 +01:00
Johannes Schmelz	f11f4a59f1	fixed lemurproto dependecy	2024-11-20 00:55:33 +01:00
Luca Puderbach	d631e8df1e	TempFix	2024-11-20 00:50:19 +01:00
Johannes Schmelz	af80d40700	fix server start	2024-11-19 23:59:23 +01:00
Johannes Schmelz	3a6f8a945a	palyer ready fix	2024-11-19 23:59:16 +01:00
Luca Puderbach	bb9727d54a	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-19 23:09:44 +01:00
Luca Puderbach	7da8b3e545	Spieler Lobby	2024-11-19 23:09:39 +01:00
Johannes Schmelz	b6968df451	Merge branch 'main' into 'gui' ... Main See merge request progproj/gruppen-ht24/Gruppe-02!13	2024-11-19 20:30:56 +00:00
Johannes Schmelz	b85bbdd0ad	updates gitignore for vscode	2024-11-19 21:29:48 +01:00
Johannes Schmelz	aa986fb948	added backgroud music file	2024-11-19 20:51:24 +01:00
Yvonne Schmidt	6e63de6e99	Merge remote-tracking branch 'origin/gui' into gui	2024-11-19 19:54:40 +01:00
Yvonne Schmidt	962ecd08fa	SettingsMenu hat neues design	2024-11-19 19:54:22 +01:00
Luca Puderbach	580a26b3ea	Grundlage Toolbar	2024-11-19 19:50:25 +01:00
Johannes Schmelz	0cda6b5fa0	added first sound files	2024-11-19 19:40:27 +01:00
Johannes Schmelz	cc8c3795b8	added game sound logic	2024-11-19 19:27:52 +01:00
Johannes Schmelz	3c21165efb	adjusted config params	2024-11-19 19:09:37 +01:00
Luca Puderbach	818fdf4670	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-19 17:44:57 +01:00
Luca Puderbach	b7d679b492	neue map	2024-11-19 17:44:52 +01:00
Yvonne Schmidt	a42093df23	SettingsMenu nochmal angepasst	2024-11-19 17:34:22 +01:00
Johannes Schmelz	6157db51da	added server label	2024-11-19 14:46:11 +01:00
Yvonne Schmidt	843052989b	Merge remote-tracking branch 'origin/gui' into gui	2024-11-18 23:04:43 +01:00
Yvonne Schmidt	8e01fa3192	SettingsMenu angepasst	2024-11-18 23:04:09 +01:00
Johannes Schmelz	e2126a7ea7	implemented self host for server	2024-11-18 23:01:34 +01:00
Luca Puderbach	0b46d14650	LobbyServer Einfügen	2024-11-18 18:56:42 +01:00
Luca Puderbach	9e28deedf7	Grundlagen Lobby	2024-11-18 18:30:35 +01:00
Luca Puderbach	9c0172b413	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-18 17:27:51 +01:00
Luca Puderbach	2933d022aa	Veränderung Erreichen der Testwelt	2024-11-18 17:27:46 +01:00
Yvonne Schmidt	bdefb7193e	Merge remote-tracking branch 'origin/gui' into gui	2024-11-18 17:13:13 +01:00