253 Commits

Author	SHA1	Message	Date
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	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	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
Simon Wilkening	d73c5e0904	Farben angepasst	2024-12-01 02:23:50 +01:00
Simon Wilkening	73a908cd71	PorpertyOverwiev gerettet	2024-12-01 02:10:10 +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
Simon Wilkening	f4bf38bca1	AcceptTrade, RejectTrade und NoMoneyWarning hinzugefügt	2024-11-30 22:01:35 +01:00
Johannes Schmelz	b87b3f054b	trigger rent popup	2024-11-30 21:49:16 +01:00
Johannes Schmelz	f6137b8b68	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-30 20:50:40 +01:00
Johannes Schmelz	87309235bd	trade logic complete	2024-11-30 20:50:36 +01:00
Simon Wilkening	d37017bfa0	Winner and Looser Popup close the game again	2024-11-30 20:33:08 +01:00
Simon Wilkening	5d6440bd50	Eventcards korrigiert	2024-11-30 20:20:43 +01:00
Johannes Schmelz	a70295f1ff	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-30 15:15:35 +01:00
Johannes Schmelz	b681b13468	send Trades	2024-11-30 15:15:30 +01:00
Johannes Schmelz	2c536f32cf	fixed close on FoodField	2024-11-30 15:14:58 +01:00
Yvonne Schmidt	991fe5280f	centered account values	2024-11-30 01:03:11 +01:00
Yvonne Schmidt	174fe5cfb3	resized LooserPopUp	2024-11-30 00:58:24 +01:00
Yvonne Schmidt	119284f256	resized WinnerPopUp	2024-11-30 00:40:58 +01:00
Yvonne Schmidt	05680af726	fixed BuildingAdminMenu	2024-11-29 23:07:58 +01:00
Johannes Schmelz	afa2ebd004	set correct translation	2024-11-29 19:04:00 +01:00
Johannes Schmelz	f0eeff3493	update view	2024-11-29 18:27:25 +01:00
Johannes Schmelz	44d64c4e0f	trigger timeoutPopup	2024-11-29 17:42:10 +01:00
Simon Wilkening	6cdad71693	Gulag und Rent erstellt	2024-11-29 08:57:11 +01:00
Simon Wilkening	cf6d5ea22e	BuyHouse, RepayMortage und TakeMortage erstellt	2024-11-29 08:27:51 +01:00
Yvonne Schmidt	ecf227daa6	added colored strip to toolbar	2024-11-29 07:42:59 +01:00
Luca Puderbach	4b5a156865	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-29 07:22:51 +01:00
Luca Puderbach	cfae369fd3	Anzeige Spielerfarbe + Figur Pos	2024-11-29 07:22:46 +01:00
Simon Wilkening	b05eabbbf8	Verschiedene Popups kommentiert und richtig benannt	2024-11-29 07:21:28 +01:00
Simon Wilkening	fd178eee43	Merge remote-tracking branch 'origin/gui' into gui ... # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/ConfirmTrade.java	2024-11-29 07:16:21 +01:00
Simon Wilkening	aef2ef34fb	Verschiedene Popups kommentiert und richtig benannt	2024-11-29 07:14:44 +01:00
Johannes Schmelz	fcbffa1189	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-29 07:11:24 +01:00
Johannes Schmelz	0d8240381e	fixed some mistakes	2024-11-29 07:11:20 +01:00
Yvonne Schmidt	77da6679ef	added another label styling	2024-11-29 06:55:59 +01:00
Yvonne Schmidt	5845254caa	added new label styling	2024-11-29 06:47:26 +01:00
Yvonne Schmidt	5d92d7cfcc	Merge remote-tracking branch 'origin/gui' into gui	2024-11-29 06:42:56 +01:00
Yvonne Schmidt	67f6649242	added selector with no integration	2024-11-29 06:34:42 +01:00
Johannes Schmelz	1438ae5e4f	improve position calc	2024-11-29 06:26:09 +01:00
Johannes Schmelz	01c351e64b	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-29 06:23:12 +01:00
Johannes Schmelz	b0c21dfcb8	added trigger for winner looser popup	2024-11-29 06:23:08 +01:00
Simon Wilkening	f4cddbc87f	Bankrott-Warnung und Timeout-Warning kommentiert und richtig benannt	2024-11-29 06:20:23 +01:00
Luca Puderbach	cfce176c82	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-29 06:20:03 +01:00
Luca Puderbach	782b1a10c3	Kleine model Changes	2024-11-29 06:19:58 +01:00
Johannes Schmelz	2d9cd0e4e1	resolve merge conflict	2024-11-29 06:17:57 +01:00
Johannes Schmelz	908ba09e2a	more models	2024-11-29 05:58:28 +01:00
Johannes Schmelz	4a84ef4b3c	more models	2024-11-29 05:58:15 +01:00
Johannes Schmelz	f3353327dd	added first models	2024-11-29 05:56:39 +01:00
Johannes Schmelz	316433f592	resolve merge conflicts	2024-11-29 05:33:03 +01:00
Yvonne Schmidt	1ccdea0c87	Merge remote-tracking branch 'origin/gui' into gui	2024-11-29 05:16:44 +01:00
Yvonne Schmidt	7d9af0c4c7	added selector to SellHouse	2024-11-29 05:16:33 +01:00
Simon Wilkening	a1247cdae5	Bankrott-Warnung und Timeout-Warning erstellt erstellt	2024-11-29 05:11:24 +01:00
Luca Puderbach	5696192cce	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-29 04:41:14 +01:00
Luca Puderbach	91826b730f	Lade Figuren auf Spielbrett	2024-11-29 04:35:16 +01:00
Johannes Schmelz	48b1cf817a	refactor	2024-11-29 04:32:57 +01:00
Johannes Schmelz	94ba9f0af2	rudimentary function for trade	2024-11-29 03:07:17 +01:00
Johannes Schmelz	b67379a6c3	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-28 22:56:06 +01:00
Johannes Schmelz	1e6188cf24	open buy popups	2024-11-28 22:56:02 +01:00
Yvonne Schmidt	12e859edd5	finished PropertyOverviewMenu	2024-11-28 21:55:44 +01:00
Johannes Schmelz	e000dcfc51	cleanup	2024-11-28 19:50:53 +01:00