457023ad93
Work
Felix Koppe
2024-11-29 12:30:59 +01:00
c3055a0646
Work
Felix Koppe
2024-11-29 12:29:20 +01:00
ae1ec74056
Merge dev/client_beck
Felix Koppe
2024-11-29 10:48:05 +01:00
24cc81d9d4
Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_koppe2
Felix Koppe
2024-11-29 10:13:15 +01:00
c25c12d0d6
Work on ceremony2
Felix Koppe
2024-11-29 09:45:36 +01:00
d0361b2759
commented the 'received(interruptMessage)' out, to ensure, there are no unwanted state-changes
Benjamin Feyer
2024-11-29 00:33:33 +01:00
eff011f69f
implemented more tests for the clientStartgame
Benjamin Feyer
2024-11-29 00:13:06 +01:00
fad853b34a
implemented more tests for the clientstatetests
Benjamin Feyer
2024-11-28 23:24:31 +01:00
4a89c4fa65
processed some Todo in the Client State, to test unwanted statechanged
Benjamin Feyer
2024-11-28 22:46:50 +01:00
7b689d6bf6
Work on ceremony
Felix Koppe
2024-11-28 21:39:08 +01:00
2099e02567
added board dice; edited DiceControl; added high-res font; working on ActionTextHandler
Cedric Beck
2024-11-28 20:07:15 +01:00
6d58ceee3d
corrected the classes of the states in the statetests
Benjamin Feyer
2024-11-28 19:45:18 +01:00
ecf1cc6e9a
push after merge
Benjamin Feyer
2024-11-28 18:53:32 +01:00
dd836aa6b9
Merge remote-tracking branch 'origin/development' into dev/test
Benjamin Feyer
2024-11-28 18:44:47 +01:00
b3504925a5
corrected some testmethods in the serverStateTest, changed all assertTrue( .... isinstanceof ....) to assertEquals(...,....)
Benjamin Feyer
2024-11-28 18:40:07 +01:00
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
Fleischer Hanno
2024-11-28 18:28:55 +01:00
8a5ebfd9d2
added some clientStateTests
Benjamin Feyer
2024-11-28 18:01:22 +01:00
3dcdbdf489
added display of 'colorÃ' to playerName
Cedric Beck
2024-11-28 17:29:59 +01:00
a3a155a7e3
corrected some testmethods due to renaming of classes and changed state-architecture
Benjamin Feyer
2024-11-28 16:52:00 +01:00
88cb87d4cd
Merge commit
Felix Koppe
2024-11-28 16:25:57 +01:00
827e7aac86
Add stuff
Felix Koppe
2024-11-28 16:25:13 +01:00
eec68188ee
Make use of parallelProjection
Felix Koppe
2024-11-28 16:08:33 +01:00
476ca82bda
created the first part of the cliejnt state machine with its corresponding logic
Hanno Fleischer
2024-11-28 15:27:31 +01:00
3235a46788
Rewrite gui
Felix Koppe
2024-11-28 15:00:53 +01:00
7da388af37
added improved pieces model; added functionality to notifications + todos
Cedric Beck
2024-11-28 02:08:51 +01:00
304acf17a3
added full highlight functionality for bonuscards; added bonus Symbols display
Cedric Beck
2024-11-28 01:21:15 +01:00
9736dc828b
added highlight to bonuscards
Cedric Beck
2024-11-27 19:50:29 +01:00
cbbef16374
added two more todos
Hanno Fleischer
2024-11-27 09:20:22 +01:00
c9362a7a95
fixed bugs so the programm would start and added some Todo where code is missing or was fraudulent
Hanno Fleischer
2024-11-27 09:19:57 +01:00
35cf092d5c
Merge commit
Felix
2024-11-27 08:44:29 +01:00
06e2d831ef
Fix errors
Felix
2024-11-27 08:42:45 +01:00
75b53f8309
Fix model compile errors
Felix
2024-11-27 08:39:50 +01:00
0b9fc90274
added dice, started adding notification implementation, added hover, highlight and select functionality for pieces
Cedric Beck
2024-11-27 03:05:35 +01:00
5ef07e35d1
Merge branch 'development' into 'dev/test'
Benjamin Feyer
2024-11-26 22:32:02 +00:00
20c9000d56
Merge remote-tracking branch 'origin/development' into development
Daniel Grigencha
2024-11-26 23:29:02 +01:00
5a911326ba
minor changes to the server state automaton
Daniel Grigencha
2024-11-26 23:28:49 +01:00
6528e5c2b6
started adding notifications
Cedric Beck
2024-11-26 20:53:29 +01:00
621bb9efae
fixed bugs inside of the client state machine and the message UpdateTSK
Hanno Fleischer
2024-11-26 20:31:16 +01:00
58f94e73db
Merge commit
Felix
2024-11-26 20:23:23 +01:00
84c289cfd1
implemented all methods required for the state pattern in the client and adjusted the messages to work with player ids instead of names
Fleischer Hanno
2024-11-26 20:04:58 +01:00
f827757ad1
added next method for Color
Fleischer Hanno
2024-11-26 18:16:19 +01:00
e4a9b16fd5
Merge remote-tracking branch 'origin/development' into development
Daniel Grigencha
2024-11-26 18:12:32 +01:00
d63d0cc2a0
changed default constructor of 'Player' class
Daniel Grigencha
2024-11-26 18:12:08 +01:00
a127ee524a
Merge remote-tracking branch 'origin/development' into development
Hanno Fleischer
2024-11-26 18:05:37 +01:00
5c2df2430d
reworked the client state machine and removed the seperate classes for the statemachines these machines are now directly included in the parent states
Hanno Fleischer
2024-11-26 18:04:56 +01:00
2e76c41d3a
added new 'Disconnect' client message and updated 'Player' and 'Game' classes
Daniel Grigencha
2024-11-26 18:02:19 +01:00
5cc1888794
merge dev/client_koppe into dev/client_beck for camera movement
Cedric Beck
2024-11-26 13:13:32 +01:00
9dd70a96a0
added outline for bonuscards
Cedric Beck
2024-11-26 12:56:26 +01:00
46a6552bca
refactored the whole client package structure
Fleischer Hanno
2024-11-25 17:43:29 +01:00
1d95146272
refactored the model to incoporate a correct folder structure
Fleischer Hanno
2024-11-25 16:41:44 +01:00
9859d52e02
edted some tests with null tests
Benjamin Feyer
2024-11-25 16:32:51 +01:00
e18ea15efa
added javadocs
Benjamin Feyer
2024-11-25 02:30:43 +01:00
461a497353
added some more testmethods
Benjamin Feyer
2024-11-25 01:50:02 +01:00
4c3099ddf2
corrected testmethods in clientStateTest
Benjamin Feyer
2024-11-25 01:24:11 +01:00
b0ab870451
added tests in the serverStateTest added the testmethods for rolldice and movepiece
Benjamin Feyer
2024-11-25 00:36:59 +01:00
993c94c306
edited some tests in ServerStateTest
Benjamin Feyer
2024-11-25 00:20:47 +01:00
e52af59cac
minor changes
Benjamin Feyer
2024-11-24 22:24:39 +01:00
40f1bdb51f
added some testmethods and corrected other in the clientStatemachineTests
Benjamin Feyer
2024-11-24 19:37:03 +01:00
436dae4ebc
added some testmethods for the client testing the statechanges in the dialogs
Benjamin Feyer
2024-11-24 19:03:19 +01:00
1b2d4df96f
added some mor testcases for the clientstatemachine
Benjamin Feyer
2024-11-24 18:40:10 +01:00
f3ca9f01c0
added the empty testmethods in serverstateTest and edited the testmethods for substates of choocePiece in Client into MovePiece
Benjamin Feyer
2024-11-24 18:21:26 +01:00
3c97cdae38
edited a test in the clientStateTest
Benjamin Feyer
2024-11-24 16:03:12 +01:00
227d4286e5
editet tests for the server and client statemachines
Benjamin Feyer
2024-11-24 15:49:01 +01:00
9939ec2861
added empty serverstatetests
Benjamin Feyer
2024-11-19 12:42:11 +01:00
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.
Benjamin Feyer
2024-11-14 18:07:36 +01:00
ec58e9c85f
added import statement with the refactored server messages
Daniel Grigencha
2024-11-25 16:36:40 +01:00
cf6777023f
added mdga server controller
Daniel Grigencha
2024-11-25 16:35:49 +01:00
739279d3df
added new server state chart
Daniel Grigencha
2024-11-25 16:35:27 +01:00
b6bf25671f
reverted server messages
Daniel Grigencha
2024-11-25 16:14:15 +01:00
5a9fd2a939
deleted server state automaton
Daniel Grigencha
2024-11-25 15:43:29 +01:00
e1b21de718
added two Pieces in RequestPlayCard in order to differentiate between own and enemy pieces
Hanno Fleischer
2024-11-25 15:09:24 +01:00
f321608132
added two lists in PossiblePiece in order to differentiate between own and enemy pieces
Hanno Fleischer
2024-11-25 15:07:43 +01:00
dd7a27629b
added static methods to construct a PlayCard message for each card type
Hanno Fleischer
2024-11-25 13:42:00 +01:00
eba681c350
added getter for ArrayList Player in Game and created a flag for ready status in Player
Hanno Fleischer
2024-11-25 12:52:22 +01:00
f97eea3e5e
added default constructor for serialization purposes
Daniel Grigencha
2024-11-24 23:55:48 +01:00
1582038dfe
added an ArrayList of Player in game and added the received methods in clientgamelogic
Hanno Fleischer
2024-11-25 11:19:17 +01:00
798e996a8d
fixed sonarlint errors and deleted map playerConnectionID
Daniel Grigencha
2024-11-24 23:06:30 +01:00
472d87b0c9
refactored ceremony message
Fleischer Hanno
2024-11-24 22:20:04 +01:00
7cfb863e5c
corrected refactoring mistake, ich which RankingResponce was renamed to RankingResponse
Fleischer Hanno
2024-11-24 22:18:48 +01:00
7e1d2e833e
added getter for dialogstatemachine in dialogs
Fleischer Hanno
2024-11-24 22:03:19 +01:00
67a87ffa81
made all con structors of clients states public
Fleischer Hanno
2024-11-24 21:56:32 +01:00
12fbf4e77e
added javadocs to all server messages
Daniel Grigencha
2024-11-24 20:51:03 +01:00
f6d16a81bf
added javadocs to all client messages
Daniel Grigencha
2024-11-24 19:56:51 +01:00
6938ce16b7
added the constructors for all client states and their statemachines
Fleischer Hanno
2024-11-24 16:02:04 +01:00
85ea4d340c
added more logic for the server state diagram
Daniel Grigencha
2024-11-24 15:27:10 +01:00
e3d5d8e2e9
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.
Fleischer Hanno
2024-11-23 12:26:20 +01:00
6dfb2980fa
added more logic for the server state diagram
Daniel Grigencha
2024-11-22 09:37:49 +01:00
f3894a5058
added a method to check if a player has pieces in his waiting area
Fleischer Hanno
2024-11-17 21:04:13 +01:00
787d8b558c
added the method tryMove and the methods used by it into serverstate
Hanno Fleischer
2024-11-17 17:52:25 +01:00
3949a00932
added more logic for the server state diagram
Daniel Grigencha
2024-11-17 20:17:19 +01:00
80f5c4ce90
tried adding shield outline, but there is a bug -> black screen
Cedric Beck
2024-11-26 07:40:41 +01:00
7eafa3da39
refactored the whole client package structure
Fleischer Hanno
2024-11-25 17:43:29 +01:00
ef3193cd68
Merge branch 'development' into 'dev/test'
Benjamin Feyer
2024-11-25 15:52:35 +00:00
Felix Koppe
Felix Koppe
Benjamin Feyer
Cedric Beck
Fleischer Hanno
Daniel Grigencha