Commit Graph

468 Commits

Author SHA1 Message Date
Seraina 667585fa5e Did some more styling, changed fonts ect. also moved the server notification in its one spot next to the chat, and now only the game over message is displayed 2022-05-17 18:33:57 +02:00
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
Jonas 365699c27e train horn is cooler now. 2022-05-17 00:00:38 +02:00
Jonas 814e78c1e0 train horn at the beginning of the game 2022-05-16 23:49:26 +02:00
Jonas 0b00e236e7 several minor adjustments 2022-05-16 23:38:46 +02:00
Jonas d2ada1d1ae implemented human vote result sounds. 2022-05-16 23:05:13 +02:00
Jonas ea2dc03a90 added 8 new ghost sounds (for a total of 12) to compensate for lack of pitch randomization. 2022-05-16 22:24:51 +02:00
Jonas aff0dd72be Merge remote-tracking branch 'origin/master' 2022-05-16 22:07:04 +02:00
Jonas 7761a74d2b npcs no longer chat about hearing noise, ghost players hear ghost noise too, removed random ghost noise pitch even though it was super cool, because of stupid aliasing artefacts :( 2022-05-16 22:06:55 +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
Jonas 2d6e15a39f game over prompts game over music, groundwork laid for human vote result music, ghost volume adjusted. 2022-05-16 21:21:40 +02:00
Jonas c1af75e2ed Merge remote-tracking branch 'origin/master' 2022-05-16 20:21:01 +02:00
Jonas 2e901490b2 Updated Bell timing for performance optimization, changed some values in Timer class to make gameplay less hectic 2022-05-16 20:20:49 +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
Jonas 7a81987316 Bells only start during the day, also ghosts now make noises as originally intended 2022-05-16 12:36:48 +02:00
Jonas 977f126073 Merge remote-tracking branch 'origin/master' 2022-05-15 21:06:01 +02:00
Jonas 1042c331c2 Implemented background sounds, bells and music 2022-05-15 21:02:03 +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
Jonas 79b21df2ce uploaded background crop image 2022-05-15 18:16:07 +02:00
Jonas 635c758669 made sounds louder 2022-05-15 17:30:55 +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
Jonas 68e2494be5 Working on Sound.java, all audio files loaded as audioClips - commit (2/2) 2022-05-14 17:06:20 +02:00
Jonas 9bdfa6ad02 Merge remote-tracking branch 'origin/master' 2022-05-14 17:04:34 +02:00
Jonas e945557753 Working on Sound.java, all audio files loaded as audioClips - commit (1/2) 2022-05-14 17:01:47 +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
Jonas 3d032be305 Bell fades in 2022-05-14 12:39:16 +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
Jonas 00efb47b78 Merge remote-tracking branch 'origin/master' 2022-05-14 12:12:39 +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