Commit Graph

239 Commits

Author SHA1 Message Date
Daniel Grigencha
bf38a7e00c added a new method 'disconnectClient' in 'ServerSender' interface 2024-12-01 18:21:54 +01:00
Fleischer Hanno
b83279e835 Merge remote-tracking branch 'origin/development' into development 2024-12-01 18:16:05 +01:00
Cedric Beck
453aacfe1a fixed missing messages 2024-12-01 18:12:31 +01:00
Daniel Grigencha
1513576291 added javadocs to the 'ServerState' class 2024-12-01 18:03:46 +01:00
Cedric Beck
2732a89da6 fixed error with SelectObjectOutliner 2024-12-01 17:47:04 +01:00
Fleischer Hanno
5206b03966 added java docs 2024-12-01 17:03:56 +01:00
Cedric Beck
eb703cbd2c fixed bad performancegit status!; edited GameNotification; fixed error because of changed 'Color' enum 2024-12-01 17:03:09 +01:00
Daniel Grigencha
8c03b282b3 deleted the color attribute and their usages 2024-12-01 16:58:37 +01:00
Daniel Grigencha
efc7a2f09d added logic to the 'LobbyState' class
- for leaving the lobby
2024-12-01 16:49:05 +01:00
Daniel Grigencha
121d668bf2 added logic to the 'LobbyState' class 2024-12-01 16:08:14 +01:00
Fleischer Hanno
ba5b9dc4b4 added the getter for the forcestartGame value in teh corresponding message 2024-12-01 16:04:55 +01:00
Daniel Grigencha
772c7a51e0 updated enum 'Color' 2024-12-01 15:54:06 +01:00
Fleischer Hanno
ed04bc1119 changed all messages to work with a UUID of a piece instead of a string identifier 2024-12-01 15:45:30 +01:00
Fleischer Hanno
7712ee2e7c renamed JoinServerMessage to JoinedLobbyMessage and wrote a getter for the name in the message 2024-12-01 15:14:42 +01:00
Fleischer Hanno
1d5733a4b9 added a method for getting a piece through a uuid 2024-12-01 15:05:26 +01:00
Benjamin Feyer
a1bd8007de added some comments in Piecetest 2024-12-01 14:59:56 +01:00
Fleischer Hanno
dfea7e8736 added java docs for choosepowercard 2024-12-01 14:37:04 +01:00
Benjamin Feyer
55ef5438d2 added som javadoc in the PieceTest-class 2024-12-01 14:31:06 +01:00
Benjamin Feyer
d7b0ac92b8 added in PieceTest the declaration and initialization of two players 2024-12-01 14:23:26 +01:00
Benjamin Feyer
0d043e4bb4 added some more messages to test the server 2024-12-01 14:10:05 +01:00
Fleischer Hanno
e70331d85d changed parameter of DieMessage and included the force resumgame logic in intterrupt 2024-12-01 13:56:31 +01:00
Fleischer Hanno
26d2d0587d added the remaining logic for GameState and its substatemachines 2024-12-01 12:36:44 +01:00
Benjamin Feyer
27de0ccece Merge branch 'development' into 'dev/test'
merge dev into test

See merge request progproj/gruppen-ht24/Gruppe-01!24
2024-12-01 11:14:19 +00:00
Benjamin Feyer
8d49528a92 added the nextmethods 2024-12-01 12:13:29 +01:00
Fleischer Hanno
00b3ef1d80 added selectNext in CLG 2024-12-01 12:12:37 +01:00
Benjamin Feyer
8b1868e03b Merge branch 'development' into 'dev/test'
merge development int test branch

See merge request progproj/gruppen-ht24/Gruppe-01!23
2024-12-01 11:10:24 +00:00
Benjamin Feyer
56f32c5c0b edited some comments in the methods and wrote in som methods, to test unwanted statechanges 2024-12-01 12:09:13 +01:00
Fleischer Hanno
789868863f added some more client game logic 2024-12-01 12:06:06 +01:00
Fleischer Hanno
bdc527b83e added more logic to the client (choosepiece and powercard) 2024-12-01 08:40:16 +01:00
Benjamin Feyer
c41848b061 adjusted some Todos and deleted some mention of statemachines 2024-12-01 00:41:37 +01:00
Benjamin Feyer
0fd190419d Merge branch 'development' into 'dev/test'
merge development into test

See merge request progproj/gruppen-ht24/Gruppe-01!22
2024-11-30 23:34:40 +00:00
Fleischer Hanno
5ff56ed9d8 added all necessary logic for the turn waiting class and adjusted some messages 2024-11-30 22:23:40 +01:00
Fleischer Hanno
81d037d232 made the determinstartplayer machine fully functional 2024-11-30 20:50:57 +01:00
Fleischer Hanno
422e94ec48 Dialog state machine is now fully functional 2024-11-30 19:49:52 +01:00
Fleischer Hanno
b3d754e77f added all current State getter in every client state machine 2024-11-30 16:42:24 +01:00
Fleischer Hanno
0297193be1 added more functionality to the client state machine and implemeted the first notifications 2024-11-30 16:23:09 +01:00
Fleischer Hanno
0487ff0238 modified messages to work with piece uuid instead of an identifier. 2024-11-30 13:02:23 +01:00
Fleischer Hanno
4d6cd63a3d made all notifications constructors public 2024-11-30 11:24:46 +01:00
Benjamin Feyer
838beee345 added some more tests andd edited some mor 2024-11-29 16:49:11 +01:00
Benjamin Feyer
c6462a50ca added two more tests for the substates of turn to their end-states and added some simulated inputs in the lobby and dialogs 2024-11-29 16:00:10 +01:00
Cedric Beck
67bb30d124 added new notifications for client-view communication 2024-11-29 15:23:34 +01:00
Benjamin Feyer
d0361b2759 commented the 'received(interruptMessage)' out, to ensure, there are no unwanted state-changes 2024-11-29 00:33:33 +01:00
Benjamin Feyer
eff011f69f implemented more tests for the clientStartgame 2024-11-29 00:13:06 +01:00
Benjamin Feyer
fad853b34a implemented more tests for the clientstatetests 2024-11-28 23:24:31 +01:00
Benjamin Feyer
4a89c4fa65 processed some Todo in the Client State, to test unwanted statechanged 2024-11-28 22:46:50 +01:00
Benjamin Feyer
6d58ceee3d corrected the classes of the states in the statetests 2024-11-28 19:45:18 +01:00
Benjamin Feyer
ecf1cc6e9a push after merge 2024-11-28 18:53:32 +01:00
Benjamin Feyer
dd836aa6b9 Merge remote-tracking branch 'origin/development' into dev/test
# Conflicts:
#	Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java
2024-11-28 18:44:47 +01:00
Benjamin Feyer
b3504925a5 corrected some testmethods in the serverStateTest,
changed all assertTrue( .... isinstanceof ....) to assertEquals(...,....)
2024-11-28 18:40:07 +01:00
Fleischer Hanno
7690340b8f added mor client state transitions
and renamed every client state with state as its suffix and renamed every message with messag as its suffix
2024-11-28 18:28:55 +01:00