398 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Yvonne Schmidt	36b308e616	fixed TradeMenu formating	2024-12-02 01:49:56 +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
Luca Puderbach	51b879a7c8	Figuren Bewegung eingefügt	2024-12-01 05:05:11 +01:00
Luca Puderbach	528126aa29	Kleines Ereigniskarten update	2024-12-01 05:04:27 +01:00
Luca Puderbach	73bfafa7f7	Anpassungen Ereigniskarten	2024-12-01 03:00:30 +01:00
Luca Puderbach	686a12e465	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-01 02:47:34 +01:00
Luca Puderbach	358beacc65	Mozzarella Update	2024-12-01 02:47:30 +01:00
Johannes Schmelz	69db0aa29b	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-01 02:47:12 +01:00
Johannes Schmelz	20f44ad2d4	fixed San cost	2024-12-01 02:40:12 +01:00
Simon Wilkening	d73c5e0904	Farben angepasst	2024-12-01 02:23:50 +01:00
Johannes Schmelz	f322e9bd8f	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-01 02:14:13 +01:00
Johannes Schmelz	b8e1645eb8	fixed player movement and go money	2024-12-01 02:14:09 +01:00