472 Commits

Author	SHA1	Message	Date
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
Johannes Schmelz	737576e0ca	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-02 05:43:53 +01:00
Johannes Schmelz	db7a99dc59	fixed Top Dialog	2024-12-02 05:43:49 +01:00
Luca Puderbach	4b48229329	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-02 05:43:24 +01:00
Luca Puderbach	1a41b548c4	Figuren Drehung	2024-12-02 05:43:20 +01:00
Yvonne Schmidt	7f58558da4	Merge remote-tracking branch 'origin/gui' into gui	2024-12-02 05:25:24 +01:00
Johannes Schmelz	1503e18585	limit name length	2024-12-02 05:24:53 +01:00
Yvonne Schmidt	94155d2816	Merge remote-tracking branch 'origin/gui' into gui	2024-12-02 05:16:12 +01:00
Luca Puderbach	ec42cc2c07	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-02 05:15:53 +01:00
Luca Puderbach	af79e39492	figuren drehen	2024-12-02 05:15:47 +01:00
Yvonne Schmidt	0698c29410	Merge remote-tracking branch 'origin/gui' into gui	2024-12-02 05:13:08 +01:00
Johannes Schmelz	08c1854885	fixed jail card trade	2024-12-02 05:10:45 +01:00
Johannes Schmelz	ff39402d82	fixed event card position	2024-12-02 05:09:31 +01:00
Johannes Schmelz	4e375131d1	change property side	2024-12-02 05:06:58 +01:00
Yvonne Schmidt	ac9ced2cf4	Merge remote-tracking branch 'origin/gui' into gui	2024-12-02 04:39:50 +01:00
Johannes Schmelz	e93791e6e8	remove testing	2024-12-02 04:39:30 +01:00
Yvonne Schmidt	fa554cbffc	Merge remote-tracking branch 'origin/gui' into gui	2024-12-02 04:37:49 +01:00
Luca Puderbach	f317d7723e	Lets GO	2024-12-02 04:35:55 +01:00
Luca Puderbach	07fd92c9b2	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-02 04:20:14 +01:00
Luca Puderbach	91fea83f26	Modelle Fixes	2024-12-02 04:19:56 +01:00
Johannes Schmelz	471f703634	updated models	2024-12-02 04:16:49 +01:00
Yvonne Schmidt	065049f663	added documentation in client package	2024-12-02 04:08:54 +01:00
Yvonne Schmidt	580d81a621	Merge remote-tracking branch 'origin/gui' into gui	2024-12-02 03:44:42 +01:00
Yvonne Schmidt	7acf448c0c	added documentation for MonopolyApp	2024-12-02 03:44:33 +01:00
Johannes Schmelz	bcf4956d2d	TradeReplay popup	2024-12-02 03:16:50 +01:00
Johannes Schmelz	13754c843a	clean up	2024-12-02 03:03:42 +01:00
Johannes Schmelz	4743a6882c	fixed testing env	2024-12-02 03:02:05 +01:00
Johannes Schmelz	2dbc727728	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-02 03:00:28 +01:00
Johannes Schmelz	560bedc80b	mortage	2024-12-02 03:00:22 +01:00
Johannes Schmelz	7ace959f1f	sellHouse	2024-12-02 02:48:06 +01:00
Yvonne Schmidt	95dc7b07e2	fixed typos	2024-12-02 02:40:53 +01:00
Yvonne Schmidt	fa20a6cb2a	Merge remote-tracking branch 'origin/gui' into gui	2024-12-02 01:50:20 +01:00
Yvonne Schmidt	36b308e616	fixed TradeMenu formating	2024-12-02 01:49:56 +01:00
Johannes Schmelz	b912835edb	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-02 01:37:37 +01:00
Johannes Schmelz	add5dab611	buyHouse complete	2024-12-02 01:37:32 +01:00
Johannes Schmelz	5172766216	cleanup	2024-12-02 01:34:43 +01:00
Yvonne Schmidt	fcb55e52fc	fixed esc in BuildingAdminMenu	2024-12-02 01:11:38 +01:00
Yvonne Schmidt	411f7ea25b	added selector and selection display to RepayMortage	2024-12-02 01:06:58 +01:00
Yvonne Schmidt	e05ad71fff	added selector and selection display to TakeMortage	2024-12-02 01:03:55 +01:00
Yvonne Schmidt	d08a172227	added selector and selection display to SellHouse	2024-12-02 00:59:10 +01:00
Johannes Schmelz	4fff8394d9	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-02 00:48:53 +01:00
Johannes Schmelz	5bb438c221	working selector	2024-12-02 00:47:06 +01:00
Simon Wilkening	a753017fcd	Rent relabeled	2024-12-01 23:52:25 +01:00
Yvonne Schmidt	5522be228b	added selection display	2024-12-01 23:22:19 +01:00
Johannes Schmelz	3b729c9a04	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-01 23:12:51 +01:00
Johannes Schmelz	eda2fcd327	jail logic complete	2024-12-01 23:11:02 +01:00
Simon Wilkening	09e12fc610	GulagInfo renamed	2024-12-01 22:08:28 +01:00
Johannes Schmelz	93152f4073	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-01 21:55:10 +01:00
Johannes Schmelz	17a1d3fbbb	fixed rent	2024-12-01 21:55:06 +01:00
Yvonne Schmidt	a0e2b6e8e2	Merge remote-tracking branch 'origin/gui' into gui	2024-12-01 21:54:30 +01:00
Yvonne Schmidt	79a08a0c9e	replaced listbox in sellHouse with a selector	2024-12-01 21:53:53 +01:00
Simon Wilkening	a24d6fd4b6	BuildingFields corrected	2024-12-01 21:44:14 +01:00
Johannes Schmelz	f220aeb78c	resolve merge	2024-12-01 21:42:05 +01:00
Luca Puderbach	85e0c68a36	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-01 21:33:18 +01:00
Luca Puderbach	113e1b7aa5	Spieler Bewegungs hochdatum	2024-12-01 21:33:07 +01:00
Johannes Schmelz	cfcc232432	trigger Bankrupt PopUp	2024-12-01 21:30:55 +01:00
Johannes Schmelz	29e9b54cc4	trigger NoMoneyPopUp	2024-12-01 21:24:33 +01:00
Yvonne Schmidt	0c90d1f185	Merge remote-tracking branch 'origin/gui' into gui	2024-12-01 21:19:20 +01:00
Yvonne Schmidt	b5090ea179	fixed overlapping with propertycard	2024-12-01 21:18:57 +01:00
Johannes Schmelz	cfbf20f745	payBail	2024-12-01 20:55:58 +01:00
Johannes Schmelz	dd002746aa	trigger winner and looser popup	2024-12-01 20:52:29 +01:00
Johannes Schmelz	11f4560745	du kommst ins Gulag Popup	2024-12-01 20:31:29 +01:00
Johannes Schmelz	b702e3a14d	first tests	2024-12-01 20:12:36 +01:00
Johannes Schmelz	3b2cfad774	fixed TradeConfrim	2024-12-01 19:20:34 +01:00
Johannes Schmelz	9164dc6893	formatting	2024-12-01 18:37:53 +01:00
Simon Wilkening	d3cf36ecb1	BuildingFields corrected	2024-12-01 18:23:20 +01:00
Johannes Schmelz	7d0a0123e0	server side logic for propertyAdmin	2024-12-01 18:17:46 +01:00
Johannes Schmelz	2f025e2e1a	sort according to id	2024-12-01 17:51:24 +01:00
Luca Puderbach	9bf9e8406b	model pfad gefixt	2024-12-01 16:29:25 +01:00
Johannes Schmelz	6bd1ed6e3a	earnMoney with event card movement	2024-12-01 16:05:57 +01:00
Johannes Schmelz	0f6205fbc7	fixed topDialog	2024-12-01 15:57:33 +01:00
Johannes Schmelz	f2a6888fb2	fixed JailState	2024-12-01 15:50:09 +01:00
Johannes Schmelz	5143e21ba6	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-01 13:53:55 +01:00
Johannes Schmelz	26dc24a1f4	fixed verhandeln	2024-12-01 13:53:50 +01:00
Luca Puderbach	350c157493	Figuren Animationen	2024-12-01 05:38:27 +01:00