597 Commits

Author SHA1 Message Date
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
Seraina
76ab7535b5 Moved all Sprites into 3 classes,where their initialization and change is handled 2022-05-14 12:00:32 +02:00
Jonas
87cfa23185 All sound effects uploaded. 2022-05-14 11:50:10 +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
Sebastian Lenzlinger
4d5cd0e05f deleted unused imports 2022-05-13 15:49:11 +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
Alexandr Sazonov
689e4f0dfc Update Diary.txt 2022-05-13 11:27:20 +00:00
Alexandr Sazonov
9505190468 Uploaded diary into current milestone folder 2022-05-13 11:23:15 +00:00
Alexandr Sazonov
613b875999 Added folder for everything related to milestone 5 2022-05-13 11:21:40 +00:00
Sebastian Lenzlinger
beeed8f2fd deleted ClientListView initialization artefacts 2022-05-13 12:50:11 +02:00
Sebastian Lenzlinger
7ecb910c83 Merge remote-tracking branch 'origin/master' 2022-05-13 12:47:21 +02:00
Sebastian Lenzlinger
86a36368c0 deletet ClientController.java and ClientView.java 2022-05-13 12:46:56 +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
Sebastian Lenzlinger
65303a4bb6 Deleted more methods associated with the player list that are not needed anymore.
The ChatView is now directly added to the anchor pone in the "Bottom"Child of the BorderPane representing the LoungeSceneView.fxml Root
2022-05-13 12:04:32 +02:00
Sebastian Lenzlinger
b605669395 HighScore and Players lists now on the left side and not on the bottom right of the loungeSceneView anymore 2022-05-13 11:43:24 +02:00
Jonas
92f5568f1d Merge remote-tracking branch 'origin/master' 2022-05-13 10:57:48 +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
Jonas
c08d04ad90 Uploaded night back- & foreground, deleted unused background files, updated night loki 2022-05-12 13:41:05 +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
Jonas
39e52b20aa Merge remote-tracking branch 'origin/master' 2022-05-11 13:14:17 +02:00
Jonas
46723baca8 Smaller versions of BG & foreground sprites 2022-05-11 13:13:54 +02:00
Jonas
694ed748d2 Uploaded some sprites for the night. Still missing: Background, foreground, animated wheels. 2022-05-10 16:21:00 +02:00
Jonas
6d61dfce32 Uploaded new foreground day sprite 2022-05-09 22:53:29 +02:00
Jonas
d8717972af updated foreground sprite 2022-05-09 22:04:31 +02:00
Jonas
d5d89d78d8 Uploaded final Sprites for Day. 2022-05-09 13:20:13 +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
Sebastian Lenzlinger
651a07e32e removal of Lobby now runs on Platform.runLater(). Untested. 2022-05-02 00:53:25 +02:00
Sebastian Lenzlinger
62992ae84c Adding functionality for removing lobby from view. ClientHandler, GuiParameters Client and LoungeView now atleast have
the correspondingly named functions. No functionality tested yet.
2022-05-02 00:42:33 +02:00
Sebastian Lenzlinger
d7f12d760d HERE THE CHAT WORKS WELL GO HERE TO GET IT! 2022-05-02 00:17:27 +02:00
Sebastian Lenzlinger
802b8d1154 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
2022-05-02 00:17:18 +02:00
Sebastian Lenzlinger
7b9c1f964a HERE THE CHAT WORKS WELL GO HERE TO GET IT! 2022-05-02 00:11:24 +02:00
Seraina
34127102da Merge remote-tracking branch 'origin/master' 2022-05-01 22:05:14 +02:00