446 Commits

Author	SHA1	Message	Date
Yvonne Schmidt	fb280101a5	Merge remote-tracking branch 'origin/gui' into gui	2024-12-08 18:40:48 +01:00
Yvonne Schmidt	844495ebbb	modified toolbar	2024-12-08 18:40:28 +01:00
Johannes Schmelz	e14f6bbef7	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-08 18:38:15 +01:00
Johannes Schmelz	4839ddd497	clean up and doc	2024-12-08 18:38:06 +01:00
Yvonne Schmidt	b901323e2f	added color changes for buttons	2024-12-08 18:30:18 +01:00
Yvonne Schmidt	640665fd29	fixed layering issue	2024-12-08 18:29:14 +01:00
Johannes Schmelz	ba8791d9fe	update Toolbar view	2024-12-08 18:08:16 +01:00
Johannes Schmelz	f8fe0b9877	fixed property trade	2024-12-08 17:34:19 +01:00
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	96fe09c6fa	Reworked gui and client states	2024-12-08 01:19:34 +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
Johannes Schmelz	831974cb63	miete erhalten popup	2024-12-03 00:58:01 +01:00
Johannes Schmelz	031ac52670	foodfield rent calc	2024-12-03 00:40:43 +01:00
Johannes Schmelz	14ceb9dc67	fixed GateField rent	2024-12-03 00:39:36 +01:00
Johannes Schmelz	aa86c25e7c	fixed sell house payment	2024-12-03 00:30:54 +01:00
Johannes Schmelz	cb0788e44c	lock endTurnButton when player needs to roll dice	2024-12-03 00:29:27 +01:00
Johannes Schmelz	9e88353bd5	show bankrupt popup once	2024-12-03 00:17:23 +01:00
Johannes Schmelz	6db96f0a1d	trigger demo mode	2024-12-03 00:12:22 +01:00
Johannes Schmelz	b01bb3cf7b	update for jar export	2024-12-02 16:29:57 +01:00
Johannes Schmelz	95b9da9377	server doc	2024-12-02 09:06:00 +01:00
Luca Puderbach	30822e3f4d	Java Docs	2024-12-02 09:02:41 +01:00
Yvonne Schmidt	957bf8ffcc	Merge remote-tracking branch 'origin/gui' into gui	2024-12-02 09:00:57 +01:00
Yvonne Schmidt	446ecfd4b5	added documentation for NoMoneyWarning	2024-12-02 09:00:43 +01:00
Yvonne Schmidt	821c9ec3fb	added documentation for SellHouse	2024-12-02 08:58:41 +01:00
Yvonne Schmidt	531a3e263c	added documentation for TakeMortage	2024-12-02 08:54:49 +01:00
Yvonne Schmidt	4917208818	added documentation for TimeOut	2024-12-02 08:51:22 +01:00
Yvonne Schmidt	e81cdf3b40	added documentation for WinnerPopUp	2024-12-02 08:49:26 +01:00
Yvonne Schmidt	bffe614b54	added documentation for LooserPopUp	2024-12-02 08:47:36 +01:00
Yvonne Schmidt	69ad19757d	added documentation for GulagInfo	2024-12-02 08:44:23 +01:00
Yvonne Schmidt	a4c0afe277	added documentation for Gulag	2024-12-02 08:42:08 +01:00
Yvonne Schmidt	cc157a3cf3	added documentation for Rent	2024-12-02 08:40:02 +01:00
Johannes Schmelz	ff2b64d476	removed errors in java doc	2024-12-02 08:39:47 +01:00
Yvonne Schmidt	459a54ac5d	added documentation for Rent	2024-12-02 08:36:54 +01:00
Yvonne Schmidt	a50821f2e6	added documentation for RejectTrade	2024-12-02 08:34:53 +01:00
Yvonne Schmidt	72e0fc7cbd	added documentation for GateFieldCard	2024-12-02 08:31:14 +01:00
Johannes Schmelz	3260d06bc8	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-02 08:28:09 +01:00
Johannes Schmelz	e07db0129f	completed tests	2024-12-02 08:28:05 +01:00
Yvonne Schmidt	3bfa7ff69f	added documentation for FoodFieldCard	2024-12-02 08:26:08 +01:00
Yvonne Schmidt	160fff88ea	added documentation for EventCardPopup	2024-12-02 08:23:13 +01:00
Yvonne Schmidt	7a658cb3d6	added documentation for EventCardPopup	2024-12-02 08:15:54 +01:00
Yvonne Schmidt	25361933d7	added documentation for ConfirmTrade	2024-12-02 08:13:06 +01:00
Yvonne Schmidt	4ac02a1a7b	added documentation for BuyHouse	2024-12-02 08:10:08 +01:00
Yvonne Schmidt	6f15f12b49	added documentation for BuildingPropertyCard	2024-12-02 08:05:00 +01:00
Yvonne Schmidt	9e50c1afe2	added documentation for Bankrupt	2024-12-02 07:59:24 +01:00
Yvonne Schmidt	3a43ea10d9	added documentation for AcceptTrade	2024-12-02 07:55:07 +01:00
Yvonne Schmidt	3539b1cf23	added documentation for BuildingAdminMenu	2024-12-02 07:48:57 +01:00
Yvonne Schmidt	d0ba0d011f	added documentation for CameraController	2024-12-02 07:45:37 +01:00
Yvonne Schmidt	1f07affbef	added documentation for GameBoardSynchronizer	2024-12-02 07:40:45 +01:00
Yvonne Schmidt	c83f7de30c	added documentation for LobbyMenu	2024-12-02 07:23:25 +01:00
Yvonne Schmidt	acb5c75379	added documentation for TradeMenu	2024-12-02 07:07:19 +01:00
Johannes Schmelz	a73384c436	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-02 06:53:35 +01:00
Johannes Schmelz	96542fa42b	fixed numberformat	2024-12-02 06:53:18 +01:00
Johannes Schmelz	0d885203a7	max 10 long name	2024-12-02 05:58:56 +01:00
Yvonne Schmidt	e08654bb20	Merge remote-tracking branch 'origin/gui' into gui	2024-12-02 05:54:29 +01:00
Johannes Schmelz	486c0a9810	TopDialog	2024-12-02 05:54:15 +01:00
Yvonne Schmidt	0b71c2cb96	added documentation	2024-12-02 05:53:52 +01:00