92f5568f1dMerge remote-tracking branch 'origin/master'
Jonas
2022-05-13 10:57:48 +02:00
4262fb64ddmade buttons for voting only available when appropriate by chancing their visibility, the client always thinks its a human though, that needs fixing
Seraina
2022-05-12 21:10:05 +02:00
4079561f7eAdded 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
Seraina
2022-05-12 14:58:40 +02:00
c08d04ad90Uploaded night back- & foreground, deleted unused background files, updated night loki
Jonas
2022-05-12 13:41:05 +02:00
19ddf70e72Now in the Game the vote Buttons are transparent and the Rooms move up and down when hovering over a room
Seraina
2022-05-12 12:56:49 +02:00
7968523469Added the Train as a Background to LobbyView and animated the wheels - still a bit wonky but it does work
Seraina
2022-05-12 10:15:07 +02:00
39e52b20aaMerge remote-tracking branch 'origin/master'
Jonas
2022-05-11 13:14:17 +02:00
46723baca8Smaller versions of BG & foreground sprites
Jonas
2022-05-11 13:13:54 +02:00
694ed748d2Uploaded some sprites for the night. Still missing: Background, foreground, animated wheels.
Jonas
2022-05-10 16:21:00 +02:00
6d61dfce32Uploaded new foreground day sprite
Jonas
2022-05-09 22:53:29 +02:00
d8717972afupdated foreground sprite
Jonas
2022-05-09 22:04:31 +02:00
d5d89d78d8Uploaded final Sprites for Day.
Jonas
2022-05-09 13:20:13 +02:00
e52c21ebb0Moved sprites so they would be easily reached by the gui
Seraina
2022-05-03 15:09:31 +02:00
2f2aa3e224Added some documentation
Seraina
2022-05-02 06:54:55 +02:00
651a07e32eremoval of Lobby now runs on Platform.runLater(). Untested.
Sebastian Lenzlinger
2022-05-02 00:53:25 +02:00
62992ae84cAdding functionality for removing lobby from view. ClientHandler, GuiParameters Client and LoungeView now atleast have the correspondingly named functions. No functionality tested yet.
Sebastian Lenzlinger
2022-05-02 00:42:33 +02:00
d7f12d760dHERE THE CHAT WORKS WELL GO HERE TO GET IT!
Sebastian Lenzlinger
2022-05-02 00:17:27 +02:00
802b8d1154Merge remote-tracking branch 'origin/master'
Sebastian Lenzlinger
2022-05-02 00:17:18 +02:00
7b9c1f964aHERE THE CHAT WORKS WELL GO HERE TO GET IT!
Sebastian Lenzlinger
2022-05-02 00:11:24 +02:00
4ba87a91a3Added some documentation where it was appropriate. Positively knackered - what ever happens: I'm out for the Day
Seraina
2022-05-01 22:04:41 +02:00
8c347364f5Update Diary.txt
Alexandr Sazonov
2022-05-01 20:00:23 +00:00
26b9243df2Merge branch 'Application' into 'master'
Seraina Schöb
2022-05-01 19:30:20 +00:00
b0b2984968Changed a line to correct a noise Notification issue
Seraina
2022-05-01 21:29:11 +02:00
8ee8cd6e4dAdjusted Documentation so javadoc would build
Seraina
2022-05-01 21:02:09 +02:00
a655df2e41Added a way to list HighScore and added very simple textFlow view for LobbyDisplay, in case ListView wont work till tomorrow
Seraina
2022-05-01 20:34:59 +02:00
68d84b9493Ensured that noise notifications can only come from non kickedOff passenegers
Seraina
2022-05-01 19:44:10 +02:00
c9f0654eefImplemented highScore functionality into Gui
Seraina
2022-05-01 18:28:12 +02:00
d6f28a63e8no list of who is in lobby yet but at least functionally one is in a lobby and can play a game
Sebastian Lenzlinger
2022-05-01 16:53:40 +02:00
a4a12fc9d2trying to get the join button to work
Sebastian Lenzlinger
2022-05-01 16:24:53 +02:00
87e465099aMerge remote-tracking branch 'origin/Application' into Application
Seraina
2022-05-01 15:56:49 +02:00
e58f01e4b6.getID() from lobbylistview for debugging
Sebastian Lenzlinger
2022-05-01 15:55:32 +02:00
317968e368Added static field to retain ListView reference
Seraina
2022-05-01 15:55:20 +02:00
115e39c34f.getID() from lobbylistview for debugging
Sebastian Lenzlinger
2022-05-01 15:37:47 +02:00
c333d4486fMerge remote-tracking branch 'origin/Application' into Application
Sebastian Lenzlinger
2022-05-01 15:30:35 +02:00
5dfa53c001added RMVLSt command to remove a client from gui
Sebastian Lenzlinger
2022-05-01 15:30:30 +02:00
39c0d4e52fMerge remote-tracking branch 'origin/Application' into Application
Seraina
2022-05-01 15:28:53 +02:00
2907f95b4eAdded a s*t tone of Logger statements to find why LobbyListView is null
Seraina
2022-05-01 15:28:15 +02:00
58e2d693bbadded RMVLSt command to remove a client from gui
Sebastian Lenzlinger
2022-05-01 15:15:06 +02:00
578016d11dAdded method to add new player to loungeview withing Client.java
Sebastian Lenzlinger
2022-05-01 15:07:54 +02:00
927416f224added MSG to add new client to the gui of whoever is on the server
Sebastian Lenzlinger
2022-05-01 15:03:20 +02:00
111bd67bd4error correcting type refactor
Sebastian Lenzlinger
2022-05-01 14:56:44 +02:00
b58c371b7bMerge remote-tracking branch 'origin/Application' into Application
Sebastian Lenzlinger
2022-05-01 14:54:14 +02:00
fdc7ba6668Debugging NewLobby()
Sebastian Lenzlinger
2022-05-01 14:49:46 +02:00
79528e4efcMerge remote-tracking branch 'origin/Application' into Application
Seraina
2022-05-01 14:46:27 +02:00
f16d87f8d3Added the chat to the lobby view, isnt resizable yet but works just fine
Seraina
2022-05-01 14:42:10 +02:00
70c553d608refactored newLobby and addClientToList. Changed the leaveLobby response to go to lounge view.
Sebastian Lenzlinger
2022-05-01 13:58:36 +02:00
4a987ffc1cDeleted an unused method
Sebastian Lenzlinger
2022-05-01 13:36:14 +02:00
0abf86731aMerge remote-tracking branch 'origin/Application' into Application
Sebastian Lenzlinger
2022-05-01 13:35:01 +02:00
5244742c84added cell factories for the lists
Sebastian Lenzlinger
2022-05-01 13:32:11 +02:00
f0f4f9142eNow the Game appears when a game is started and disapears again when it is over
Seraina
2022-05-01 13:11:17 +02:00
1b30cd6435Added game view to lounge viwe via anchor pane, currently there is a dedicated button for starting a game, might need to be removed later
Seraina
2022-05-01 12:41:59 +02:00
505577817eMade loungeView a sensible size and added a button and made it at the moment the main scene
Seraina
2022-05-01 10:46:58 +02:00
3f88831466Merge remote-tracking branch 'origin/Application' into Application
Seraina
2022-05-01 09:46:54 +02:00
a8fa462949Fixed some wonky bugs, and added minimum vote time of 5 seconds to calm the game down a litte
Seraina
2022-05-01 09:46:29 +02:00
ff33163cb6Merge remote-tracking branch 'origin/Application' into Application
Sebastian Lenzlinger
2022-05-01 08:56:55 +02:00
2e9a47cbd4Fever dream
Sebastian Lenzlinger
2022-05-01 08:52:58 +02:00
17fc986c50Merge remote-tracking branch 'origin/Application' into Application
Seraina
2022-05-01 03:08:16 +02:00
27c31967e5The 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
Seraina
2022-05-01 03:05:32 +02:00
f4ccb6894aHad to change some things around, now notificationText and the bell pop up works, as well as voting and noise notification
Seraina
2022-05-01 00:24:52 +02:00
0e37985884Improved documentation
Alexander Sazonov
2022-04-30 22:42:33 +02:00
9007870d19In Client: added 3 new methods GuiParameters: added 3 new Params Lounge: added Maps, changed names and implemented methods
Sebastian Lenzlinger
2022-04-30 22:18:15 +02:00
6e00128997added method for adding a lobby to lobbylistview
Sebastian Lenzlinger
2022-04-30 19:29:57 +02:00
9cb1668ab0Update Diary.txt
Alexandr Sazonov
2022-04-30 16:58:03 +00:00
77d1976332No more errors
Sebastian Lenzlinger
2022-04-30 18:51:47 +02:00
017a8a1c99C
Sebastian Lenzlinger
2022-04-30 18:51:10 +02:00
48df7cf950Readded some variables that were deleted
Seraina
2022-04-30 18:48:36 +02:00
3e1ab66397Fixed typo, commented out code causing compiling errors
Alexander Sazonov
2022-04-30 18:48:29 +02:00
a0b0b3e330Completed noise handler tests (they will fail if there are unsolved issues in other classes though!)
Alexander Sazonov
2022-04-30 18:09:00 +02:00
6a520ca83aAdded Method for adding clients to gui view
Sebastian Lenzlinger
2022-04-30 17:44:30 +02:00
227cfdbeddAdded an option do delete message in notificationText in GameController again
Seraina
2022-04-30 15:30:03 +02:00
421074a59bImplemented a thread in Game, that constantly sends out gameState updates to all clients while the game is ongoing
Seraina
2022-04-30 15:19:20 +02:00
460f4fb9eaAdded two methods to ClientHandler that send messages to multiple lobbies, this is needed for the gui interaction with multiple clients
Seraina
2022-04-30 14:36:47 +02:00
d2907aa8acCleaned up ChatController a bit and added a chat label configurator classed used by the chat controller.
Sebastian Lenzlinger
2022-04-30 13:48:21 +02:00
fb730006f8Added some todo's to not lose the overview
Seraina
2022-04-30 13:17:53 +02:00
a6e412f552Wrapped printToGUI method contents in try-catch block, in case the fx components haven't been initialized yet
Seraina
2022-04-30 13:16:05 +02:00
1fd1cb6033Added to unversioned files to git, that are relevant for functionality
Seraina
2022-04-30 12:56:42 +02:00
30aab3768dImplemented communication between Server and Client to display a notification if someone else heard a noise
Seraina
2022-04-29 21:27:32 +02:00
fc737012c7Timers fully implemented.
Jonas
2022-04-29 21:25:03 +02:00
d963c35965Added ImageViews for noise Bell
Seraina
2022-04-29 20:56:04 +02:00
c5293bc8eeImplemented the gameState Update parameter of the the printToGUI message in client, with its needed methods
Seraina
2022-04-29 18:56:15 +02:00
f058eabb75Cherry-picked my own commit from master, because I messed up the branch creation, recommitting it on this one
Seraina
2022-04-29 16:24:24 +02:00
ba03095647Added a PTGUI protocol message and class with all parameters for that message, to link gui to server
Seraina
2022-04-29 17:07:40 +02:00
dd757b22f0Added a PTGUI protocol message and class with all parameters for that message, to link gui to server
Seraina
2022-04-29 16:48:02 +02:00
81ee9a8841Started linking new GameStateModel and Gamelogic, via protocol
Seraina
2022-04-29 16:24:24 +02:00