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
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
Sebastian Lenzlinger
e4f9776f7f
Slowly building the SceneGraph from the bottom.
...
Created a abstract class that imlements the Toggle interface for toggling between who one wants to chat.
2022-04-13 01:07:49 +02:00
Sebastian Lenzlinger
68248c7175
(noch sehr kurzer) Dairy Update
2022-04-12 23:50:30 +02:00
Sebastian Lenzlinger
ca1256f01f
Created Classes and Interfaces. Trying to adhere to the MVC pattern
2022-04-12 23:46:38 +02:00
Jonas
503808941b
Deleted unused classes, implemented whisper chat, other small fixes & adjustments.
2022-04-12 22:16:34 +02:00
Jonas
8aad32bd2d
Several small adjustments. Nothing major, pushing so i can continue coding on other PC
2022-04-12 20:04:23 +02:00
Jonas
920ea3fba9
Implemented broadcast to all clients across lobbies (/b), other small changes to chat & leaving lobbies:
...
-bugfix for LEAVL
-/c now defaults to message within lobby
-broadcast chat to lobby when called by someone outside lobby just broadcasts to all clients not in lobbies
2022-04-12 11:38:40 +02:00
Jonas
01b08e41b8
Implemented (almost) all required Lobby functionality. Also added Client_01 and CLient_02 for testing inside intelliJ
2022-04-11 23:05:39 +02:00
Jonas
33cbb4e57d
Client Login into Lobby as well as creating a lobby now works and client can only be in one lobby at the same time.
2022-04-11 18:08:39 +02:00
Jonas
42e2720016
Merge remote-tracking branch 'origin/master' into buddaLobbySebastian
...
# Conflicts:
# src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java
2022-04-11 16:19:58 +02:00
Jonas
240a44d1c3
Several small adjustments to lobby structure
2022-04-11 16:17:35 +02:00
Alexander Sazonov
087250b9f5
Packed duplicated code fragments into a method (in VoteHandler)
2022-04-11 13:56:15 +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
Alexander Sazonov
1db4042bc7
Merge remote-tracking branch 'origin/SerainaSpiellogik' into SerainaSpiellogik
2022-04-09 23:36:01 +02:00
Alexander Sazonov
52a7d2c788
Completed NoiseHandler and connected it to VoteHandler
2022-04-09 23:35:16 +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
Sebastian Lenzlinger
7df07b490a
Getting fuzzyyy. Added LLIST server response. cannot continue.
2022-04-08 19:47:27 +02:00
Sebastian Lenzlinger
e9cade1528
listAllLobbiesToClient still does not work properly: TODO added.
2022-04-08 19:30:50 +02:00
Sebastian Lenzlinger
da5189311e
Changed functionality of listAllLobbiesToClient():
...
Now it writes to the OutPutStream itself instead of sending a CHATM to client. Hope is that the JClientParser only has to parse once.
2022-04-08 19:28:01 +02:00
