seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
478 Commits 1 Branch 0 Tags
a6e412f5525c49c377ddb0d2aa09689d20267fb1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Seraina a6e412f552 Wrapped printToGUI method contents in try-catch block, in case the fx components haven't been initialized yet 2022-04-30 13:16:05 +02:00
Seraina 1fd1cb6033 Added to unversioned files to git, that are relevant for functionality 2022-04-30 12:56:42 +02:00
Seraina 30aab3768d Implemented communication between Server and Client to display a notification if someone else heard a noise 2022-04-29 21:27:32 +02:00
Seraina d963c35965 Added ImageViews for noise Bell 2022-04-29 20:56:04 +02:00
Seraina c5293bc8ee Implemented the gameState Update parameter of the the printToGUI message in client, with its needed methods 2022-04-29 18:56:15 +02:00
Seraina f058eabb75 Cherry-picked my own commit from master, because I messed up the branch creation, recommitting it on this one 2022-04-29 17:13:15 +02:00
Seraina ba03095647 Added a PTGUI protocol message and class with all parameters for that message, to link gui to server 2022-04-29 17:07:40 +02:00
Seraina dd757b22f0 Added a PTGUI protocol message and class with all parameters for that message, to link gui to server 2022-04-29 16:48:02 +02:00
Seraina 384f2071d2 Merge remote-tracking branch 'origin/master' 2022-04-28 18:31:29 +02:00
Seraina 49ee585e3e Removed ghostVoteTimer from vote handler, so that the game works again 2022-04-28 18:30:57 +02:00
Seraina 8479479b49 Started adding a GameStateModel for the client to where primitive but needed data can be stored. 2022-04-28 13:46:28 +02:00
Seraina 79f5cb407f Started fleshing out the game GUI, with its controller and fxml 2022-04-28 13:45:26 +02:00
Seraina 26dffdbbdc Merge remote-tracking branch 'origin/master' 2022-04-28 10:50:04 +02:00
Seraina f5008ca1cc Added GameController Skeleton for the control of the Game controls 2022-04-28 09:41:04 +02:00
Seraina 3be5d7a3ae Started to create the game View skeleton in scene builder 2022-04-28 08:36:22 +02:00
Seraina 39d0b76f69 Started to make the vote time dynamic by adding a Timer class and adjusting some of the others. Doesn't work properly yet, though 2022-04-28 08:34:32 +02:00
Seraina f37597a5cd added a method to find all ghosts currently seated in the train and added repo structure for tests as well as an empty test class 2022-04-22 16:34:48 +02:00
Seraina 2926967da0 removed jar for presentation demo again, to declutter the repo 2022-04-22 15:59:33 +02:00
Seraina 47f808bcab Merge remote-tracking branch 'origin/master' 2022-04-20 13:16:28 +02:00
Seraina d710d8bf71 added jar for presentation demo 2022-04-20 13:16:10 +02:00
Seraina 82c561bcb3 copied the protocol just to be sure 2022-04-18 22:14:39 +02:00
Seraina 95a18d3d5c added a @code in doc so javadoc builds 2022-04-18 22:11:56 +02:00
Seraina 55147ce1cf went over all classes and added docs where is appropriate and needed 2022-04-18 21:57:33 +02:00
Seraina d25b6c405d slashed ghostVote Time in half to 30 seconds 2022-04-18 21:12:12 +02:00
Seraina d78b08085a Merge remote-tracking branch 'origin/master' 2022-04-18 21:07:38 +02:00
Seraina 7106bf5588 Corrected some Comments 2022-04-18 21:06:30 +02:00
Seraina a66345259a Updated Diary 2022-04-18 21:05:49 +02:00
Seraina a6fac4c1b3 increased vote time to 60 seconds 2022-04-18 17:01:22 +02:00
Seraina c3aef4dd54 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	build.gradle
 2022-04-18 16:25:37 +02:00
Seraina b2823fc01a added custom task that builds jar and javadoc 2022-04-18 16:24:43 +02:00
Seraina df3964a9fa Merge remote-tracking branch 'origin/master' 2022-04-18 15:23:52 +02:00
Seraina 4ba62ec622 added encoding utf-8 2022-04-18 15:23:23 +02:00
Seraina 1943e8c86b added own task 2022-04-18 14:26:10 +02:00
Seraina 414da07a09 Merge remote-tracking branch 'origin/master' 2022-04-18 13:44:32 +02:00
Seraina 1257d102b8 Handled NullPointerException in closeLobby 2022-04-18 13:43:57 +02:00
Seraina 08f9f44fab Added javadoc statements to loads of methods where there was a warning 2022-04-17 20:41:31 +02:00
Seraina cee7196566 Aaaaaaand another typo 2022-04-17 19:30:16 +02:00
Seraina 7509b943bc Fixed Typo in QA-Concept 2022-04-17 19:27:58 +02:00
Seraina 8fb4ae1534 Finalized QA-Concept and added all Plots from measurement to a separate QA-Folder 2022-04-17 19:11:54 +02:00
Seraina bc77f5dad2 Ensured Client username updating in ClientModle for ui 2022-04-17 17:22:15 +02:00
Seraina 8c9d40a6d8 Changed default cmd to CHATA 2022-04-17 17:21:11 +02:00
Seraina Schöb 764c06f26b Merge branch 'SerainaGui' into 'master' 
Debugged the UI now its working

See merge request cs108-fs22/Gruppe-8!6
 2022-04-17 15:15:40 +00:00
Seraina dad2cf1cd8 Merge remote-tracking branch 'origin/SerainaGui' into SerainaGui 2022-04-17 15:11:28 +02:00
Seraina 6ebc4495e7 Added a networking process that updates the username in the ChatController of the ClientModel 2022-04-17 15:11:01 +02:00
Seraina 28b0c08ddb Added ChatController to the running application 2022-04-17 14:33:55 +02:00
Seraina edf5c65da2 Added static field to ChatApp and set it to the current application in the start() 2022-04-17 14:05:38 +02:00
Seraina 4bd9038146 Removed root from fxlm file, added constructor with no parameters to ChatController-> for some reason this gets called 
now the window pops up, but it cant communicate
 2022-04-17 10:55:58 +02:00
Seraina 4899f06f73 Merge remote-tracking branch 'origin/master' 2022-04-16 23:29:10 +02:00
Seraina 8e12e6e662 Some minor adjustments that localize the problem of GUI in fxlm file itself (root not correctly set?) I moved the fxml file to a spot, where gradle expects it 2022-04-16 23:28:52 +02:00
Seraina 88f72d7612 Added a way to end a game, when its lobby is closed. 2022-04-16 21:34:36 +02:00
Seraina 8e434e3e14 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Lobby.java
 2022-04-16 13:15:28 +02:00
Seraina b76d57a407 Worked on game logic: 
- Spectators now get all information
- votes for kicked off people don't count
 2022-04-16 13:13:20 +02:00
Seraina 22715e038d Worked on game logic: 
-Ensured that votes of kicked off people don't count
- Ensured that kicked off people don't get reentered in the game via gostification
- fleshed out the Spectator class a litte
 2022-04-16 12:06:58 +02:00
Seraina d389a8fbb0 Removed some ToDos that are done and started creating a Spectator class and I'm in the process of ensuring only non kicked off passengers vote 2022-04-15 23:22:38 +02:00
Seraina 82a4e42b3c OG Ghost position is now truly randomized 2022-04-15 19:38:42 +02:00
Seraina 853f33479f Added class names manually to all LogManager.getLogger(ClassName.class) instances 
Now Jar is runnable
 2022-04-15 19:10:28 +02:00
Seraina 7c70b276cd /z now lists all games opened and closed 
also fixed two bugs in VoteHandler (Array out of Bound in GhostNPC and in ClientVoteData)
 2022-04-15 18:47:05 +02:00
Seraina 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
 2022-04-15 17:24:51 +02:00
Seraina 5b0004f8ff Games have names now 2022-04-15 16:40:26 +02:00
Seraina 2f79b41618 Avoided null pointer exception by adding an if statement 2022-04-14 15:05:00 +02:00
Seraina b37916134a Merge remote-tracking branch 'origin/master' 2022-04-14 14:57:17 +02:00
Seraina 44a534bafa Game can now handle a name change and an exit by a client 2022-04-14 14:56:25 +02:00
Seraina a0a82f8f8c Merge remote-tracking branch 'origin/master' 2022-04-14 13:28:59 +02:00
Seraina 0dbc3093e2 New game started from outside of lobby has been handled 2022-04-14 12:20:04 +02:00
Seraina 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
 2022-04-14 11:59:28 +02:00
Seraina 682b2634fc Fixed an error in Game (other method name) 2022-04-14 09:42:58 +02:00
Seraina d98ee434c8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java
 2022-04-14 08:36:01 +02:00
Seraina b8c970801c Merge branch 'SerainaSpiellogik' 2022-04-14 08:17:36 +02:00
Seraina 9299027bcd Had to redo the voteGetter: now it is handled via userInputListener and messageFormatter 2022-04-13 18:56:48 +02:00
Seraina bc136d7b68 Fixed some bugs with the noise handeling, seems not work now 
Still need to handle connection loss and name-change in gamelogic
 2022-04-13 12:57:49 +02:00
Seraina fc250da14b Merge remote-tracking branch 'origin/SerainaSpiellogik' into SerainaSpiellogik 2022-04-13 11:44:00 +02:00
Seraina 850e09e0af Integrated noise handling so it would run, some bugs still to work out 2022-04-13 11:43:35 +02:00
Seraina 062304719f Merge remote-tracking branch 'origin/SerainaSpiellogik' into SerainaSpiellogik 2022-04-09 23:40:33 +02:00
Seraina 0710703f77 Extended Doc in all classes I did smt in to hopefully make it understandable 2022-04-09 23:39:38 +02:00
Seraina 362b965742 Added a thread to voteGetter so it would interfere with Pinger. Added to do for jonas 2022-04-09 23:10:11 +02:00
Seraina 159310c7ca Created new methods in ClientHandler for the start of a game and for incoming Vote 2022-04-09 22:04:00 +02:00
Seraina fcd93c4d58 Outsourced all messages sent by votehandler and noisehandler to ClientGameInfoHandler 2022-04-09 19:03:47 +02:00
Seraina ac80a88b98 Did some cleanup with the loggers, only set vital information at info level 2022-04-09 18:35:13 +02:00
Seraina d3a0c00dea Found the annoying issue, had to change run() to start() now it kinda works 2022-04-09 17:55:27 +02:00
Seraina 1de2e739de Moved all the fields in added in client handler into a separate class ClientVoteData cuz it didn't make sense there 2022-04-09 16:56:42 +02:00
Seraina 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) 2022-04-09 16:11:30 +02:00
Seraina 46f75d3292 Made the whole thing a bit more orderly, added several loggers 2022-04-09 11:53:43 +02:00
Seraina d45d64a9c7 Removed interruption from pinger 2022-04-09 11:52:20 +02:00
Seraina 67cd93403a Tried adding smt to avoid being kicked off the Server 2022-04-09 09:11:51 +02:00
Seraina 96b0fa70ef Added getVoteFromClient method to superclass Passenger so when NPC vote, nothing happens when this method is called 2022-04-09 08:45:57 +02:00
Seraina 09024dbfad Parser sets the clientHandler fields vote and hasVoted after a vote from a client has come in 2022-04-09 08:38:59 +02:00
Seraina 370e1e97fe Added vote and hasVoted fields to ClientHandler for later transmission to corresponding Passenger 2022-04-09 08:22:28 +02:00
Seraina 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)
 2022-04-09 00:13:34 +02:00
Seraina 316619d067 added a forgotten parameter 2022-04-08 23:24:24 +02:00
Seraina 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)
 2022-04-08 23:23:31 +02:00
Seraina 3b0bc40ad0 Tried implementing a simple command for server that starts up a game, didn't work so I had to readjust some things 2022-04-08 22:23:00 +02:00
Seraina 5b4a06dd75 Implemented a run method in game, that goes through a game until it ends 2022-04-08 21:00:57 +02:00
Seraina f878bee40d added return for humanvote to know when the game ends 2022-04-08 20:52:36 +02:00
Seraina 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
 2022-04-08 20:00:00 +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
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
Seraina 33d8f779a2 Merge remote-tracking branch 'origin/master' 2022-04-08 12:42:25 +02:00