383 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Johannes Schmelz	17a1d3fbbb	fixed rent	2024-12-01 21:55:06 +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
Simon Wilkening	73a908cd71	PorpertyOverwiev gerettet	2024-12-01 02:10:10 +01:00
Johannes Schmelz	a6b7ea4ce8	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-01 02:08:20 +01:00
Johannes Schmelz	4af08ffffd	fix trade reject	2024-12-01 02:07:39 +01:00
Yvonne Schmidt	dc66fd7384	changed font colors and sizes	2024-12-01 01:48:09 +01:00
Simon Wilkening	16ff61264b	BuyHouse etc. aktualisiert	2024-12-01 00:47:12 +01:00
Luca Puderbach	f3ec17b0b1	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-01 00:39:05 +01:00
Luca Puderbach	1c31915627	Werkzeugbank Rand	2024-12-01 00:39:00 +01:00
Yvonne Schmidt	79c96677bd	Merge remote-tracking branch 'origin/gui' into gui	2024-12-01 00:35:27 +01:00
Yvonne Schmidt	54118071cb	fixed popup overlap	2024-12-01 00:34:57 +01:00
Johannes Schmelz	2e28b54936	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-01 00:30:55 +01:00
Johannes Schmelz	f333e2d2c0	button function	2024-12-01 00:30:50 +01:00
Yvonne Schmidt	b89d40b39f	fixed nullPointer	2024-12-01 00:14:04 +01:00
Yvonne Schmidt	488ae154cf	fixed overlapping popups	2024-11-30 23:26:37 +01:00
Johannes Schmelz	c1e501c271	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-30 22:39:12 +01:00
Johannes Schmelz	89d5185c91	rent popup fixed	2024-11-30 22:39:08 +01:00