460f4fb9ea
Added two methods to ClientHandler that send messages to multiple lobbies, this is needed for the gui interaction with multiple clients
2022-04-30 14:36:47 +02:00
fb730006f8
Added some todo's to not lose the overview
2022-04-30 13:17:53 +02:00
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
1fd1cb6033
Added to unversioned files to git, that are relevant for functionality
2022-04-30 12:56:42 +02:00
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
d963c35965
Added ImageViews for noise Bell
2022-04-29 20:56:04 +02:00
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
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
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
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
384f2071d2
Merge remote-tracking branch 'origin/master'
2022-04-28 18:31:29 +02:00
49ee585e3e
Removed ghostVoteTimer from vote handler, so that the game works again
2022-04-28 18:30:57 +02:00
96812a04ae
High score fully implemented.
2022-04-28 15:29:36 +02:00
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
79f5cb407f
Started fleshing out the game GUI, with its controller and fxml
2022-04-28 13:45:26 +02:00
b769991c36
Minor Changes to ChatController adding a TODO and created a LobbyListItem class to represent members of the lobby list view, or at least the data therein.
2022-04-28 13:41:45 +02:00
5fbee579a9
made OgGhostHighScore.java, see documentation for details
2022-04-28 13:35:48 +02:00
b94c1ab3f4
Merge remote-tracking branch 'origin/master'
2022-04-28 13:30:05 +02:00
93b6bab957
Finished first functioning and successful unit test (tests noise handling)
2022-04-28 13:25:03 +02:00
2bc79b53a7
Adding Wrapper Classes for Controlls and corresponding EventHandlers. added different fxml views.
2022-04-28 12:04:08 +02:00
26dffdbbdc
Merge remote-tracking branch 'origin/master'
2022-04-28 10:50:04 +02:00
f5008ca1cc
Added GameController Skeleton for the control of the Game controls
2022-04-28 09:41:04 +02:00
3be5d7a3ae
Started to create the game View skeleton in scene builder
2022-04-28 08:36:22 +02:00
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
ee000c73fa
updated ChatView.fxml and it's corresponding controller to new design
...
added LobbyListView and corresponding controller class skeleton
2022-04-27 21:17:24 +02:00
a7cf0959f9
uploaded day sprites
2022-04-27 14:58:03 +02:00
70d4c61b54
night sprites
2022-04-27 13:32:37 +02:00
03669ac6d5
Uploaded night wheels sprites
2022-04-27 13:17:22 +02:00
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
cee9f136c6
Merge remote-tracking branch 'origin/master'
2022-04-21 08:22:12 +02:00
73df828aa2
changed vote wait times to 10 seconds
2022-04-21 08:22:02 +02:00
32bce6f2c7
Fixed newly emerged noise handling issue: now NPC's can send chat messages again
2022-04-20 18:32:53 +02:00
743ac7b1c4
Uploaded Presentation
2022-04-20 16:43:51 +02:00
bacae889f1
Changed noise handling: humans now get just one notification about having heard noises, even if multiple ghosts walked by
2022-04-18 23:27:19 +02:00
814eed9442
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Game.java
# src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java
2022-04-18 22:42:09 +02:00
1247bc2035
closing lobby during game adds game to finished games list.
2022-04-18 22:39:10 +02:00
95a18d3d5c
added a @code in doc so javadoc builds
2022-04-18 22:11:56 +02:00
55147ce1cf
went over all classes and added docs where is appropriate and needed
2022-04-18 21:57:33 +02:00
d25b6c405d
slashed ghostVote Time in half to 30 seconds
2022-04-18 21:12:12 +02:00
d78b08085a
Merge remote-tracking branch 'origin/master'
2022-04-18 21:07:38 +02:00
7106bf5588
Corrected some Comments
2022-04-18 21:06:30 +02:00
c89eb7c5de
Chat adjustments:
...
-Multiple lines are now cut off before sending, and are not printed to sender chat
-"something went wrong while whispering" is now printed to chat rather than console
-Chat message is sent to lobby rather than broadcast, from the start
-whispering person sees who they whisper to
2022-04-18 20:17:24 +02:00
a6fac4c1b3
increased vote time to 60 seconds
2022-04-18 17:01:22 +02:00
e9a4a61737
Reformatted to googlestyle and now gui colorcodes if you whisper and differentiates for all
2022-04-18 15:27:27 +02:00
8926eaa8f8
CHATA now doesn't send chatmsg to sender gui
2022-04-18 15:01:03 +02:00
5e50905f81
msg wont be sent to self from server now even when not in lobby
2022-04-18 14:49:37 +02:00
414da07a09
Merge remote-tracking branch 'origin/master'
2022-04-18 13:44:32 +02:00
1257d102b8
Handled NullPointerException in closeLobby
2022-04-18 13:43:57 +02:00
40c528612b
Merge remote-tracking branch 'origin/master'
2022-04-17 21:13:10 +02:00
b717a73a38
Added human-readable protocol.
2022-04-17 21:12:22 +02:00
Seraina