Commit Graph

477 Commits

Author SHA1 Message Date
sebaschi be2c8d6698 Added LISTL command to Protocol.java and in JServerProtocolParser.java. currently it is only logged THAt it was reached and parsed, but no functionality is attached. 2022-04-08 14:51:31 +02:00
sebaschi ae61da0607 LISTL command added to Protocol.txt. LISTL shall list all lobbies. 2022-04-08 14:43:45 +02:00
sebaschi 79ddbaf416 Added link referenc in documentation from JServerProtocolParserto Clienthandler. Added LoginClient class for possible implementation of a login sequence. 2022-04-08 14:37:30 +02:00
sebaschi dd2beb559a Added CRTGM debug logger to JServerProtocolParser to see if command is reached. added "/g" as terminal command for client to issue CRTGM command. remobed respective todos from Protocol.java. 2022-04-08 14:16:40 +02:00
sebaschi e2a400d0ca added CRTGM command to Protocol.java. and respective todos. 2022-04-08 14:03:40 +02:00
sebaschi 0e8750c985 Updated diary.txt for Sebastian 8.4.22. Started to handle case in Lobby if lobby is full. 2022-04-08 13:34:30 +02:00
sebaschi 22d356e361 Merge branch 'master' of ssh://git.scicore.unibas.ch:2222/cs108-fs22/Gruppe-8 2022-04-08 13:05:44 +02:00
Jonas c3096d7088 Merge remote-tracking branch 'origin/master' 2022-04-08 13:03:41 +02:00
Jonas e348840169 protocol is now fully in the protocol.java class 2022-04-08 13:03:32 +02:00
Seraina ea0c0d1b3b Merge remote-tracking branch 'origin/master' 2022-04-08 13:01:10 +02:00
Seraina dffd1731e2 Added Doc for print Method 2022-04-08 13:00:47 +02:00
Seraina Schöb f858c734f7 Update Diary.txt 2022-04-08 10:58:17 +00:00
sebaschi 8f453fb9e8 started adding Debug Logger messages to the Lobby methods. 2022-04-08 12:57:36 +02:00
sebaschi d0ceb6b6f9 Merge remote-tracking branch 'origin/master' 2022-04-08 12:47:26 +02:00
sebaschi ac022e1f7c Changed the list in ServerLobby to static, since they are global per running server. 2022-04-08 12:47:19 +02:00
Seraina f729a62289 Merge remote-tracking branch 'origin/master' 2022-04-08 12:46:18 +02:00
Seraina c134de8bba Removed static from Methods 2022-04-08 12:45:57 +02:00
sebaschi 9cc7a37eb9 ServerLobby now has a list of open lobbies and a list of all clients on the server. 2022-04-08 12:43:36 +02:00
Seraina 33d8f779a2 Merge remote-tracking branch 'origin/master' 2022-04-08 12:42:25 +02:00
Seraina 4337583de6 Fixed some bugs now the VoteHanlder does what it is supposed to 2022-04-08 12:42:02 +02:00
sebaschi 16e6364cc9 Lobby now have static field to count how many lobbies there are in total which is used to assign a particular lobby and ID, so players can ask to join the lobby. 2022-04-08 12:40:11 +02:00
Jonas 1d9ee624fe Merge remote-tracking branch 'origin/master' 2022-04-08 12:36:41 +02:00
Jonas b6d2a04e76 Working on putting all protocol messages through Protocol.java.
Some small adjustments & bugfixes to how naming is handled.
Added loggedIn boolean for ClientHandler, not meaningfully implemented yet though.
Other minor changes.
2022-04-08 12:36:30 +02:00
sebaschi 052a207822 Added final field MAX_NO_OF_CLIENTS used to not overfill the lobby. 2022-04-08 12:23:51 +02:00
sebaschi 90f844ce6b Added List of ClientHandlers to represent who is in the lobby, aka the players. 2022-04-08 12:10:49 +02:00
sebaschi ce5723c3e9 Correcions in CentralServerData: wherever a Client object wasa expected has been changed to expect a ClientHandler object. This is because the server sees clients via ClientHandlers but has no access to Client objects.
Lobby: Field "admin" added which is a ClientHandler type object. This represents who started the game and, for the phase before the gameplay starts, controls relevant functions.
2022-04-08 12:08:38 +02:00
Alexander Sazonov 5cfa6809a2 Modified GhostifyHandler, added Logger statement 2022-04-08 11:27:52 +02:00
Seraina f224324fb5 Merge remote-tracking branch 'origin/master' 2022-04-08 11:14:37 +02:00
Seraina d83248d89f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java
2022-04-08 11:12:07 +02:00
Jonas 3c94bd5324 Merge remote-tracking branch 'origin/master' 2022-04-08 11:11:14 +02:00
Jonas 782f6e0f22 Updated Diary.txt 2022-04-08 11:11:01 +02:00
Seraina 913d0781de Added adjustments for the testing of voteHandler
- main methode
- a print methode, that prints out a Passenger array
2022-04-08 11:10:05 +02:00
Alexander Sazonov 6ab1eb0390 Small adjustment to VoteHandler (both ghostVote and humanVote) 2022-04-08 10:55:01 +02:00
Seraina efdd1167d2 Adjusted Passenger class for testing of VoteHandler 2022-04-08 10:27:19 +02:00
Seraina 7a89bb98b6 Merge remote-tracking branch 'origin/master' 2022-04-07 13:24:29 +02:00
Seraina 7153563471 Started building connection between game logic and sever-client. Added new Protocol msg and a s*** ton of todos for myself 2022-04-07 13:24:09 +02:00
Jonas 1b27a601f0 updated nameDuplicateChecker to remove $ and : and deal with empty names. Also renamed singularName() to checkName().
Some other minor adjustments
2022-04-07 13:13:09 +02:00
Jonas 2789779d62 Merge remote-tracking branch 'origin/master' 2022-04-07 12:29:59 +02:00
Jonas faa2b61acb Call me Joni Mitchell because quit due to connection loss works on both sides now. 2022-04-07 12:29:36 +02:00
Alexander Sazonov b470fc78a2 Further development of VoteHandler: extended humanVote method, added Logger statements and comments 2022-04-07 11:59:51 +02:00
Jonas de69ea27bb Merge remote-tracking branch 'origin/master' 2022-04-07 11:33:18 +02:00
Seraina Schöb 1dbfac1f3f Update Diary.txt 2022-04-07 09:33:15 +00:00
Jonas 02c0676ecf every message is sent via the sendMsgToClient / sendMsgToServer methods. Logger for debugging what happens when someone accidentally quits 2022-04-07 11:33:06 +02:00
Seraina b5682d5531 Removed unused methods in game functions 2022-04-07 11:01:59 +02:00
Jonas f26bdec457 added fun Agatha Christie reference for nerds.
(default system name is U.N. Owen)
2022-04-06 23:47:14 +02:00
Jonas d114d69595 Simplified Login, updated name-duplicate-checking and added fun suffixes 2022-04-06 23:30:30 +02:00
Jonas c64c754d22 Another complete overhaul of client-server communication:
-Added broadcastAnnouncement message to ClientHandler
-Bugfix: "Connection lost" at startup
-Added LOGIN$username to protocol
2022-04-06 21:57:21 +02:00
Jonas 51d969e298 Merge remote-tracking branch 'origin/master' 2022-04-06 19:32:05 +02:00
Jonas 033a7e3bb6 /q now works without throwing any errors 2022-04-04 14:36:29 +02:00
Seraina 62a909444e Fixed some typos and inconsistencies in QA-Concept 2022-04-04 14:14:17 +02:00