seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
407 Commits 1 Branch 0 Tags
Commit Graph

159 Commits

Author SHA1 Message Date
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
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
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
Sebastian Lenzlinger
6986a9906f deleted unused classes 2022-04-16 10:41:41 +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
Sebastian Lenzlinger
85fca301ff Merge remote-tracking branch 'origin/master' 2022-04-14 16:26:07 +02:00
Sebastian Lenzlinger
13e8002d79 Added GuiChat fxml file 2022-04-14 16:25:59 +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
Sebastian Lenzlinger
17783cb591 Merged Onto Master 2022-04-14 14:02:27 +02:00
Seraina
a0a82f8f8c Merge remote-tracking branch 'origin/master' 2022-04-14 13:28:59 +02:00
Jonas
004f70ba44 Implemented starting everything from NightTrainToBudapest class. 2022-04-14 13:19:23 +02:00
Sebastian Lenzlinger
5a36988cd2 Merge branch 'guiSeb' into 'master' 
Client GUI Application Elements, namely the Chat

See merge request cs108-fs22/Gruppe-8!3
 2022-04-14 10:53:46 +00: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
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
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
850e09e0af Integrated noise handling so it would run, some bugs still to work out 2022-04-13 11:43:35 +02:00
Sebastian Lenzlinger
a6d416e457 final tiny touch ups 2022-04-13 01:47:25 +02:00
Sebastian Lenzlinger
76e1ed3ff1 Added a missing return statement 2022-04-13 01:46:28 +02:00
Sebastian Lenzlinger
3e2288026b Further Building the scene 2022-04-13 01:45:32 +02:00