seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
569 Commits 1 Branch 0 Tags
Commit Graph

400 Commits

Author SHA1 Message Date
Seraina
27c31967e5 The 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 2022-05-01 03:05:32 +02:00
Seraina
f4ccb6894a Had to change some things around, now notificationText and the bell pop up works, as well as voting and noise notification 2022-05-01 00:24:52 +02:00
Sebastian Lenzlinger
9007870d19 In Client: added 3 new methods 
GuiParameters: added 3 new Params
Lounge: added Maps, changed names and implemented methods
 2022-04-30 22:18:15 +02:00
Sebastian Lenzlinger
6e00128997 added method for adding a lobby to lobbylistview 2022-04-30 19:29:57 +02:00
Sebastian Lenzlinger
77d1976332 No more errors 2022-04-30 18:51:47 +02:00
Sebastian Lenzlinger
017a8a1c99 C 2022-04-30 18:51:10 +02:00
Seraina
c066763f97 Merge remote-tracking branch 'origin/master' 2022-04-30 18:49:08 +02:00
Seraina
48df7cf950 Readded some variables that were deleted 2022-04-30 18:48:36 +02:00
Alexander Sazonov
3e1ab66397 Fixed typo, commented out code causing compiling errors 2022-04-30 18:48:29 +02:00
Sebastian Lenzlinger
6a520ca83a Added Method for adding clients to gui view 2022-04-30 17:44:30 +02:00
Seraina Schöb
99a794f5ee Merge branch 'master' into 'GUI_MilestoneIV' 
# Conflicts:
#   src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java
#   src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/GameStateModel.java
#   src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameController.java
 2022-04-30 14:58:21 +00:00
Seraina
dcdf902b3f Merge remote-tracking branch 'origin/master' 2022-04-30 16:52:19 +02:00
Seraina
7109ed113f Commits maybe need to be added to merge with GUI_MilestoneIV is possible 2022-04-30 16:52:04 +02:00
Sebastian Lenzlinger
9f7fc2556b Adding Functionality to the view 2022-04-30 16:35:54 +02:00
Seraina
97194d0157 Adde a s**t tone of try-catch blocks in case gui hasnt been initialized yet 2022-04-30 16:31:38 +02:00
Seraina
3aca60d8ee Added view change printToGui parameter for Start, Lobby and Game 2022-04-30 15:54:16 +02:00
Seraina
1246c8e4ea increaseed gameStateUpdate intervall 2022-04-30 15:32:51 +02:00
Seraina
227cfdbedd Added an option do delete message in notificationText in GameController again 2022-04-30 15:30:03 +02:00
Seraina
421074a59b Implemented a thread in Game, that constantly sends out gameState updates to all clients while the game is ongoing 2022-04-30 15:19:20 +02:00
Seraina
460f4fb9ea Added two methods to ClientHandler that send messages to multiple lobbies, this is needed for the gui interaction with multiple clients 2022-04-30 14:36:47 +02:00
Sebastian Lenzlinger
d2907aa8ac Cleaned up ChatController a bit and added a chat label configurator classed used by the chat controller. 2022-04-30 13:48:21 +02:00
Seraina
fb730006f8 Added some todo's to not lose the overview 2022-04-30 13:17:53 +02:00
Seraina
a6e412f552 Wrapped printToGUI method contents in try-catch block, in case the fx components haven't been initialized yet 2022-04-30 13:16:05 +02:00
Seraina
1fd1cb6033 Added to unversioned files to git, that are relevant for functionality 2022-04-30 12:56:42 +02:00
Seraina
30aab3768d Implemented communication between Server and Client to display a notification if someone else heard a noise 2022-04-29 21:27:32 +02:00
Jonas
fc737012c7 Timers fully implemented. 2022-04-29 21:25:03 +02:00
Seraina
d963c35965 Added ImageViews for noise Bell 2022-04-29 20:56:04 +02:00
Seraina
c5293bc8ee Implemented the gameState Update parameter of the the printToGUI message in client, with its needed methods 2022-04-29 18:56:15 +02:00
Seraina
f058eabb75 Cherry-picked my own commit from master, because I messed up the branch creation, recommitting it on this one 2022-04-29 17:13:15 +02:00
Seraina
ba03095647 Added a PTGUI protocol message and class with all parameters for that message, to link gui to server 2022-04-29 17:07:40 +02:00
Seraina
dd757b22f0 Added a PTGUI protocol message and class with all parameters for that message, to link gui to server 2022-04-29 16:48:02 +02:00
Seraina
81ee9a8841 Started linking new GameStateModel and Gamelogic, via protocol 2022-04-29 16:24:24 +02:00
Seraina
384f2071d2 Merge remote-tracking branch 'origin/master' 2022-04-28 18:31:29 +02:00
Seraina
49ee585e3e Removed ghostVoteTimer from vote handler, so that the game works again 2022-04-28 18:30:57 +02:00
Jonas
96812a04ae High score fully implemented. 2022-04-28 15:29:36 +02:00
Seraina
8479479b49 Started adding a GameStateModel for the client to where primitive but needed data can be stored. 2022-04-28 13:46:28 +02:00
Seraina
79f5cb407f Started fleshing out the game GUI, with its controller and fxml 2022-04-28 13:45:26 +02:00
Sebastian Lenzlinger
b769991c36 Minor Changes to ChatController adding a TODO and created a LobbyListItem class to represent members of the lobby list view, or at least the data therein. 2022-04-28 13:41:45 +02:00
Jonas
5fbee579a9 made OgGhostHighScore.java, see documentation for details 2022-04-28 13:35:48 +02:00
Alexander Sazonov
b94c1ab3f4 Merge remote-tracking branch 'origin/master' 2022-04-28 13:30:05 +02:00
Alexander Sazonov
93b6bab957 Finished first functioning and successful unit test (tests noise handling) 2022-04-28 13:25:03 +02:00
Sebastian Lenzlinger
2bc79b53a7 Adding Wrapper Classes for Controlls and corresponding EventHandlers. added different fxml views. 2022-04-28 12:04:08 +02:00
Seraina
26dffdbbdc Merge remote-tracking branch 'origin/master' 2022-04-28 10:50:04 +02:00
Seraina
f5008ca1cc Added GameController Skeleton for the control of the Game controls 2022-04-28 09:41:04 +02:00
Seraina
3be5d7a3ae Started to create the game View skeleton in scene builder 2022-04-28 08:36:22 +02:00
Seraina
39d0b76f69 Started to make the vote time dynamic by adding a Timer class and adjusting some of the others. Doesn't work properly yet, though 2022-04-28 08:34:32 +02:00
Sebastian Lenzlinger
ee000c73fa updated ChatView.fxml and it's corresponding controller to new design 
added LobbyListView and corresponding controller class skeleton
 2022-04-27 21:17:24 +02:00
Jonas
a7cf0959f9 uploaded day sprites 2022-04-27 14:58:03 +02:00
Jonas
70d4c61b54 night sprites 2022-04-27 13:32:37 +02:00
Jonas
03669ac6d5 Uploaded night wheels sprites 2022-04-27 13:17:22 +02:00