seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
637 Commits 1 Branch 0 Tags
b3e520a2c3cb1293d2de8a4718c0c88904696798
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Seraina b3e520a2c3 Changed some layouts, wasted a lot of time and made sure the LobbyDisplayHandler-Updater can only have one thread at a time that is writing to the same data 2022-05-17 16:50:47 +02:00
Seraina 3b5b2da60e Changed some layouts, wasted a lot of time and made sure the LobbyDisplayHandler-Updater can only have one thread at a time that is writing to the same data 2022-05-17 16:49:35 +02:00
Seraina 43aab6c282 Started to redesign the gui layout a little, so it isn't all over the place 2022-05-17 11:47:33 +02:00
Seraina d5d58ac862 Started to redesign the gui layout a little, so it isn't all over the place 2022-05-17 11:47:12 +02:00
Seraina 02012f316d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	OgGhostWinners.txt
 2022-05-17 11:45:56 +02:00
Seraina d9cb56403b Removed all references to LobbyListView I could find, also removed the Players TextFlow, that is not needeed anymore 2022-05-16 22:03:14 +02:00
Seraina e2bae5383b Merge remote-tracking branch 'origin/master' 2022-05-16 21:41:31 +02:00
Seraina 216c9004e7 Removed more referencec to ListView and added some threads in the hope of making the gameplay smoother 2022-05-16 21:41:16 +02:00
Seraina f0566cbf37 Started removing all references to old lobbyList handeling via listView 2022-05-16 19:53:26 +02:00
Seraina ec661365bd Made sure the start button only has functionality when in a lobby 2022-05-16 19:47:01 +02:00
Seraina 126a2c21d3 Made sure the start button only has functionality when in a lobby 2022-05-16 19:46:00 +02:00
Seraina d383ef1267 Build a new construct for the LobbyLists from scratch. now it is based on a tree view and constantly updated by the server 2022-05-16 15:57:30 +02:00
Seraina cd60cf9144 Added the background crop and hopefully fixed the og starting bug (wagon is shown) 2022-05-15 18:47:30 +02:00
Seraina 1b2d4b3e16 Some design tweaks mainly of the chat 2022-05-15 13:04:48 +02:00
Seraina b67dbd684b Started designing the GUI some more with custom backgrounds ect. 2022-05-15 12:00:55 +02:00
Seraina b49bd2e9f3 Some minor tweaks on the role change in the Room image displays 2022-05-15 09:37:05 +02:00
Seraina da2e4049ff Changed GameView and TrainAnimationViewDay so that the Game doesn't display the rooms, that way I could change the lobby into its boarderpane layout again and just add the gameview to the very front 2022-05-15 09:21:57 +02:00
Seraina 0e6be2ee29 Added foreground Animation by just extending the BGAnimation 2022-05-15 08:27:34 +02:00
Seraina 2393fb68fe Merge remote-tracking branch 'origin/master' 2022-05-14 17:21:47 +02:00
Seraina b9a59de09a Finally the fullWagon appears and disappears how it should (only at the very beginning there is still a lag, but i am on it) 2022-05-14 17:21:23 +02:00
Seraina d87dd237f7 Keep finding some bugs, keep fixing them: Some wierd messages were sent from VoteHandler 2022-05-14 16:23:35 +02:00
Seraina 84ed547372 Fixed some quirks with the YourRole checking, now the full Wagon should appear at the right time 2022-05-14 15:23:49 +02:00
Seraina c3683a1083 Merge remote-tracking branch 'origin/master' 2022-05-14 14:28:57 +02:00
Seraina 81ce75c7c9 Smoothed out the view changes from day to night 2022-05-14 14:27:37 +02:00
Seraina c6f82fd7c1 Implemented a Thread that listens for changes in day/night in gameStateModel to simplify and reduce the tasks of client thread 2022-05-14 13:28:42 +02:00
Seraina 277eada934 Implemented the updating off all sprites depending on night/day and role 2022-05-14 12:46:07 +02:00
Seraina fa6ca7371e Merge remote-tracking branch 'origin/master' 2022-05-14 12:21:45 +02:00
Seraina c1a9c9e742 Changed cycle lenght of BellAnimation to 566.66 2022-05-14 12:21:05 +02:00
Seraina 119a456968 Started implementing the changes of the images depending on day night and role 2022-05-14 12:03:10 +02:00
Seraina 76ab7535b5 Moved all Sprites into 3 classes,where their initialization and change is handled 2022-05-14 12:00:32 +02:00
Seraina 778a5f224d Had to remove BoarderPane from LoungeSceneView, because i did not manage to make it not interfere with gameplay in the background 
Also did some css Styling work, all of it experimental
 2022-05-14 09:01:45 +02:00
Seraina f279298af1 The bell animation now is smooth 2022-05-13 17:15:09 +02:00
Seraina 97b460d1d0 Merge remote-tracking branch 'origin/master' 2022-05-13 16:36:19 +02:00
Seraina cc0fd64c71 added Bell animation - makes the whole thing a bit laggy but is still wonderful! 2022-05-13 16:35:57 +02:00
Seraina 8ecfd8e5e1 found bug: Vote Buttons are now only visible if you can actually vote 2022-05-13 15:45:38 +02:00
Seraina 6f6cd28379 Made the start a Game Button visible 2022-05-13 15:18:23 +02:00
Seraina 1bf3b41cdc Merge remote-tracking branch 'origin/master' 2022-05-13 13:31:09 +02:00
Seraina e14eeda24a made sure that the chatView is visible again, there was a fx:id duplication 2022-05-13 13:30:20 +02:00
Seraina d71da4cf0c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
 2022-05-13 12:40:36 +02:00
Seraina 737520d5c7 animated background for the day 2022-05-13 12:37:15 +02:00
Seraina 4262fb64dd made buttons for voting only available when appropriate by chancing their visibility, the client always thinks its a human though, that needs fixing 2022-05-12 21:10:05 +02:00
Seraina 4079561f7e Added the gameView so to the TrainAnimationViewDay but the whole thing is currently in front of all the lobby elements, because the boarder pane is in the way TODO: find a way to make boarderPane truly transparent 2022-05-12 14:58:40 +02:00
Seraina 19ddf70e72 Now in the Game the vote Buttons are transparent and the Rooms move up and down when hovering over a room 2022-05-12 12:56:49 +02:00
Seraina 7968523469 Added the Train as a Background to LobbyView and animated the wheels - still a bit wonky but it does work 2022-05-12 10:15:07 +02:00
Seraina e52c21ebb0 Moved sprites so they would be easily reached by the gui 2022-05-03 15:09:31 +02:00
Seraina 2f2aa3e224 Added some documentation 2022-05-02 06:54:55 +02:00
Seraina 34127102da Merge remote-tracking branch 'origin/master' 2022-05-01 22:05:14 +02:00
Seraina 4ba87a91a3 Added some documentation where it was appropriate. 
Positively knackered - what ever happens: I'm out for the Day
 2022-05-01 22:04:41 +02:00
Seraina Schöb 26b9243df2 Merge branch 'Application' into 'master' 
In Client: added 3 new methods

See merge request cs108-fs22/Gruppe-8!8
 2022-05-01 19:30:20 +00:00
Seraina b0b2984968 Changed a line to correct a noise Notification issue 2022-05-01 21:29:11 +02:00
Seraina Schöb 470969cc30 Update Diary.txt 2022-05-01 19:28:48 +00:00
Seraina 8ee8cd6e4d Adjusted Documentation so javadoc would build 2022-05-01 21:02:09 +02:00
Seraina a655df2e41 Added a way to list HighScore and added very simple textFlow view for LobbyDisplay, in case ListView wont work till tomorrow 2022-05-01 20:34:59 +02:00
Seraina 68d84b9493 Ensured that noise notifications can only come from non kickedOff passenegers 2022-05-01 19:44:10 +02:00
Seraina c9f0654eef Implemented highScore functionality into Gui 2022-05-01 18:28:12 +02:00
Seraina 87e465099a Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
 2022-05-01 15:56:49 +02:00
Seraina 317968e368 Added static field to retain ListView reference 2022-05-01 15:55:20 +02:00
Seraina 39c0d4e52f Merge remote-tracking branch 'origin/Application' into Application 2022-05-01 15:28:53 +02:00
Seraina 2907f95b4e Added a s*t tone of Logger statements to find why LobbyListView is null 2022-05-01 15:28:15 +02:00
Seraina 79528e4efc Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
 2022-05-01 14:46:27 +02:00
Seraina f16d87f8d3 Added the chat to the lobby view, isnt resizable yet but works just fine 2022-05-01 14:42:10 +02:00
Seraina f0f4f9142e Now the Game appears when a game is started and disapears again when it is over 2022-05-01 13:11:17 +02:00
Seraina 1b30cd6435 Added game view to lounge viwe via anchor pane, currently there is a dedicated button for starting a game, might need to be removed later 2022-05-01 12:41:59 +02:00
Seraina 505577817e Made loungeView a sensible size and added a button and made it at the moment the main scene 2022-05-01 10:46:58 +02:00
Seraina 3f88831466 Merge remote-tracking branch 'origin/Application' into Application 2022-05-01 09:46:54 +02:00
Seraina a8fa462949 Fixed some wonky bugs, and added minimum vote time of 5 seconds to calm the game down a litte 2022-05-01 09:46:29 +02:00
Seraina 17fc986c50 Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/GuiParameters.java
 2022-05-01 03:08:16 +02:00
Seraina 27c31967e5 The game is now playable wia the game gui, there are still some quirks to work out, especially timing wise and with the POSOF network message 2022-05-01 03:05:32 +02:00
Seraina f4ccb6894a Had to change some things around, now notificationText and the bell pop up works, as well as voting and noise notification 2022-05-01 00:24:52 +02:00
Seraina c066763f97 Merge remote-tracking branch 'origin/master' 2022-04-30 18:49:08 +02:00
Seraina 48df7cf950 Readded some variables that were deleted 2022-04-30 18:48:36 +02:00
Seraina 2996f7aca7 Merge remote-tracking branch 'origin/master' 2022-04-30 16:59:29 +02:00
Seraina 044d0b362c Something left over from my merge 2022-04-30 16:59:18 +02:00
Seraina Schöb 71ed59b571 Merge branch 'GUI_MilestoneIV' into 'master' 
Started implementing the gui for milestone IV

See merge request cs108-fs22/Gruppe-8!7
 2022-04-30 14:58:25 +00:00
Seraina Schöb 99a794f5ee Merge branch 'master' into 'GUI_MilestoneIV' 
# Conflicts:
#   src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java
#   src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/GameStateModel.java
#   src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameController.java
 2022-04-30 14:58:21 +00:00
Seraina dcdf902b3f Merge remote-tracking branch 'origin/master' 2022-04-30 16:52:19 +02:00
Seraina 7109ed113f Commits maybe need to be added to merge with GUI_MilestoneIV is possible 2022-04-30 16:52:04 +02:00
Seraina 97194d0157 Adde a s**t tone of try-catch blocks in case gui hasnt been initialized yet 2022-04-30 16:31:38 +02:00
Seraina 3aca60d8ee Added view change printToGui parameter for Start, Lobby and Game 2022-04-30 15:54:16 +02:00
Seraina 1246c8e4ea increaseed gameStateUpdate intervall 2022-04-30 15:32:51 +02:00
Seraina 227cfdbedd Added an option do delete message in notificationText in GameController again 2022-04-30 15:30:03 +02:00
Seraina 421074a59b Implemented a thread in Game, that constantly sends out gameState updates to all clients while the game is ongoing 2022-04-30 15:19:20 +02:00
Seraina 460f4fb9ea Added two methods to ClientHandler that send messages to multiple lobbies, this is needed for the gui interaction with multiple clients 2022-04-30 14:36:47 +02:00
Seraina fb730006f8 Added some todo's to not lose the overview 2022-04-30 13:17:53 +02:00
Seraina a6e412f552 Wrapped printToGUI method contents in try-catch block, in case the fx components haven't been initialized yet 2022-04-30 13:16:05 +02:00
Seraina 1fd1cb6033 Added to unversioned files to git, that are relevant for functionality 2022-04-30 12:56:42 +02:00
Seraina 30aab3768d Implemented communication between Server and Client to display a notification if someone else heard a noise 2022-04-29 21:27:32 +02:00
Seraina d963c35965 Added ImageViews for noise Bell 2022-04-29 20:56:04 +02:00
Seraina c5293bc8ee Implemented the gameState Update parameter of the the printToGUI message in client, with its needed methods 2022-04-29 18:56:15 +02:00
Seraina f058eabb75 Cherry-picked my own commit from master, because I messed up the branch creation, recommitting it on this one 2022-04-29 17:13:15 +02:00
Seraina ba03095647 Added a PTGUI protocol message and class with all parameters for that message, to link gui to server 2022-04-29 17:07:40 +02:00
Seraina dd757b22f0 Added a PTGUI protocol message and class with all parameters for that message, to link gui to server 2022-04-29 16:48:02 +02:00
Seraina 81ee9a8841 Started linking new GameStateModel and Gamelogic, via protocol 2022-04-29 16:24:24 +02:00
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
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
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