667 Commits

Author SHA1 Message Date
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
Sebastian Lenzlinger a4a12fc9d2 trying to get the join button to work 2022-05-01 16:24:53 +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
Sebastian Lenzlinger e58f01e4b6 .getID() from lobbylistview for debugging 2022-05-01 15:55:32 +02:00
Seraina 317968e368 Added static field to retain ListView reference 2022-05-01 15:55:20 +02:00
Sebastian Lenzlinger 115e39c34f .getID() from lobbylistview for debugging 2022-05-01 15:37:47 +02:00
Sebastian Lenzlinger c333d4486f Merge remote-tracking branch 'origin/Application' into Application 2022-05-01 15:30:35 +02:00
Sebastian Lenzlinger 5dfa53c001 added RMVLSt command to remove a client from gui 2022-05-01 15:30:30 +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
Sebastian Lenzlinger 58e2d693bb added RMVLSt command to remove a client from gui 2022-05-01 15:15:06 +02:00
Sebastian Lenzlinger 578016d11d Added method to add new player to loungeview withing Client.java 2022-05-01 15:07:54 +02:00
Sebastian Lenzlinger 927416f224 added MSG to add new client to the gui of whoever is on the server 2022-05-01 15:03:20 +02:00
Sebastian Lenzlinger 111bd67bd4 error correcting type refactor 2022-05-01 14:56:44 +02:00
Sebastian Lenzlinger b58c371b7b 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:54:14 +02:00
Sebastian Lenzlinger fdc7ba6668 Debugging NewLobby() 2022-05-01 14:49:46 +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
Sebastian Lenzlinger 70c553d608 refactored newLobby and addClientToList. Changed the leaveLobby response to go to lounge view. 2022-05-01 13:58:36 +02:00
Sebastian Lenzlinger 4a987ffc1c Deleted an unused method 2022-05-01 13:36:14 +02:00
Sebastian Lenzlinger 0abf86731a 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 13:35:01 +02:00