Commit Graph

394 Commits

Author SHA1 Message Date
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
Cedric Beck
c204a3a4cb change shader folder structure 2024-11-26 17:05:38 +01:00
Cedric Beck
d794ba9d03 added smooth outline 2024-11-26 16:54:40 +01:00
Cedric Beck
e97147d0e9 merge from koppe 2024-11-26 16:47:24 +01:00
Cedric Beck
1b151aabdd added select nodes, cards & pieces 2024-11-26 16:45:13 +01:00
Felix
3e7d3dbc1b Fix 2024-11-26 16:18:33 +01:00
Cedric Beck
7a482b74ab fixed shaders in/out 2024-11-26 13:29:40 +01:00
Cedric Beck
5cc1888794 merge dev/client_koppe into dev/client_beck for camera movement 2024-11-26 13:13:32 +01:00
Cedric Beck
9dd70a96a0 added outline for bonuscards 2024-11-26 12:56:26 +01:00
Cedric Beck
80f5c4ce90 tried adding shield outline, but there is a bug -> black screen 2024-11-26 07:40:41 +01:00
Fleischer Hanno
7eafa3da39 refactored the whole client package structure 2024-11-25 17:43:29 +01:00
Fleischer Hanno
7178935553 refactored the model to incoporate a correct folder structure 2024-11-25 16:41:44 +01:00
Daniel Grigencha
0b538efbfb Merge remote-tracking branch 'origin/development' into development 2024-11-25 16:36:53 +01:00
Daniel Grigencha
f2d5221328 added import statement with the refactored server messages 2024-11-25 16:36:40 +01:00
Daniel Grigencha
06195854d8 added mdga server controller 2024-11-25 16:35:49 +01:00
Daniel Grigencha
321909387d added new server state chart 2024-11-25 16:35:27 +01:00
Hanno Fleischer
933c7ecad7 Merge branch 'dev/test' into 'development'
merge for refactoring of project structure

See merge request progproj/gruppen-ht24/Gruppe-01!15
2024-11-25 15:34:42 +00:00
Felix
806a149bfc Merge dev/client_koppe 2024-11-25 16:33:04 +01:00
Benjamin Feyer
1803fb5549 edted some tests with null tests 2024-11-25 16:32:51 +01:00
Felix
96489f2454 Minor work 2024-11-25 16:32:16 +01:00
Felix
439231aecf Add rotateable cam 2024-11-25 16:15:59 +01:00
Daniel Grigencha
9759b6871b reverted server messages 2024-11-25 16:14:15 +01:00
Daniel Grigencha
52d9fff493 deleted server state automaton 2024-11-25 15:43:29 +01:00
Hanno Fleischer
31b449662f added two Pieces in RequestPlayCard in order to differentiate between own and enemy pieces 2024-11-25 15:09:24 +01:00
Hanno Fleischer
3be037d590 added two lists in PossiblePiece in order to differentiate between own and enemy pieces 2024-11-25 15:07:43 +01:00
Felix
8982662f5b Remove debug statement 2024-11-25 14:01:06 +01:00
Felix
d70efb32ea Fix audio settings 2024-11-25 13:59:55 +01:00
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
Cedric Beck
b9986ded87 try push 2024-11-24 22:41:17 +01:00
Cedric Beck
fd09460d61 try push 2024-11-24 22:40:50 +01:00
Cedric Beck
e5dca013d1 try push 2024-11-24 22:38:23 +01:00
Cedric Beck
7bfc6e7c3e try push 2024-11-24 22:37:37 +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