seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 82a4e42b3c OG Ghost position is now truly randomized Seraina 2022-04-15 19:38:42 +02:00
  • 853f33479f Added class names manually to all LogManager.getLogger(ClassName.class) instances Now Jar is runnable Seraina 2022-04-15 19:10:28 +02:00
  • 7c70b276cd /z now lists all games opened and closed also fixed two bugs in VoteHandler (Array out of Bound in GhostNPC and in ClientVoteData) Seraina 2022-04-15 18:47:05 +02:00
  • 1ba30663be Lobby has now a parameter that indicates if the lobby is still open or if the game has already started. only the admin can start a game and only one game per lobby can be started Seraina 2022-04-15 17:24:51 +02:00
  • 5b0004f8ff Games have names now Seraina 2022-04-15 16:40:26 +02:00
  • 85fca301ff Merge remote-tracking branch 'origin/master' Sebastian Lenzlinger 2022-04-14 16:26:07 +02:00
  • 13e8002d79 Added GuiChat fxml file Sebastian Lenzlinger 2022-04-14 16:25:59 +02:00
  • 2f79b41618 Avoided null pointer exception by adding an if statement Seraina 2022-04-14 15:05:00 +02:00
  • b37916134a Merge remote-tracking branch 'origin/master' Seraina 2022-04-14 14:57:17 +02:00
  • 44a534bafa Game can now handle a name change and an exit by a client Seraina 2022-04-14 14:56:25 +02:00
  • 3290009640 Merge remote-tracking branch 'origin/master' Sebastian Lenzlinger 2022-04-14 14:02:36 +02:00
  • 17783cb591 Merged Onto Master Sebastian Lenzlinger 2022-04-14 14:02:27 +02:00
  • b202a6aa45 Updated game manual to describe only already implemented game features. Content might be good enough for final version, design has to be improved. Alexandr Sazonov 2022-04-14 11:57:52 +00:00
  • a0a82f8f8c Merge remote-tracking branch 'origin/master' Seraina 2022-04-14 13:28:59 +02:00
  • 004f70ba44 Implemented starting everything from NightTrainToBudapest class. Jonas 2022-04-14 13:19:23 +02:00
  • 5a36988cd2 Merge branch 'guiSeb' into 'master' Sebastian Lenzlinger 2022-04-14 10:53:46 +00:00
  • 7889614874 Update Diary.txt Alexandr Sazonov 2022-04-14 10:51:43 +00:00
  • 8183d2b9da First version of game manual Alexandr Sazonov 2022-04-14 10:41:45 +00:00
  • 0dbc3093e2 New game started from outside of lobby has been handled Seraina 2022-04-14 12:20:04 +02:00
  • 33d9ea899e Adjusted game logic to lobbies, now a game is started inside a lobby and only sends msg to clients in the respective lobby TODO: when a client leaves a lobby or the server, the corresponding passenger needs to be transformed into an npc Seraina 2022-04-14 11:59:28 +02:00
  • 682b2634fc Fixed an error in Game (other method name) Seraina 2022-04-14 09:42:58 +02:00
  • d98ee434c8 Merge remote-tracking branch 'origin/master' Seraina 2022-04-14 08:36:01 +02:00
  • b8c970801c Merge branch 'SerainaSpiellogik' Seraina 2022-04-14 08:17:36 +02:00
  • 9299027bcd Had to redo the voteGetter: now it is handled via userInputListener and messageFormatter Seraina 2022-04-13 18:56:48 +02:00
  • bc136d7b68 Fixed some bugs with the noise handeling, seems not work now Still need to handle connection loss and name-change in gamelogic Seraina 2022-04-13 12:57:49 +02:00
  • fc250da14b Merge remote-tracking branch 'origin/SerainaSpiellogik' into SerainaSpiellogik Seraina 2022-04-13 11:44:00 +02:00
  • 850e09e0af Integrated noise handling so it would run, some bugs still to work out Seraina 2022-04-13 11:43:35 +02:00
  • a6d416e457 final tiny touch ups Sebastian Lenzlinger 2022-04-13 01:47:25 +02:00
  • 76e1ed3ff1 Added a missing return statement Sebastian Lenzlinger 2022-04-13 01:46:28 +02:00
  • 3e2288026b Further Building the scene Sebastian Lenzlinger 2022-04-13 01:45:32 +02:00
  • e4f9776f7f Slowly building the SceneGraph from the bottom. Created a abstract class that imlements the Toggle interface for toggling between who one wants to chat. Sebastian Lenzlinger 2022-04-13 01:07:49 +02:00
  • 68248c7175 (noch sehr kurzer) Dairy Update Sebastian Lenzlinger 2022-04-12 23:50:30 +02:00
  • ca1256f01f Created Classes and Interfaces. Trying to adhere to the MVC pattern Sebastian Lenzlinger 2022-04-12 23:46:38 +02:00
  • 503808941b Deleted unused classes, implemented whisper chat, other small fixes & adjustments. Jonas 2022-04-12 22:16:34 +02:00
  • 8aad32bd2d Several small adjustments. Nothing major, pushing so i can continue coding on other PC Jonas 2022-04-12 20:04:23 +02:00
  • 920ea3fba9 Implemented broadcast to all clients across lobbies (/b), other small changes to chat & leaving lobbies: -bugfix for LEAVL -/c now defaults to message within lobby -broadcast chat to lobby when called by someone outside lobby just broadcasts to all clients not in lobbies Jonas 2022-04-12 11:38:40 +02:00
  • 01b08e41b8 Implemented (almost) all required Lobby functionality. Also added Client_01 and CLient_02 for testing inside intelliJ Jonas 2022-04-11 23:05:39 +02:00
  • 33cbb4e57d Client Login into Lobby as well as creating a lobby now works and client can only be in one lobby at the same time. Jonas 2022-04-11 18:08:39 +02:00
  • 42e2720016 Merge remote-tracking branch 'origin/master' into buddaLobbySebastian Jonas 2022-04-11 16:19:58 +02:00
  • 240a44d1c3 Several small adjustments to lobby structure Jonas 2022-04-11 16:17:35 +02:00
  • 087250b9f5 Packed duplicated code fragments into a method (in VoteHandler) Alexander Sazonov 2022-04-11 13:56:15 +02:00
  • 062304719f Merge remote-tracking branch 'origin/SerainaSpiellogik' into SerainaSpiellogik Seraina 2022-04-09 23:40:33 +02:00
  • 0710703f77 Extended Doc in all classes I did smt in to hopefully make it understandable Seraina 2022-04-09 23:39:38 +02:00
  • 1db4042bc7 Merge remote-tracking branch 'origin/SerainaSpiellogik' into SerainaSpiellogik Alexander Sazonov 2022-04-09 23:36:01 +02:00
  • 52a7d2c788 Completed NoiseHandler and connected it to VoteHandler Alexander Sazonov 2022-04-09 23:35:16 +02:00
  • 362b965742 Added a thread to voteGetter so it would interfere with Pinger. Added to do for jonas Seraina 2022-04-09 23:10:11 +02:00
  • 159310c7ca Created new methods in ClientHandler for the start of a game and for incoming Vote Seraina 2022-04-09 22:04:00 +02:00
  • fcd93c4d58 Outsourced all messages sent by votehandler and noisehandler to ClientGameInfoHandler Seraina 2022-04-09 19:03:47 +02:00
  • ac80a88b98 Did some cleanup with the loggers, only set vital information at info level Seraina 2022-04-09 18:35:13 +02:00
  • d3a0c00dea Found the annoying issue, had to change run() to start() now it kinda works Seraina 2022-04-09 17:55:27 +02:00
  • 1de2e739de Moved all the fields in added in client handler into a separate class ClientVoteData cuz it didn't make sense there Seraina 2022-04-09 16:56:42 +02:00
  • 45597eee3c Had to change ClientHandler fields vote and hasVoted to arrays and had to make sure, the position of the Passenger is always sent along in protocol ($position$msg) Seraina 2022-04-09 16:11:30 +02:00
  • 46f75d3292 Made the whole thing a bit more orderly, added several loggers Seraina 2022-04-09 11:53:43 +02:00
  • d45d64a9c7 Removed interruption from pinger Seraina 2022-04-09 11:52:20 +02:00
  • 67cd93403a Tried adding smt to avoid being kicked off the Server Seraina 2022-04-09 09:11:51 +02:00
  • 96b0fa70ef Added getVoteFromClient method to superclass Passenger so when NPC vote, nothing happens when this method is called Seraina 2022-04-09 08:45:57 +02:00
  • 09024dbfad Parser sets the clientHandler fields vote and hasVoted after a vote from a client has come in Seraina 2022-04-09 08:38:59 +02:00
  • 370e1e97fe Added vote and hasVoted fields to ClientHandler for later transmission to corresponding Passenger Seraina 2022-04-09 08:22:28 +02:00
  • d373242486 Started communication between voteHandler and user - implemented a new method in client, that collects votes - started ading parser entries - added timer to votehandler(20 s) Seraina 2022-04-09 00:13:34 +02:00
  • 316619d067 added a forgotten parameter Seraina 2022-04-08 23:24:24 +02:00
  • ce3fa4dde1 A very basic command now starts a game in the JServerProtocolParser (needs to bee relocated and but does the job for now) The game runs, now the Clients need to be able to give inputs (so it ends at some point) Seraina 2022-04-08 23:23:31 +02:00
  • 3b0bc40ad0 Tried implementing a simple command for server that starts up a game, didn't work so I had to readjust some things Seraina 2022-04-08 22:23:00 +02:00
  • 5b4a06dd75 Implemented a run method in game, that goes through a game until it ends Seraina 2022-04-08 21:00:57 +02:00
  • f878bee40d added return for humanvote to know when the game ends Seraina 2022-04-08 20:52:36 +02:00
  • b297c9edda Implemented the GhostNPC vote and noise functions had to add Game game as a parameter in a couple of constructors, so everybody can always access the current game and its gamestate Seraina 2022-04-08 20:00:00 +02:00
  • 7df07b490a Getting fuzzyyy. Added LLIST server response. cannot continue. Sebastian Lenzlinger 2022-04-08 19:47:27 +02:00
  • e9cade1528 listAllLobbiesToClient still does not work properly: TODO added. Sebastian Lenzlinger 2022-04-08 19:30:50 +02:00
  • da5189311e Changed functionality of listAllLobbiesToClient(): Now it writes to the OutPutStream itself instead of sending a CHATM to client. Hope is that the JClientParser only has to parse once. Sebastian Lenzlinger 2022-04-08 19:28:01 +02:00
  • e23a749f55 Changed the way LISTL was implemented since it caused problems for the parser of the client. Sebastian Lenzlinger 2022-04-08 19:12:02 +02:00
  • a10ea16d35 Added some Documenting. Added some fields to ClientAttributes.java that might be useful in case we need this class. Sebastian Lenzlinger 2022-04-08 18:55:21 +02:00
  • d8692152b4 If a client connection is closed the ClientHandleris now removed from the set of all clients on the server and from any lobby he was in. Sebastian Lenzlinger 2022-04-08 18:38:59 +02:00
  • 9583cd56e1 added all necessary documentation to Protocol.java Jonas 2022-04-08 18:02:23 +02:00
  • b55494c106 Added ClientAttributes.java for possible future use. Sebastian Lenzlinger 2022-04-08 17:58:12 +02:00
  • 24dceee1d8 Added method to remove disconnected client from central data. client handler uses it. Sebastian Lenzlinger 2022-04-08 17:50:49 +02:00
  • 709e5323e8 actually call method when LISTL is recieved. Sebastian Lenzlinger 2022-04-08 17:24:20 +02:00
  • 6297439c3c finnished listAllLobbiesToClient() Sebastian Lenzlinger 2022-04-08 17:21:13 +02:00
  • 922561d522 added getIdAndAdminForList() method in Lobby to facilitate sending a list of lobbies to a client Sebastian Lenzlinger 2022-04-08 17:09:17 +02:00
  • f910775f96 listAllLobbies() method started Sebastian Lenzlinger 2022-04-08 16:59:48 +02:00
  • 372a02a093 synchronized addPlayer() in Lobby.addPlayer Sebastian Lenzlinger 2022-04-08 16:54:57 +02:00
  • 37a8caa64d Imlemented creating a lobby in the ClientHandler. Added getLobbyID() method to Lobby.java Sebastian Lenzlinger 2022-04-08 16:50:26 +02:00
  • 8ea39356f2 synchronized adding to shared resources Sebastian Lenzlinger 2022-04-08 16:42:04 +02:00
  • b0ebbc9c77 Extending CentralServerData to enable lobby creation and joining Sebastian Lenzlinger 2022-04-08 16:34:25 +02:00
  • 4557b4801b Client chatListener now throws an IO exception of the chatMSg from the server is null. Sebastian Lenzlinger 2022-04-08 16:15:04 +02:00
  • 968cb94f21 Now the client disconnects if: 1. no pingback recieved 2. isConnected has already been set to false In this case it looks to be a case where the client isn't responding correctly and the server may close the connection. Added a debog log statement at the respective place. Sebastian Lenzlinger 2022-04-08 16:12:19 +02:00
  • f57889431d minor change to addPlayer() method Sebastian Lenzlinger 2022-04-08 15:45:35 +02:00
  • 9e112b493a Test commit zum schauen ob meine Commits wieder richtig zugeordnet werden. Sebastian Lenzlinger 2022-04-08 15:37:08 +02:00
  • e86a09e9a8 Completed "else{}" part in addPlayer() method. If the lobby is full a msg is sent to client stating to join a different lobby a creat a new game. Added todo about the servers response. sebaschi 2022-04-08 15:14:15 +02:00
  • 15730ef39c Diary update von Sebastian. sebaschi 2022-04-08 15:03:48 +02:00
  • 15d6474765 ""/l" command added to MessageFormatter.java to represent LISTL protocol command. sebaschi 2022-04-08 14:57:56 +02:00
  • 13ac486624 Added TODO in Protocol.java: Add the servers reaction to LISTL sebaschi 2022-04-08 14:53:52 +02:00
  • 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. sebaschi 2022-04-08 14:51:31 +02:00
  • ae61da0607 LISTL command added to Protocol.txt. LISTL shall list all lobbies. sebaschi 2022-04-08 14:43:45 +02:00
  • 79ddbaf416 Added link referenc in documentation from JServerProtocolParserto Clienthandler. Added LoginClient class for possible implementation of a login sequence. sebaschi 2022-04-08 14:37:30 +02:00
  • 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. sebaschi 2022-04-08 14:16:40 +02:00
  • e2a400d0ca added CRTGM command to Protocol.java. and respective todos. sebaschi 2022-04-08 14:03:40 +02:00
  • 0e8750c985 Updated diary.txt for Sebastian 8.4.22. Started to handle case in Lobby if lobby is full. sebaschi 2022-04-08 13:34:30 +02:00
  • 22d356e361 Merge branch 'master' of ssh://git.scicore.unibas.ch:2222/cs108-fs22/Gruppe-8 sebaschi 2022-04-08 13:05:44 +02:00
  • c3096d7088 Merge remote-tracking branch 'origin/master' Jonas 2022-04-08 13:03:41 +02:00
  • e348840169 protocol is now fully in the protocol.java class Jonas 2022-04-08 13:03:32 +02:00
  • ea0c0d1b3b Merge remote-tracking branch 'origin/master' Seraina 2022-04-08 13:01:10 +02:00