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
Jonas
96812a04ae
High score fully implemented.
2022-04-28 15:29:36 +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
Sebastian Lenzlinger
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
Jonas
5fbee579a9
made OgGhostHighScore.java, see documentation for details
2022-04-28 13:35:48 +02:00
Alexander Sazonov
b94c1ab3f4
Merge remote-tracking branch 'origin/master'
2022-04-28 13:30:05 +02:00
Alexander Sazonov
93b6bab957
Finished first functioning and successful unit test (tests noise handling)
2022-04-28 13:25:03 +02:00
Sebastian Lenzlinger
2bc79b53a7
Adding Wrapper Classes for Controlls and corresponding EventHandlers. added different fxml views.
2022-04-28 12:04:08 +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
Sebastian Lenzlinger
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
Jonas
a7cf0959f9
uploaded day sprites
2022-04-27 14:58:03 +02:00
Jonas
70d4c61b54
night sprites
2022-04-27 13:32:37 +02:00
Jonas
03669ac6d5
Uploaded night wheels sprites
2022-04-27 13:17:22 +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
Sebastian Lenzlinger
cee9f136c6
Merge remote-tracking branch 'origin/master'
2022-04-21 08:22:12 +02:00
Sebastian Lenzlinger
73df828aa2
changed vote wait times to 10 seconds
2022-04-21 08:22:02 +02:00
Alexander Sazonov
32bce6f2c7
Fixed newly emerged noise handling issue: now NPC's can send chat messages again
2022-04-20 18:32:53 +02:00
Jonas
743ac7b1c4
Uploaded Presentation
2022-04-20 16:43:51 +02:00
Alexander Sazonov
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
Jonas
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
Jonas
1247bc2035
closing lobby during game adds game to finished games list.
2022-04-18 22:39:10 +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
Jonas
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
Seraina
a6fac4c1b3
increased vote time to 60 seconds
2022-04-18 17:01:22 +02:00
Sebastian Lenzlinger
e9a4a61737
Reformatted to googlestyle and now gui colorcodes if you whisper and differentiates for all
2022-04-18 15:27:27 +02:00
Sebastian Lenzlinger
8926eaa8f8
CHATA now doesn't send chatmsg to sender gui
2022-04-18 15:01:03 +02:00
Sebastian Lenzlinger
5e50905f81
msg wont be sent to self from server now even when not in lobby
2022-04-18 14:49:37 +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
Jonas
40c528612b
Merge remote-tracking branch 'origin/master'
2022-04-17 21:13:10 +02:00
Jonas
b717a73a38
Added human-readable protocol.
2022-04-17 21:12:22 +02:00
Seraina
08f9f44fab
Added javadoc statements to loads of methods where there was a warning
2022-04-17 20:41:31 +02:00
Jonas
bf31670ec1
tried to implement build-cs108 task
2022-04-17 20:07:15 +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
Sebastian Lenzlinger
ce4d84c9d7
Server shouldn't be sending chat messages back to the sender now
2022-04-17 16:31:43 +02:00
Sebastian Lenzlinger
ef8111553e
whisper chat messages now have a different background color than normal messages
2022-04-17 16:28:10 +02:00
Sebastian Lenzlinger
61697d7597
whisper is functional in with gui. decode whisper msg added to client handler and used in JServerProtcolParser now to correctly decode the messages
2022-04-17 15:38:40 +02: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
Sebastian Lenzlinger
74fdca0efd
added whisper functionality for whisper in ClientHandler and Gui and deleted old recources that aren't needed.
2022-04-17 15:06:24 +02:00
