Commit Graph

587 Commits

Author SHA1 Message Date
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
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
Alexandr Sazonov 8c347364f5 Update Diary.txt 2022-05-01 20:00:23 +00: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
Sebastian Lenzlinger d6f28a63e8 no list of who is in lobby yet but at least functionally one is in a lobby and can play a game 2022-05-01 16:53:40 +02:00