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
|
5d638a1da7
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 18:20:16 +01:00 |
|
Fleischer Hanno
|
b83279e835
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 18:16:05 +01:00 |
|
Daniel Grigencha
|
eb54cfbc80
|
adjusted constructor for mdga server
|
2024-12-01 18:15:56 +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 |
|
Felix Koppe
|
21f98de3e6
|
Minor adjustment
|
2024-12-01 17:32:05 +01:00 |
|
Cedric Beck
|
b099972656
|
merge from dev/client_beck
|
2024-12-01 17:10: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
|
a29e942191
|
added logic to the 'MdgaServer' class
|
2024-12-01 16:57:48 +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 |
|
Fleischer Hanno
|
dfea7e8736
|
added java docs for choosepowercard
|
2024-12-01 14:37:04 +01:00 |
|
Felix Koppe
|
2c81665f80
|
Update startmenu.png
|
2024-12-01 14:22:18 +01:00 |
|
Felix Koppe
|
150e4e4c22
|
Merge development
|
2024-12-01 14:18:44 +01:00 |
|
Felix Koppe
|
4ff84e64ed
|
Merge development
|
2024-12-01 14:11:10 +01:00 |
|
Felix Koppe
|
e6fb78507c
|
Remove garbarge files
|
2024-12-01 14:10:04 +01:00 |
|
Felix Koppe
|
9067a9b04c
|
Add javadoc
|
2024-12-01 14:08:33 +01:00 |
|
Felix Koppe
|
6758abd60e
|
Add javadoc to buttons
|
2024-12-01 13:56:45 +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 |
|
Felix Koppe
|
c3ad8fe79a
|
Gerneral improvements
|
2024-12-01 13:35:14 +01:00 |
|
Fleischer Hanno
|
26d2d0587d
|
added the remaining logic for GameState and its substatemachines
|
2024-12-01 12:36:44 +01:00 |
|
Fleischer Hanno
|
00b3ef1d80
|
added selectNext in CLG
|
2024-12-01 12:12:37 +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 |
|
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 |
|
Felix Koppe
|
a630ade2e1
|
Fix lobbyView leave
|
2024-11-30 14:21:45 +01:00 |
|
Felix Koppe
|
b197d70d44
|
Fix errors
|
2024-11-30 14:18:00 +01:00 |
|
Felix Koppe
|
67d120c278
|
Fix error
|
2024-11-30 14:10:42 +01:00 |
|
Felix Koppe
|
d53067f21a
|
Merge dev/client
|
2024-11-30 14:03:54 +01:00 |
|
Felix Koppe
|
4313468a0c
|
Finish merge
|
2024-11-30 14:00:42 +01:00 |
|
Felix Koppe
|
0393e9b534
|
Fixing errors
|
2024-11-30 13:47:34 +01:00 |
|
Felix Koppe
|
f3bc6bc2f0
|
Fixing errors
|
2024-11-30 13:38:08 +01:00 |
|
Felix Koppe
|
12abe081c9
|
Minor changes
|
2024-11-30 13:21:31 +01:00 |
|
Felix Koppe
|
02b536aa82
|
102IQ
|
2024-11-30 13:17:53 +01:00 |
|
Felix Koppe
|
99ffee749e
|
101IQ
|
2024-11-30 13:14:41 +01:00 |
|
Felix Koppe
|
6f71a8b16d
|
Work#
|
2024-11-30 13:12:51 +01:00 |
|