60 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Luca Puderbach	af4b4243ea	Resolve merge conflicts	2024-11-18 04:42:30 +01:00
Johannes Schmelz	5189c74058	Merge branch 'gui' into 'main' ... Gui See merge request progproj/gruppen-ht24/Gruppe-02!7	2024-11-18 03:14:39 +00: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	951b4c198c	Server bug fix. Add player did not correspond with the params	2024-11-18 00:24:15 +01:00
Yvonne Schmidt	8698eed273	Tooolbar implementiert	2024-11-17 22:33:58 +01:00
Yvonne Schmidt	1af8614b35	Tooolbar in Testworld implementiert	2024-11-17 22:33:12 +01:00
Johannes Schmelz	11faeeaf45	Merge branch 'Testhandbuch' into 'main' ... Erste Tests See merge request progproj/gruppen-ht24/Gruppe-02!5	2024-11-17 18:28:55 +00: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
Yvonne Schmidt	61b88f6bf8	Merge remote-tracking branch 'origin/gui' into gui	2024-11-15 18:39:47 +01:00
Yvonne Schmidt	8ab37e73c1	Anpassung des Button designs	2024-11-15 18:39:21 +01:00
Luca Puderbach	afdf43ebf1	Übergang zu TestMap verbessert	2024-11-15 08:36:16 +01:00
Luca Puderbach	2e0d1c059d	TestWord eingefügt	2024-11-15 07:00:55 +01:00
Yvonne Schmidt	2b772199b0	Merge remote-tracking branch 'origin/gui' into gui ... # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java	2024-11-15 06:49:13 +01:00
Yvonne Schmidt	c37b850798	Buttons im Startmenü angepasst	2024-11-15 06:48:25 +01:00
Luca Puderbach	c31f924d77	CreateGame fertig für feinschliff (Icon test)	2024-11-15 06:25:21 +01:00
Luca Puderbach	ed87a6167d	Verbesserung SettingsMenu	2024-11-15 05:36:57 +01:00
Yvonne Schmidt	0d86ba0ca9	Merge remote-tracking branch 'origin/gui' into gui ... # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java	2024-11-15 05:12:39 +01:00
Luca Puderbach	f2fd283d06	Positionierung StartMenu Buttons & SettingsMenu	2024-11-15 05:04:25 +01:00
Johannes Schmelz	10b978debf	fixed addPlayer	2024-11-15 04:27:32 +01:00
Luca Puderbach	85756713df	Erweitern des Setting und CreateGameMenü	2024-11-15 03:23:27 +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	15b3902bd3	SettingsMenü Anpassungen	2024-11-15 02:31:12 +01:00
Yvonne Schmidt	b622d66942	Buttons im Startmenü ausgerichtet	2024-11-15 02:28:10 +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	19a9b06f3c	Merge branch 'gui' into 'main' ... First compileable version of Client See merge request progproj/gruppen-ht24/Gruppe-02!4	2024-11-13 12:42:37 +00: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
Yvonne Schmidt	17533112a1	Startmenü implementiert und Spielmenü Stummel erstellt	2024-11-12 23:30:44 +01:00
Johannes Schmelz	2cc1a338ec	added Figure to Player for visual representation	2024-11-12 22:36:02 +01:00
Johannes Schmelz	81731247c7	added Fields	2024-11-12 22:35:41 +01:00
Johannes Schmelz	65c85aacf0	started UC-gameplay-15	2024-11-12 22:34:46 +01:00
Johannes Schmelz	dca23151a8	added Visitors	2024-11-12 22:33:10 +01:00