626 Commits

Author SHA1 Message Date
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
Alexandr Sazonov
3377b71829 Update Diary.txt 2022-04-28 11:17:55 +00:00
Alexandr Sazonov
8a06ed8791 Dragged diary into current milestone folder 2022-04-28 11:07:21 +00:00
Alexandr Sazonov
38c02324f5 Added folder for everything related to milestone 4 2022-04-28 11:05:57 +00: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
Jonas
a3af5d8911 Updated Diary 2022-04-26 11:34:56 +02:00
Seraina
f37597a5cd added a method to find all ghosts currently seated in the train and added repo structure for tests as well as an empty test class 2022-04-22 16:34:48 +02:00
Seraina
2926967da0 removed jar for presentation demo again, to declutter the repo 2022-04-22 15:59:33 +02:00
Sebastian Lenzlinger
cee9f136c6 Merge remote-tracking branch 'origin/master' 2022-04-21 08:22:12 +02:00
Sebastian Lenzlinger
73df828aa2 changed vote wait times to 10 seconds 2022-04-21 08:22:02 +02:00
Alexander Sazonov
32bce6f2c7 Fixed newly emerged noise handling issue: now NPC's can send chat messages again 2022-04-20 18:32:53 +02:00
Jonas
743ac7b1c4 Uploaded Presentation 2022-04-20 16:43:51 +02:00
Seraina
47f808bcab Merge remote-tracking branch 'origin/master' 2022-04-20 13:16:28 +02:00
Seraina
d710d8bf71 added jar for presentation demo 2022-04-20 13:16:10 +02:00
Alexandr Sazonov
2e9656f9cd Update Diary.txt 2022-04-18 22:15:44 +00:00
Alexandr Sazonov
4f3f2dff2d Fixed a typo in manual 2022-04-18 22:11:11 +00:00
Alexandr Sazonov
2da4d6c1ab Added chat GUI section to manual, also other minor changes 2022-04-18 22:08:29 +00:00
Alexander Sazonov
bacae889f1 Changed noise handling: humans now get just one notification about having heard noises, even if multiple ghosts walked by 2022-04-18 23:27:19 +02:00
Jonas
3fedb8d739 Added manual as pdf 2022-04-18 23:14:06 +02:00
Jonas
1ca21a5b0e Added diary entry. 2022-04-18 23:12:07 +02:00
Jonas
814eed9442 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Game.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java
2022-04-18 22:42:09 +02:00
Jonas
1247bc2035 closing lobby during game adds game to finished games list. 2022-04-18 22:39:10 +02:00
Seraina
82c561bcb3 copied the protocol just to be sure 2022-04-18 22:14:39 +02:00
Seraina
95a18d3d5c added a @code in doc so javadoc builds 2022-04-18 22:11:56 +02:00
Seraina
55147ce1cf went over all classes and added docs where is appropriate and needed 2022-04-18 21:57:33 +02:00
Seraina
d25b6c405d slashed ghostVote Time in half to 30 seconds 2022-04-18 21:12:12 +02:00
Seraina
d78b08085a Merge remote-tracking branch 'origin/master' 2022-04-18 21:07:38 +02:00
Seraina
7106bf5588 Corrected some Comments 2022-04-18 21:06:30 +02:00