Commit Graph

562 Commits

Author SHA1 Message Date
Hanno Fleischer
d15242f816 added static methods to construct a PlayCard message for each card type 2024-11-25 13:42:00 +01:00
Hanno Fleischer
4705512648 added getter for ArrayList Player in Game and created a flag for ready status in Player 2024-11-25 12:52:22 +01:00
Hanno Fleischer
7efb89c634 Merge remote-tracking branch 'origin/development' into development 2024-11-25 11:20:09 +01:00
Hanno Fleischer
15d1c36dad added an ArrayList of Player in game and added the received methods in clientgamelogic 2024-11-25 11:19:17 +01:00
Benjamin Feyer
ce528457a5 added javadocs 2024-11-25 02:30:43 +01:00
Benjamin Feyer
2cfa328c4c added some more testmethods 2024-11-25 01:50:02 +01:00
Benjamin Feyer
928304fb4b corrected testmethods in clientStateTest 2024-11-25 01:24:11 +01:00
Benjamin Feyer
aa88dff566 added tests in the serverStateTest
added the testmethods for rolldice and movepiece
2024-11-25 00:36:59 +01:00
Benjamin Feyer
f7bd9a0f38 edited some tests in ServerStateTest 2024-11-25 00:20:47 +01:00
Daniel Grigencha
cc800a8dd7 added default constructor for serialization purposes 2024-11-24 23:55:48 +01:00
Daniel Grigencha
7c5720cb9d fixed sonarlint errors and deleted map playerConnectionID 2024-11-24 23:06:30 +01:00
Benjamin Feyer
1821a222e9 minor changes 2024-11-24 22:24:39 +01:00
Benjamin Feyer
2e302ddc75 Merge branch 'development' into 'dev/test'
merge changes into the testbranch

See merge request progproj/gruppen-ht24/Gruppe-01!14
2024-11-24 21:23:23 +00:00
Fleischer Hanno
ed47883281 refactored ceremony message 2024-11-24 22:20:04 +01:00
Fleischer Hanno
599b3e8f47 corrected refactoring mistake, ich which RankingResponce was renamed to RankingResponse 2024-11-24 22:18:48 +01:00
Fleischer Hanno
040b8830ab added getter for dialogstatemachine in dialogs 2024-11-24 22:03:19 +01:00
Benjamin Feyer
6fa3e8c00d Merge branch 'development' into 'dev/test'
Development

See merge request progproj/gruppen-ht24/Gruppe-01!13
2024-11-24 20:58:39 +00:00
Fleischer Hanno
83c79af31a made all con structors of clients states public 2024-11-24 21:56:32 +01:00
Daniel Grigencha
653c3fb962 added javadocs to all server messages 2024-11-24 20:51:03 +01:00
Daniel Grigencha
8932c8a8cd added javadocs to all client messages 2024-11-24 19:56:51 +01:00
Benjamin Feyer
4c078ab0e2 added some testmethods and corrected other in the clientStatemachineTests 2024-11-24 19:37:03 +01:00
Benjamin Feyer
2a97ede985 added some testmethods for the client testing the statechanges in the dialogs 2024-11-24 19:03:19 +01:00
Benjamin Feyer
56492cdda6 added some mor testcases for the clientstatemachine 2024-11-24 18:40:10 +01:00
Benjamin Feyer
a71619612a added the empty testmethods in serverstateTest and edited the testmethods for substates of choocePiece in Client into MovePiece 2024-11-24 18:21:26 +01:00
Benjamin Feyer
f18a62b089 Merge branch 'development' into 'dev/test'
Testmerge

See merge request progproj/gruppen-ht24/Gruppe-01!12
2024-11-24 15:09:07 +00:00
Benjamin Feyer
c204984a74 edited a test in the clientStateTest 2024-11-24 16:03:12 +01:00
Fleischer Hanno
1d4048cf16 added the constructors for all client states and their statemachines 2024-11-24 16:02:04 +01:00
Benjamin Feyer
2095ea5866 editet tests for the server and client statemachines 2024-11-24 15:49:01 +01:00
Daniel Grigencha
f425eff26b added more logic for the server state diagram 2024-11-24 15:27:10 +01:00
Cedric Beck
16dc28013e merge development into dev/client 2024-11-24 10:39:28 +01:00
Cedric Beck
11794b6ac7 added GuiHandler and showing bonuscards 2024-11-24 09:21:44 +01:00
Fleischer Hanno
806f0d7d9d added message contents to the messages
addedn the conentents for all messages regarding the BPMN diagramm and own interpretation.
also created an identifier for pieces to be used for network communication between server and client so that they talk about the same piece.
2024-11-23 12:26:20 +01:00
Benjamin Feyer
df2a7151f0 Merge branch 'development' into 'dev/test'
Merge Test to Development

See merge request progproj/gruppen-ht24/Gruppe-01!8
2024-11-22 12:56:51 +00:00
Daniel Grigencha
89232901a7 added more logic for the server state diagram 2024-11-22 09:37:49 +01:00
Felix
c470c205e4 Add host&join menu and work on modelSyncronizer 2024-11-21 16:16:19 +01:00
Felix
982ca00b55 Make lobby buttons colored 2024-11-21 16:16:19 +01:00
Hanno Fleischer
a3a9f0d88d Merge branch 'development' into 'dev/test'
TestMerge 3

See merge request progproj/gruppen-ht24/Gruppe-01!6
2024-11-19 11:48:06 +00:00
Benjamin Feyer
6790be782e added empty serverstatetests 2024-11-19 12:42:11 +01:00
Cedric Beck
c95beaeb14 working on pieceMovement 2024-11-17 23:57:36 +01:00
Daniel Grigencha
04501de11c Merge remote-tracking branch 'origin/development' into development 2024-11-17 21:18:38 +01:00
Fleischer Hanno
f69a2a9fda added a method to check if a player has pieces in his waiting area 2024-11-17 21:04:13 +01:00
Daniel Grigencha
e83ed1c835 Merge remote-tracking branch 'origin/development' into development 2024-11-17 20:17:29 +01:00
Daniel Grigencha
f379a6b638 added more logic for the server state diagram 2024-11-17 20:17:19 +01:00
Hanno Fleischer
90fb6e4133 added the method tryMove and the methods used by it into serverstate 2024-11-17 17:52:25 +01:00
Hanno Fleischer
9662e1f684 fixed a Bug where the import statement thought a package was a class because they where written the same 2024-11-17 15:34:39 +01:00
Daniel Grigencha
aae7ed9a87 added classes for client and server state machine
- a client state machine consits out of a 'ClientState' (every state of the machine) and a 'ClientStateMachine' (every state, which consists out of states), the machine starts with the ClientAutomaton
- analog for server
- started to implement logic for the server, transition from 'Lobby' to 'GameState'
2024-11-17 15:27:09 +01:00
Hanno Fleischer
07bd7dfa3d Merge branch 'development' into 'dev/test'
Testmerge

See merge request progproj/gruppen-ht24/Gruppe-01!5
2024-11-17 14:20:53 +00:00
Hanno Fleischer
a926554709 adjusted for check style 2024-11-17 12:01:00 +01:00
Hanno Fleischer
020aa92cab added 4 more Notifications for Model -> View interaction 2024-11-17 10:39:36 +01:00
Hanno Fleischer
0845aa80f9 adjusted the model infield creation to represent the current view postion regarding the placement of the teams on the board 2024-11-16 22:31:11 +01:00