627 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Johannes Schmelz	48913356e3	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-08 16:05:39 +01:00
Johannes Schmelz	e498c6f179	refactor	2024-12-08 16:03:21 +01:00
Johannes Schmelz	31fe60807f	spelling	2024-12-08 15:57:32 +01:00
Yvonne Schmidt	c758ba9735	corrected toolbar labels	2024-12-08 15:05:47 +01:00
Yvonne Schmidt	650dcb85db	toolbar frame has playercolor	2024-12-08 14:53:41 +01:00
Luca Puderbach	6b110c81c8	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-08 04:57:09 +01:00
Luca Puderbach	93ef00870b	update toolbar + background	2024-12-08 04:57:04 +01:00
Johannes Schmelz	645433610f	added control for figures	2024-12-08 02:43:58 +01:00
Johannes Schmelz	10a5b6b4d4	cleanup	2024-12-08 02:39:05 +01:00
Johannes Schmelz	69fccefed9	file path updated	2024-12-08 02:23:21 +01:00
Johannes Schmelz	14aecdd929	changed images	2024-12-08 02:21:54 +01:00
Johannes Schmelz	48f18dd468	Merge branch 'reworkedGui' into 'gui' ... Reworked gui and client states See merge request progproj/gruppen-ht24/Gruppe-02!19	2024-12-08 01:19:34 +00:00
Johannes Schmelz	96fe09c6fa	Reworked gui and client states	2024-12-08 01:19:34 +00:00
Johannes Schmelz	a686671c15	Merge branch 'reworkedGui' into 'main' ... refactor Worlds and client States See merge request progproj/gruppen-ht24/Gruppe-02!18	2024-12-08 01:18:35 +00:00
Johannes Schmelz	e102d22f14	refactor Worlds and client States	2024-12-08 01:18:35 +00:00
Luca Puderbach	14c68f55d9	ltl backgrounds	2024-12-08 01:16:26 +01:00
Yvonne Schmidt	392a81b2d8	fixed background music overlap	2024-12-07 18:29:41 +01:00
Yvonne Schmidt	944b6b674e	replaced text displays with labels	2024-12-07 14:54:55 +01:00
Simon Wilkening	5f4c6be7b8	adjusted test in ReceivedRent	2024-12-06 17:04:00 +01:00
Johannes Schmelz	aca92cd7f1	clean up	2024-12-06 16:21:12 +01:00
Johannes Schmelz	b50b5e64d1	can only trade fields without buildings	2024-12-06 16:06:40 +01:00
Johannes Schmelz	551786bf30	fixed enabled pref in GameMusic	2024-12-06 15:56:42 +01:00
Simon Wilkening	2aca94100e	adjusted test in ReceivedRent	2024-12-06 13:20:40 +01:00
Simon Wilkening	9e81fb8549	TopDialog in Propertyoverview eingefügt	2024-12-06 13:17:57 +01:00
Simon Wilkening	3c6e519e77	Rent/ReceivedRent text changed	2024-12-06 13:12:56 +01:00
Simon Wilkening	9be00ab848	renamed IgfPadubrin and Rent/ReceivedRent	2024-12-06 12:35:57 +01:00
Simon Wilkening	c2c22f9ae5	NoMoneywarning and TimeOut use Dialogmanager now	2024-12-06 11:57:20 +01:00
Johannes Schmelz	e65c2661f7	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-05 02:48:00 +01:00
Johannes Schmelz	88db193b5e	choose your charakter	2024-12-05 02:47:55 +01:00
Yvonne Schmidt	38824895bb	set new toolbar background	2024-12-05 02:05:47 +01:00
Johannes Schmelz	a78261594d	ImageButton for new Button design	2024-12-05 01:43:01 +01:00
Yvonne Schmidt	646d301554	added toolbar icons	2024-12-05 01:16:06 +01:00
Johannes Schmelz	e49b22c022	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-04 18:51:19 +01:00
Luca Puderbach	8821602728	kamera	2024-12-04 16:44:26 +01:00
Luca Puderbach	eb19e290bb	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-04 16:39:37 +01:00
Luca Puderbach	b477077b9b	Kamera Teil1	2024-12-04 16:39:32 +01:00
Yvonne Schmidt	02cfc1d21a	fixed formating errors	2024-12-04 16:00:24 +01:00
Yvonne Schmidt	4c40b447a5	fixed formating errors	2024-12-04 12:16:04 +01:00
Yvonne Schmidt	eaff7b6c5d	fixed formating error in RejectTrade	2024-12-04 01:52:30 +01:00
Yvonne Schmidt	9ee1b5b81b	simplified representation of trade	2024-12-04 01:48:18 +01:00
Yvonne Schmidt	49b9972ade	replaced textinput with dynamic label	2024-12-04 01:10:12 +01:00
Johannes Schmelz	aae003823d	trigger money sounds	2024-12-03 12:34:56 +01:00
Johannes Schmelz	1369de865a	can no longer build if already has hotel	2024-12-03 12:30:34 +01:00
Johannes Schmelz	8e3cf9c31e	now allowed to roll dice after getting out of jail	2024-12-03 12:24:55 +01:00
Johannes Schmelz	bc31c61fb3	bigger hack	2024-12-03 12:24:25 +01:00
Johannes Schmelz	975e4a2737	gym card text	2024-12-03 12:16:03 +01:00
Johannes Schmelz	8d638158e4	fixed Miete popup	2024-12-03 12:15:00 +01:00
Johannes Schmelz	1f37eb9962	refactor PlayerColor ... fixed default playermodel selection	2024-12-03 12:07:09 +01:00
Johannes Schmelz	09ea8a046e	mortage house interaction	2024-12-03 11:37:36 +01:00
Johannes Schmelz	0acb23ab8b	price settings	2024-12-03 01:09:00 +01:00