seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
395 Commits 1 Branch 0 Tags
dad2cf1cd884608e7c50deaa0b2d4c62e34a37a3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 4899f06f73 Merge remote-tracking branch 'origin/master' 2022-04-16 23:29:10 +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
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
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
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
Seraina 5b0004f8ff Games have names now 2022-04-15 16:40:26 +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
Seraina a0a82f8f8c Merge remote-tracking branch 'origin/master' 2022-04-14 13:28:59 +02: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 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
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
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
Seraina ea0c0d1b3b Merge remote-tracking branch 'origin/master' 2022-04-08 13:01:10 +02:00
Seraina dffd1731e2 Added Doc for print Method 2022-04-08 13:00:47 +02:00
Seraina Schöb f858c734f7 Update Diary.txt 2022-04-08 10:58:17 +00:00
Seraina f729a62289 Merge remote-tracking branch 'origin/master' 2022-04-08 12:46:18 +02:00
Seraina c134de8bba Removed static from Methods 2022-04-08 12:45:57 +02:00
Seraina 33d8f779a2 Merge remote-tracking branch 'origin/master' 2022-04-08 12:42:25 +02:00
Seraina 4337583de6 Fixed some bugs now the VoteHanlder does what it is supposed to 2022-04-08 12:42:02 +02:00
Seraina f224324fb5 Merge remote-tracking branch 'origin/master' 2022-04-08 11:14:37 +02:00
Seraina d83248d89f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java
 2022-04-08 11:12:07 +02:00
Seraina 913d0781de Added adjustments for the testing of voteHandler 
- main methode
- a print methode, that prints out a Passenger array
 2022-04-08 11:10:05 +02:00
Seraina efdd1167d2 Adjusted Passenger class for testing of VoteHandler 2022-04-08 10:27:19 +02:00
Seraina 7a89bb98b6 Merge remote-tracking branch 'origin/master' 2022-04-07 13:24:29 +02:00
Seraina 7153563471 Started building connection between game logic and sever-client. Added new Protocol msg and a s*** ton of todos for myself 2022-04-07 13:24:09 +02:00
Seraina Schöb 1dbfac1f3f Update Diary.txt 2022-04-07 09:33:15 +00:00
Seraina b5682d5531 Removed unused methods in game functions 2022-04-07 11:01:59 +02:00
Seraina 62a909444e Fixed some typos and inconsistencies in QA-Concept 2022-04-04 14:14:17 +02:00
Seraina b255582aea Merge remote-tracking branch 'origin/master' 2022-04-04 13:50:26 +02:00
Seraina 19c31356c2 Some changes to Structure of VoteHandler and related classes 2022-04-04 13:48:45 +02:00
Seraina 2ad0b03cd5 Merged my changes with Alexs changes in VoteHandler 2022-04-04 13:07:24 +02:00
Seraina 32c9c8e870 Added TODo for Alex: Documentation 2022-04-04 12:46:07 +02:00
Seraina 6b55ed8756 Did first metric measurement and added plots to the QA Concept 2022-04-03 17:34:28 +02:00
Seraina da65665ab3 Fleshed out the QA Draft into a Concept, needs revision 2022-04-03 14:43:04 +02:00
Seraina 401b3bec52 Added Handler skeletons concerning game logic and instructions on how to implement them 2022-04-01 12:20:08 +02:00
Seraina 3151cd4c51 Moved klassenstruktur into gamelogic 2022-04-01 11:09:36 +02:00
Seraina 733961292f Changed package name spiellogikentwurft to gamelogic 2022-04-01 11:06:05 +02:00
Seraina 4d8f438462 Removed ominous all black imgaes 2022-04-01 10:31:30 +02:00
Seraina c5f7bbbf6f Removed excessive doc from build.gradle, updated libraries to the newest standard 2022-03-31 18:26:55 +02:00
Seraina 7ef0f27ec0 Repo spring-cleaning: 
- Moved Contributers file
- removed Übungs directory, no need anymore
 2022-03-31 18:10:14 +02:00
Seraina d2af77a1a3 Added our names to README 2022-03-31 18:06:49 +02:00
Seraina 5af40283e9 Repo spring-cleaning: 
- Removed Buda Server Client Stuff, not needed anymore
 2022-03-31 17:53:30 +02:00
Seraina abbf220a71 Repo spring-cleaning: 
- changed all package names to lowercase
 2022-03-31 13:53:22 +02:00
Seraina ccff94b70a Repo spring-cleaning: 
- changed all package names to lowercase
 2022-03-31 13:50:32 +02:00
Seraina 9b0e751c18 Started Repo spring-cleaning: 
- added config directory for all configuration files
- removed jars
- Moved some files to more sensibel spots
 2022-03-31 13:42:58 +02:00
Seraina 4f44ab2f3b Added a logger instance LOGGER to all classes 2022-03-31 13:40:55 +02:00
Seraina a9b75c95ea Set RootLogger level to Trace so all Logger messages are shown 2022-03-31 13:16:57 +02:00
Seraina e5a64ce0c3 Added Spiellogikentwurf package from LoggingExp branch 2022-03-31 13:12:52 +02:00
Seraina af3e1928be Trying to merge Logging Experiment into master 2022-03-31 12:59:12 +02:00
Seraina 25690c14f4 Creates a Class that lets us configure the RootLogger for everything (BudaLogConfig) 2022-03-31 12:42:21 +02:00
Seraina 1ca99e5fe8 Merge remote-tracking branch 'origin/master' 2022-03-28 00:03:07 +02:00
Seraina 6b69cb8649 Created runnable jars 2022-03-28 00:02:39 +02:00
Seraina 0370bf30b8 Documented everything I could and tried unifying format 2022-03-27 23:18:45 +02:00
Seraina c87d894e10 Documented everything I could and tried unifying format 2022-03-27 22:43:35 +02:00
Seraina 6cf98643d1 Added Diary entry 2022-03-27 22:19:20 +02:00
Seraina Schöb 44893525fd Merge branch 'Jonas_Stuff' into 'master' 
Added a Class and Method that can reformat the terminal commands into commands...

See merge request cs108-fs22/Gruppe-8!1
 2022-03-27 19:43:54 +00:00
Seraina 2d71bbbc1c Merging Jonas-Stuff onto master 2022-03-27 21:40:17 +02:00
Seraina 055b5cbfb1 Deleted "example" Directory from this branch 2022-03-27 21:27:15 +02:00
Seraina 71d5843129 Deleted "Spiellogik" from this branch (still on the Logger branch) 2022-03-27 21:25:13 +02:00
Seraina 55a5fe50b7 Merge remote-tracking branch 'origin/Jonas_Stuff' into Jonas_Stuff 2022-03-27 17:49:52 +02:00