57 Commits

Author	SHA1	Message	Date
Johannes Schmelz	10e24cf30e	small bug fixes	2024-11-23 16:16:40 +01:00
Johannes Schmelz	3369057afb	update the players figure when moved	2024-11-23 16:08:46 +01:00
Johannes Schmelz	7ada56e215	limit the amount of players to 6	2024-11-23 14:41:17 +01:00
Johannes Schmelz	373b9e6d53	allow the host player to set start money	2024-11-23 13:20:05 +01:00
Johannes Schmelz	3de31de9f7	bind playercolor to join order	2024-11-23 12:46:20 +01:00
Johannes Schmelz	7252259ab3	updated trade and client logic	2024-11-23 09:15:57 +01:00
Johannes Schmelz	559afcaffd	added NextPlayerTurn	2024-11-22 01:38:48 +01:00
Johannes Schmelz	0b9cbb0f5f	view assets response now send alls properties and fixed which players properties are sent	2024-11-22 00:42:07 +01:00
Johannes Schmelz	c3a33b4402	added house prices and color to buildingfields	2024-11-21 15:30:34 +01:00
Luca Puderbach	47bac0185f	Port fix	2024-11-20 03:36:54 +01:00
Luca Puderbach	1203077aed	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-11-20 02:39:20 +01:00
Luca Puderbach	ddbf79c928	can now add players	2024-11-20 02:37:00 +01:00
Johannes Schmelz	cdce478d77	send GameStart message with a list of all Players	2024-11-20 01:45:34 +01:00
Johannes Schmelz	3a6f8a945a	palyer ready fix	2024-11-19 23:59:16 +01:00
Luca Puderbach	7da8b3e545	Spieler Lobby	2024-11-19 23:09:39 +01:00
Johannes Schmelz	3c21165efb	adjusted config params	2024-11-19 19:09:37 +01:00
Luca Puderbach	0b46d14650	LobbyServer Einfügen	2024-11-18 18:56:42 +01: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
Johannes Schmelz	d2e0b8187b	implemented PlayerStates	2024-11-16 18:42:05 +01:00
Johannes Schmelz	628b98af9b	recive logic for messages	2024-11-16 18:03:19 +01:00
Johannes Schmelz	627e3dbd7f	added fine to FineField	2024-11-16 17:53:07 +01:00
Johannes Schmelz	10b978debf	fixed addPlayer	2024-11-15 04:27:32 +01:00
Johannes Schmelz	3bdfd6a78a	TradeHandler logic	2024-11-15 03:19:48 +01:00
Johannes Schmelz	e59ab4a320	cleintmessages logic	2024-11-15 03:06:07 +01:00
Luca Puderbach	12ef219064	Änderungs des StartBildschirms	2024-11-15 01:25:09 +01:00
Luca Puderbach	853b52b52d	Implementierung eines grundlegenden Startmenüs	2024-11-15 00:39:47 +01:00
Johannes Schmelz	7a2ad1d31a	corrected server states	2024-11-14 23:50:18 +01:00
Johannes Schmelz	c5ad476eaf	added rent payment logic ... added player on field logic	2024-11-14 23:50:06 +01:00
Filip Szepielewicz	12978ff410	T001 - T034 erster versuch	2024-11-14 21:54:27 +01:00
Yvonne Schmidt	caa45097c3	klassen angepasst	2024-11-14 21:31:47 +01:00
Johannes Schmelz	232e3a117c	corrected rent prices	2024-11-14 01:08:22 +01:00
Johannes Schmelz	3668382911	FineField in Player	2024-11-13 23:50:06 +01:00
Johannes Schmelz	fafa53ffb7	rent calculation	2024-11-13 23:49:37 +01:00
Johannes Schmelz	44673fd57e	createBoard method	2024-11-13 23:30:04 +01:00
Johannes Schmelz	f7149f225c	Interpreter fuer messages hinzugefuegt	2024-11-13 18:54:24 +01:00
Johannes Schmelz	6773e18d34	Message Klassen hinzugefuegt	2024-11-13 14:11:20 +01:00
Johannes Schmelz	7ee2273761	First compileable version of Client	2024-11-13 12:42:37 +00:00
Johannes Schmelz	86b8297c9d	fixed bugs, game now compiles	2024-11-13 13:31:02 +01:00