77 Commits

Author	SHA1	Message	Date
Johannes Schmelz	20f44ad2d4	fixed San cost	2024-12-01 02:40:12 +01:00
Johannes Schmelz	b8e1645eb8	fixed player movement and go money	2024-12-01 02:14:09 +01:00
Johannes Schmelz	4af08ffffd	fix trade reject	2024-12-01 02:07:39 +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	5d6440bd50	Eventcards korrigiert	2024-11-30 20:20:43 +01:00
Johannes Schmelz	b681b13468	send Trades	2024-11-30 15:15:30 +01:00
Johannes Schmelz	fba82f670b	fixed jailState	2024-11-29 19:21:27 +01:00
Johannes Schmelz	44d64c4e0f	trigger timeoutPopup	2024-11-29 17:42:10 +01:00
Johannes Schmelz	86ece3b70d	fixed move logic	2024-11-29 16:44:28 +01:00
Johannes Schmelz	0d8240381e	fixed some mistakes	2024-11-29 07:11:20 +01:00
Johannes Schmelz	b0c21dfcb8	added trigger for winner looser popup	2024-11-29 06:23:08 +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	94ba9f0af2	rudimentary function for trade	2024-11-29 03:07:17 +01:00
Johannes Schmelz	1e6188cf24	open buy popups	2024-11-28 22:56:02 +01:00
Johannes Schmelz	c900b6384d	lock button when not active	2024-11-28 19:40:30 +01:00
Luca Puderbach	26d8283930	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-28 00:18:27 +01:00
Luca Puderbach	4079c0a32c	Würfel animation hinzugefügt	2024-11-28 00:13:32 +01:00
Johannes Schmelz	6d72a94fe4	event card complete	2024-11-28 00:07:32 +01:00
Johannes Schmelz	9e595b92ba	crash when rolling dice and waitForTurn removed	2024-11-27 23:19:25 +01:00
Johannes Schmelz	5b0628da15	dynamically get the fieldid for by popups	2024-11-27 00:10:59 +01:00
Johannes Schmelz	c8b69efca2	added correct colors in LobbyMenu	2024-11-26 23:01:55 +01:00
Johannes Schmelz	156e76fe0a	cleanup	2024-11-26 21:31:21 +01:00
Johannes Schmelz	9107a08011	dynamically set players in ChoosePatner	2024-11-26 20:00:50 +01:00
Johannes Schmelz	174958c6b1	can now dynamically update toolbar view	2024-11-26 18:50:24 +01:00
Johannes Schmelz	c71e8b1e8e	removed hostplayer as hostplayer always has id 0	2024-11-26 18:48:13 +01:00
Simon Wilkening	6eeb6fd209	Properties_de übersetzt	2024-11-26 15:29:45 +01:00
Simon Wilkening	efba3c496a	Deckhelper korrigiert, Properties angepasst	2024-11-26 15:15:29 +01:00
Johannes Schmelz	27a0ab52e6	dice button now works and update dice images accordingly	2024-11-26 14:59:48 +01:00
Johannes Schmelz	3956d8efa7	show all playe stats in toolbar	2024-11-26 00:11:37 +01:00
Johannes Schmelz	0e405d2f90	send PlayerHandler in GameStart	2024-11-25 22:11:35 +01:00
Johannes Schmelz	9120e4d53c	show test world when GameStart message is recieved	2024-11-25 17:50:54 +01:00
Johannes Schmelz	1a62b76104	corrected map size	2024-11-25 16:28:50 +01:00
Johannes Schmelz	d10111d2ab	Gui v1.0	2024-11-25 05:33:36 +00:00
Johannes Schmelz	1be29b8b7a	newest version of tests	2024-11-25 04:34:06 +00:00
Johannes Schmelz	b135f3fa50	idk	2024-11-18 05:51:31 +01:00
Johannes Schmelz	0e580a3180	Figure Syncronizer now added	2024-11-18 05:38:04 +01:00
Johannes Schmelz	a7ea5773da	resolve merge conflict	2024-11-18 05:05:37 +01:00
Johannes Schmelz	cac06dda7d	Refactor	2024-11-18 04:01:41 +00:00
Johannes Schmelz	12c1c97a99	Merge branch 'logic' into 'gui' ... # Conflicts: # Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java # Projekte/monopoly/model/src/main/java/pp/monopoly/notification/Sound.java	2024-11-18 03:50:41 +00:00
Luca Puderbach	af4b4243ea	Resolve merge conflicts	2024-11-18 04:42:30 +01:00
Johannes Schmelz	fffd32e13c	Merge branch 'main' into 'gui' ... # Conflicts: # Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy # Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameSound.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java # Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java # Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/ServerGameLogic.java # Projekte/monopoly/model/src/main/resources/monopoly.properties	2024-11-18 03:14:07 +00:00
Johannes Schmelz	b37a5095f0	client recieve message logic	2024-11-18 03:20:39 +01:00
Johannes Schmelz	951b4c198c	Server bug fix. Add player did not correspond with the params	2024-11-18 00:24:15 +01:00
Johannes Schmelz	9d0fcc3370	Erste Tests	2024-11-17 18:28:55 +00:00
Johannes Schmelz	2f6d6037de	Merge branch 'logic' into 'main' ... Serverseitige Logik See merge request progproj/gruppen-ht24/Gruppe-02!6	2024-11-17 18:25:32 +00:00
Johannes Schmelz	1d69bcc814	refactor and bug fixes	2024-11-17 17:43:05 +01:00
Johannes Schmelz	62c363068b	fixed bug with client server messages	2024-11-16 18:57:52 +01:00