Commit Graph

203 Commits

Author SHA1 Message Date
b087eee99d refactor: added hasFreePlayerSlot method to LobbyConnection 2021-06-07 15:34:22 +02:00
9f366c7776 doc: added comments and logs to LobbyManager 2021-06-07 15:33:27 +02:00
e288c8d4a4 fix: fixed the No-Events-bug in the lobby 2021-06-07 15:12:22 +02:00
1e37bf8ff3 fix: remove faulty participant deletion 2021-06-07 15:00:39 +02:00
e40218b2cf refactor: major refactor for UserManager, and comments for LobbyManager 2021-06-07 14:51:38 +02:00
3ea1cc6cf5 fix: resolve some more connection opening and closing issues 2021-06-07 13:11:09 +02:00
3be518f13b fix: send GameStructure on reconnect 2021-06-07 09:04:18 +02:00
efa5ce3848 fix: remove stored sessions when clients get disconnected by the server 2021-06-07 08:55:53 +02:00
0d1af0ed62 feat: add disconnect and reconnect methods to lobby 2021-06-07 08:51:38 +02:00
ca0999d06b refactor: minor fixes 2021-06-07 08:41:13 +02:00
522558bb16 refactor: switch more classes to singleton, simplify handling greatly 2021-06-07 07:36:51 +02:00
d9b5b3db2f cleanup: code cleanup 2021-06-07 03:49:06 +02:00
48d9626c06 fix: now sends goodbyeClient message on disconnect 2021-06-07 02:13:12 +02:00
a25b429e1e fix: fixed bug where selectionComplete is always false 2021-06-07 02:08:52 +02:00
752f43b86f refactor: formated lobbymanager properly 2021-06-07 02:01:31 +02:00
16c425c507 refactor: formatted Lobby files properly 2021-06-07 01:58:25 +02:00
c24121b6d9 refactor: formated UserManager properly 2021-06-07 01:56:12 +02:00
7f70fa51e4 test: commented out impossible to reach methods in UserManager 2021-06-07 01:46:24 +02:00
9e894a370e feat: improved UserManager 2021-06-07 01:46:24 +02:00
0f559d09a5 feat: implemented reconnectClient 2021-06-07 01:46:23 +02:00
cc8277ff99 feat: improved LobbyConnection 2021-06-07 01:46:23 +02:00
f3e3f9f7d7 fix: implemented hashCode that persists for lifetime of object 2021-06-07 01:46:23 +02:00
4ace772be0 fix: fixed TurnTimer, Lobby and Pipeline 2021-06-07 01:46:23 +02:00
67be103c42 feat: add help cli arg and add descriptions 2021-06-07 01:02:40 +02:00
Richard Reiber
355698db1b test: added test for broadcastEvents with a list of Events 2021-06-06 21:40:53 +02:00
e7f22099b1 fix: changed maxLobbies from int to Integer 2021-06-06 21:36:44 +02:00
e029106a11 refactor: extracted method in LobbyManager 2021-06-06 21:36:44 +02:00
3ab8d57829 test: created tests for LobbyManager and LobbyRunner 2021-06-06 21:36:44 +02:00
5f89e4e90a refactor: regenerated HashCode for lobbyConnection 2021-06-06 21:36:44 +02:00
f61069bb79 fix: fixed proper check whether lobbys are available in LobbyRunner 2021-06-06 21:36:44 +02:00
Richard Reiber
b4cac6242b test: added test for broadCastToAllExcept in LobbyConnectionTest 2021-06-06 21:21:21 +02:00
6470bc09b1 test: added tests for lobbymanager classes 2021-06-06 21:02:31 +02:00
a056674926 test: fixed LobbyConnection broadcastEvents test 2021-06-06 20:33:39 +02:00
Richard Reiber
4ed6d23be6 test: added test for spectator joins full lobby (need fix) 2021-06-06 20:00:39 +02:00
Richard Reiber
4e39d01ac6 test: added tests for add and remove Participants as well as first message Tests (broadcast needs to be fixed) 2021-06-06 19:59:35 +02:00
c56a356994 fix: implemented proper game start in Lobby 2021-06-06 19:30:38 +02:00
2995564cdf feat: switched LobbyRunner implementation to threads again 2021-06-06 19:30:17 +02:00
c09d407351 feat: implemented CharacterSelection and game start 2021-06-06 19:29:51 +02:00
f52e089433 refactor: changed UserManager constructor to private 2021-06-06 19:28:19 +02:00
36285238ec test: updated test for UserManager 2021-06-06 19:27:50 +02:00
e544c00d2e test: created test for LobbyRunner 2021-06-06 19:27:40 +02:00
cb2b760866 fix: fixed duplicate parameter -l 2021-06-06 18:50:32 +02:00
87bada350b test: disabled impossible tests, and removed singleton instances 2021-06-06 18:50:03 +02:00
8dab25ca8d test: fixed LobbyManagerTest to not run lobbies 2021-06-06 18:43:38 +02:00
472a1e70ce test: created tests for LobbyConnection / Manager / Runner 2021-06-06 17:46:25 +02:00
6043a21e22 feat: implemented callback-based message sending 2021-06-06 17:46:00 +02:00
2acf340482 feat: changed implementation to fixed thread pool 2021-06-06 17:45:41 +02:00
21bfac7d75 feat: implemented Character selection and relaying to lobby 2021-06-06 17:45:16 +02:00
7af0fd40a1 feat: implemented UserManager message forwarding 2021-06-06 17:44:53 +02:00
e689248f9e fix: fixed equals in Lobby 2021-06-06 17:44:28 +02:00
0c8dd3f1a8 test: completed UserManager test 2021-06-06 17:44:11 +02:00
7a27ca8ecf feat: added max lobbies parameter 2021-06-06 17:43:55 +02:00
a6ecf6fa30 refactor: deleted MessageRelay class 2021-06-06 17:43:29 +02:00
cc45c821b7 fix: moved LobbyRunner from tests into main 2021-06-06 15:11:17 +02:00
ef8cd1773a feat: implemented LobbyRunner 2021-06-06 14:11:33 +02:00
cbdb2017b8 refactor: removed callback in constructor 2021-06-06 12:47:09 +02:00
07d440bfac refactor: removed callbacks and generated equals and hashcode for Lobby and LobbyConnection 2021-06-06 12:46:45 +02:00
1839341734 feat: adjusted singleton pattern in MarvelousServer 2021-06-06 03:50:31 +02:00
0ee264502c feat: converted UserManager to singleton object 2021-06-06 03:50:31 +02:00
7db692f790 feat: partially implemented not yet refactored lobbyManager 2021-06-06 03:50:31 +02:00
e7a8f0e1e4 feat: implemented lobby creation and general management 2021-06-06 03:50:31 +02:00
8b2805fcf1 feat: improved Server mainclass 2021-06-06 03:50:31 +02:00
Richard Reiber
bbaeb63bb6 doc: added documentation for Lobby classes 2021-06-06 01:51:39 +02:00
Richard Reiber
7f512400df test: added TimeoutWarning and generateWin tests 2021-06-06 00:49:53 +02:00
Richard Reiber
c1cd3fba66 fix: updated timeout-method for spectator-error 2021-06-06 00:49:09 +02:00
6a8de34c67 refactor: extracted UpdateTimer method 2021-06-06 00:39:15 +02:00
Richard Reiber
4e66a4eb24 test: created test for Lobby 2021-06-06 00:09:04 +02:00
6eff0a4813 refactor: extracted updateTimer method 2021-06-06 00:08:08 +02:00
4e2e0bd622 fix: fixed UserManagerTest 2021-06-05 23:48:16 +02:00
Richard Reiber
4dec57d483 test: created test for TurnTimer 2021-06-05 23:28:17 +02:00
0088a4b3e9 feat: broadcast GamestateEvents after initialization 2021-06-05 23:27:40 +02:00
bc7dcf4985 build: added Mockito inline dependency 2021-06-05 23:27:15 +02:00
a0c26bd39d fix: fixed DisconnectSegmentTest according to Lobby API changes 2021-06-05 23:17:17 +02:00
2f2bbea213 changed LobbyConnection construction, and changed Lobby and DisconnectSegment according to new API 2021-06-05 23:14:08 +02:00
c5e8bd6ece feat: implemented handshake and sendMessage methods properly 2021-06-05 23:14:08 +02:00
20bce266b1 feat: made config files globally avaliable via Server 2021-06-05 23:14:08 +02:00
b0a37d63f8 feat: implemented RandomWordGenerator 2021-06-05 23:14:08 +02:00
11559d1f56 test: disabled useless server test 2021-06-05 23:14:08 +02:00
ae546372db build: updated mockito dependency to the proper one 2021-06-05 23:14:07 +02:00
Richard Reiber
9fcb1aa009 test: created test for RequestGameStateSegment 2021-06-05 22:39:40 +02:00
Richard Reiber
a61409a822 test: created test for Pipeline 2021-06-05 22:22:56 +02:00
Richard Reiber
b4d547a6d3 feat: added contains to Pipeline 2021-06-05 22:22:24 +02:00
Richard Reiber
ece6ef133c refactor: generated equals and hashcode for Packet 2021-06-05 22:21:44 +02:00
Richard Reiber
8ee3e22dab test: added processRequests-Tests to PauseSegmentTest 2021-06-05 21:17:51 +02:00
Richard Reiber
3f14019a83 test: updated PacketTest with getOriginTest() 2021-06-05 20:49:26 +02:00
Richard Reiber
f0bdee28c3 test: added PacketTest 2021-06-05 20:44:15 +02:00
Richard Reiber
552bab8d93 test: added DisconnectSegmentTest 2021-06-05 20:30:48 +02:00
f8428fea3e refactor: changed public final variables to getters 2021-06-05 19:44:09 +02:00
2d27022655 feat: partially implemented LobbyManager and MessageRelay 2021-06-05 19:40:28 +02:00
02b2a58cce feat: partially implemented GameAssignment 2021-06-05 19:40:10 +02:00
7ce16fd81f test: partially TDDed UserManager 2021-06-05 19:38:28 +02:00
15eb18e79a fix: fixed Participant constructor 2021-06-05 19:37:41 +02:00
ab4e9aa42c feat: added name to Participant 2021-06-05 16:47:57 +02:00
e318b02db7 feat: implemented proper validation of configs 2021-06-05 16:47:33 +02:00
93bd3fe99d fix: fixed listen address of the server from localhost to 0.0.0.0 2021-06-05 04:15:31 +02:00
ddba210025 feat: partial implementation of UserManager 2021-06-05 01:34:53 +02:00
fc37aca05a build: added dependency to enable websocket server logging 2021-06-05 00:54:45 +02:00
903719e254 refactor: made WebSocket non-final for reconnect modularity 2021-06-05 00:54:22 +02:00
69f77a1423 feat: partially implemented net connection and handshake 2021-06-05 00:53:55 +02:00
051c91f9de fix: made argument parsing standard compliant 2021-06-05 00:53:35 +02:00