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
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
Sebastian Lenzlinger
7ba20a9f62
lamdas were a bad idea
2022-04-17 12:14:16 +02:00
Sebastian Lenzlinger
cb8dc1c56a
Revert "worked through a few warnings, changed a few anonymous classes to lambdas"
...
This reverts commit 660883f732495dbee294bbe436055dd0a49a3b57
2022-04-17 10:12:58 +00:00
Sebastian Lenzlinger
660883f732
worked through a few warnings, changed a few anonymous classes to lambdas
2022-04-17 11:35:16 +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
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
Sebastian Lenzlinger
f7324f2300
added needed javafx modules to build since I'm getting the following message at runtime:
...
"JavaFX runtime components are missing, and are required to run this application"
2022-04-16 17:06:27 +02:00
Sebastian Lenzlinger
0270202c3f
Extending functionality to connect the incoming msgs to the gui via buffered readers.
2022-04-16 16:05:21 +02:00
Sebastian Lenzlinger
504aa9aef2
Commit to make sure everything is here as I accidentally deleted large portions of my local code.
2022-04-16 14:28:02 +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
Jonas
2f34de0136
Merge remote-tracking branch 'origin/master'
2022-04-16 12:45:36 +02:00
Jonas
b454cbee96
implemented Lobby.gameIsRunning, Lobby.getLobbyIsOpen updates on method call and considers both the number of players in the lobby as well as whether a game has already started in that lobby.
2022-04-16 12:45:24 +02:00
Sebastian Lenzlinger
3880b3f14f
ChatController fields slowly all initialized.
2022-04-16 12:41:14 +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
Sebastian Lenzlinger
b30f44df6c
Added ChatApp class, ChatController class and the fxml representing the view of the chat gui.
2022-04-16 10:49:40 +02:00
