Felix Koppe
c4e5b7f7c8
Merge main
2024-11-28 15:02:41 +01:00
Hanno Fleischer
cbbef16374
added two more todos
2024-11-27 09:20:22 +01:00
Hanno Fleischer
c9362a7a95
fixed bugs so the programm would start and added some Todo where code is missing or was fraudulent
2024-11-27 09:19:57 +01:00
Felix
35cf092d5c
Merge commit
2024-11-27 08:44:29 +01:00
Felix
06e2d831ef
Fix errors
2024-11-27 08:42:45 +01:00
Felix
75b53f8309
Fix model compile errors
2024-11-27 08:39:50 +01:00
Daniel Grigencha
20c9000d56
Merge remote-tracking branch 'origin/development' into development
2024-11-26 23:29:02 +01:00
Daniel Grigencha
5a911326ba
minor changes to the server state automaton
2024-11-26 23:28:49 +01:00
Hanno Fleischer
621bb9efae
fixed bugs inside of the client state machine and the message UpdateTSK
2024-11-26 20:31:16 +01:00
Felix
58f94e73db
Merge commit
2024-11-26 20:23:23 +01:00
Fleischer Hanno
84c289cfd1
implemented all methods required for the state pattern in the client and adjusted the messages to work with player ids instead of names
2024-11-26 20:04:58 +01:00
Fleischer Hanno
f827757ad1
added next method for Color
2024-11-26 18:16:19 +01:00
Daniel Grigencha
e4a9b16fd5
Merge remote-tracking branch 'origin/development' into development
2024-11-26 18:12:32 +01:00
Daniel Grigencha
d63d0cc2a0
changed default constructor of 'Player' class
2024-11-26 18:12:08 +01:00
Hanno Fleischer
a127ee524a
Merge remote-tracking branch 'origin/development' into development
...
# Conflicts:
# Projekte/.run/MdgaApp.run.xml
2024-11-26 18:05:37 +01:00
Hanno Fleischer
5c2df2430d
reworked the client state machine and removed the seperate classes for the statemachines
...
these machines are now directly included in the parent states
2024-11-26 18:04:56 +01:00
Daniel Grigencha
2e76c41d3a
added new 'Disconnect' client message and updated 'Player' and 'Game' classes
2024-11-26 18:02:19 +01:00
Fleischer Hanno
46a6552bca
refactored the whole client package structure
2024-11-26 11:12:58 +01:00
Fleischer Hanno
1d95146272
refactored the model to incoporate a correct folder structure
2024-11-26 11:12:56 +01:00
Benjamin Feyer
9859d52e02
edted some tests with null tests
2024-11-26 11:12:55 +01:00
Benjamin Feyer
e18ea15efa
added javadocs
2024-11-26 11:12:54 +01:00
Benjamin Feyer
461a497353
added some more testmethods
2024-11-26 11:12:54 +01:00
Benjamin Feyer
4c3099ddf2
corrected testmethods in clientStateTest
2024-11-26 11:12:54 +01:00
Benjamin Feyer
b0ab870451
added tests in the serverStateTest
...
added the testmethods for rolldice and movepiece
2024-11-26 11:12:54 +01:00
Benjamin Feyer
993c94c306
edited some tests in ServerStateTest
2024-11-26 11:12:54 +01:00
Benjamin Feyer
e52af59cac
minor changes
2024-11-26 11:12:54 +01:00
Benjamin Feyer
40f1bdb51f
added some testmethods and corrected other in the clientStatemachineTests
2024-11-26 11:12:54 +01:00
Benjamin Feyer
436dae4ebc
added some testmethods for the client testing the statechanges in the dialogs
2024-11-26 11:12:54 +01:00
Benjamin Feyer
1b2d4df96f
added some mor testcases for the clientstatemachine
2024-11-26 11:12:54 +01:00
Benjamin Feyer
f3ca9f01c0
added the empty testmethods in serverstateTest and edited the testmethods for substates of choocePiece in Client into MovePiece
2024-11-26 11:12:54 +01:00
Benjamin Feyer
3c97cdae38
edited a test in the clientStateTest
2024-11-26 11:12:54 +01:00
Benjamin Feyer
227d4286e5
editet tests for the server and client statemachines
2024-11-26 11:12:54 +01:00
Benjamin Feyer
9939ec2861
added empty serverstatetests
2024-11-26 11:12:54 +01:00
Benjamin Feyer
1a6a460f9f
initial test commit,
...
added all testclasses except Playertest, Viewtest, Cameratest, SettingsTest, SoundTest, ReactionTest and ClientStateTest. And filled all created testclasses with empty testmethods, except ServerStateTest.
2024-11-26 11:12:54 +01:00
Daniel Grigencha
ec58e9c85f
added import statement with the refactored server messages
2024-11-26 11:12:54 +01:00
Daniel Grigencha
cf6777023f
added mdga server controller
2024-11-26 11:12:54 +01:00
Daniel Grigencha
739279d3df
added new server state chart
2024-11-26 11:12:52 +01:00
Daniel Grigencha
b6bf25671f
reverted server messages
2024-11-26 11:12:50 +01:00
Daniel Grigencha
5a9fd2a939
deleted server state automaton
2024-11-26 11:12:49 +01:00
Hanno Fleischer
e1b21de718
added two Pieces in RequestPlayCard in order to differentiate between own and enemy pieces
2024-11-26 11:12:39 +01:00
Hanno Fleischer
f321608132
added two lists in PossiblePiece in order to differentiate between own and enemy pieces
2024-11-26 11:12:39 +01:00
Hanno Fleischer
dd7a27629b
added static methods to construct a PlayCard message for each card type
2024-11-26 11:12:39 +01:00
Hanno Fleischer
eba681c350
added getter for ArrayList Player in Game and created a flag for ready status in Player
2024-11-26 11:12:39 +01:00
Daniel Grigencha
f97eea3e5e
added default constructor for serialization purposes
2024-11-26 11:12:39 +01:00
Hanno Fleischer
1582038dfe
added an ArrayList of Player in game and added the received methods in clientgamelogic
2024-11-26 11:12:39 +01:00
Daniel Grigencha
798e996a8d
fixed sonarlint errors and deleted map playerConnectionID
2024-11-26 11:12:39 +01:00
Fleischer Hanno
472d87b0c9
refactored ceremony message
2024-11-26 11:12:39 +01:00
Fleischer Hanno
7cfb863e5c
corrected refactoring mistake, ich which RankingResponce was renamed to RankingResponse
2024-11-26 11:12:35 +01:00
Fleischer Hanno
7e1d2e833e
added getter for dialogstatemachine in dialogs
2024-11-26 11:12:30 +01:00
Fleischer Hanno
67a87ffa81
made all con structors of clients states public
2024-11-26 11:12:30 +01:00