414 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Johannes Schmelz	e93791e6e8	remove testing	2024-12-02 04:39:30 +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
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