Fleischer Hanno
|
33ddea4221
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 21:49:30 +01:00 |
|
Daniel Grigencha
|
977a7294ad
|
updated server state diagram and added missing classes
|
2024-12-01 21:49:11 +01:00 |
|
Daniel Grigencha
|
71d5701cc7
|
added javadoc for the classes in the notification package
|
2024-12-01 21:44:35 +01:00 |
|
Benjamin Feyer
|
1c826bcec0
|
added comments
|
2024-12-01 21:12:19 +01:00 |
|
Fleischer Hanno
|
42feca466d
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 21:05:41 +01:00 |
|
Daniel Grigencha
|
95a1f8d858
|
removed all inheritance of the automaton for testing purposes
|
2024-12-01 21:05:22 +01:00 |
|
Benjamin Feyer
|
bd9d8c688d
|
Merge branch 'development' into 'dev/test'
merge development into test
See merge request progproj/gruppen-ht24/Gruppe-01!26
|
2024-12-01 20:02:47 +00:00 |
|
Fleischer Hanno
|
76757c19a9
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 21:02:11 +01:00 |
|
Daniel Grigencha
|
c3fdcf4dc7
|
added the states of the server automaton for testing purposes
|
2024-12-01 21:01:37 +01:00 |
|
Fleischer Hanno
|
8ffab12f49
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 20:57:57 +01:00 |
|
Daniel Grigencha
|
8369797120
|
added JavaDocs for the 'InterruptState' classe
|
2024-12-01 20:41:30 +01:00 |
|
Daniel Grigencha
|
ef450a23f5
|
added logger to server state chart
|
2024-12-01 20:35:40 +01:00 |
|
Daniel Grigencha
|
17f0aa0209
|
added the 'Die' class to the 'Game' class
|
2024-12-01 19:46:59 +01:00 |
|
Fleischer Hanno
|
1d8eff8ea9
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 19:45:06 +01:00 |
|
Daniel Grigencha
|
ff31335a98
|
added a new class 'Die' to handle the dice. added this class to the class 'Game'
|
2024-12-01 19:38:26 +01:00 |
|
Daniel Grigencha
|
3467dd2f04
|
added a new method getColorByIndex(int) and next() method to the enum 'Color'
|
2024-12-01 19:37:40 +01:00 |
|
Daniel Grigencha
|
fb6cfaa518
|
added JavaDocs for the classes in the package 'game'
|
2024-12-01 19:36:58 +01:00 |
|
Fleischer Hanno
|
e9d45f241f
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 18:22:29 +01:00 |
|
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 |
|