8479479b49
Started adding a GameStateModel for the client to where primitive but needed data can be stored.
Seraina
2022-04-28 13:46:28 +02:00
79f5cb407f
Started fleshing out the game GUI, with its controller and fxml
Seraina
2022-04-28 13:45:26 +02:00
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.
Sebastian Lenzlinger
2022-04-28 13:41:45 +02:00
5fbee579a9
made OgGhostHighScore.java, see documentation for details
Jonas
2022-04-28 13:35:48 +02:00
b94c1ab3f4
Merge remote-tracking branch 'origin/master'
Alexander Sazonov
2022-04-28 13:30:05 +02:00
93b6bab957
Finished first functioning and successful unit test (tests noise handling)
Alexander Sazonov
2022-04-28 13:25:03 +02:00
3377b71829
Update Diary.txt
Alexandr Sazonov
2022-04-28 11:17:55 +00:00
8a06ed8791
Dragged diary into current milestone folder
Alexandr Sazonov
2022-04-28 11:07:21 +00:00
38c02324f5
Added folder for everything related to milestone 4
Alexandr Sazonov
2022-04-28 11:05:57 +00:00
2bc79b53a7
Adding Wrapper Classes for Controlls and corresponding EventHandlers. added different fxml views.
Sebastian Lenzlinger
2022-04-28 12:04:08 +02:00
f5008ca1cc
Added GameController Skeleton for the control of the Game controls
Seraina
2022-04-28 09:41:04 +02:00
3be5d7a3ae
Started to create the game View skeleton in scene builder
Seraina
2022-04-28 08:36:22 +02:00
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
Seraina
2022-04-28 08:34:32 +02:00
ee000c73fa
updated ChatView.fxml and it's corresponding controller to new design added LobbyListView and corresponding controller class skeleton
Sebastian Lenzlinger
2022-04-27 21:17:24 +02:00
a7cf0959f9
uploaded day sprites
Jonas
2022-04-27 14:58:03 +02:00
70d4c61b54
night sprites
Jonas
2022-04-27 13:32:37 +02:00
03669ac6d5
Uploaded night wheels sprites
Jonas
2022-04-27 13:17:22 +02:00
a3af5d8911
Updated Diary
Jonas
2022-04-26 11:34:56 +02:00
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
Seraina
2022-04-22 16:34:48 +02:00
2926967da0
removed jar for presentation demo again, to declutter the repo
Seraina
2022-04-22 15:59:33 +02:00
cee9f136c6
Merge remote-tracking branch 'origin/master'
Sebastian Lenzlinger
2022-04-21 08:22:12 +02:00
73df828aa2
changed vote wait times to 10 seconds
Sebastian Lenzlinger
2022-04-21 08:22:02 +02:00
32bce6f2c7
Fixed newly emerged noise handling issue: now NPC's can send chat messages again
Alexander Sazonov
2022-04-20 18:32:53 +02:00
743ac7b1c4
Uploaded Presentation
Jonas
2022-04-20 16:43:51 +02:00
d710d8bf71
added jar for presentation demo
Seraina
2022-04-20 13:16:10 +02:00
2e9656f9cd
Update Diary.txt
Alexandr Sazonov
2022-04-18 22:15:44 +00:00
4f3f2dff2d
Fixed a typo in manual
Alexandr Sazonov
2022-04-18 22:11:11 +00:00
2da4d6c1ab
Added chat GUI section to manual, also other minor changes
Alexandr Sazonov
2022-04-18 22:08:29 +00:00
bacae889f1
Changed noise handling: humans now get just one notification about having heard noises, even if multiple ghosts walked by
Alexander Sazonov
2022-04-18 23:27:19 +02:00
3fedb8d739
Added manual as pdf
Jonas
2022-04-18 23:14:06 +02:00
1ca21a5b0e
Added diary entry.
Jonas
2022-04-18 23:12:07 +02:00
814eed9442
Merge remote-tracking branch 'origin/master'
Jonas
2022-04-18 22:42:09 +02:00
1247bc2035
closing lobby during game adds game to finished games list.
Jonas
2022-04-18 22:39:10 +02:00
82c561bcb3
copied the protocol just to be sure
Seraina
2022-04-18 22:14:39 +02:00
95a18d3d5c
added a @code in doc so javadoc builds
Seraina
2022-04-18 22:11:56 +02:00
55147ce1cf
went over all classes and added docs where is appropriate and needed
Seraina
2022-04-18 21:57:33 +02:00
d25b6c405d
slashed ghostVote Time in half to 30 seconds
Seraina
2022-04-18 21:12:12 +02:00
15d342f14b
Merge remote-tracking branch 'origin/master'
Jonas
2022-04-18 20:17:51 +02:00
c89eb7c5de
Chat adjustments: -Multiple lines are now cut off before sending, and are not printed to sender chat -"something went wrong while whispering" is now printed to chat rather than console -Chat message is sent to lobby rather than broadcast, from the start -whispering person sees who they whisper to
Jonas
2022-04-18 20:17:24 +02:00
3fb473df17
Uploading updated project plan as .xls (openable by Gantt) since I didn't find a way to save it as .gan
Alexandr Sazonov
2022-04-18 17:18:58 +00:00
5ed5825e9a
Project plan updated for milestones 4 & 5
Alexandr Sazonov
2022-04-18 16:51:51 +00:00
a6fac4c1b3
increased vote time to 60 seconds
Seraina
2022-04-18 17:01:22 +02:00
5cd0612022
Diary update
Sebastian Lenzlinger
2022-04-17 16:36:45 +02:00
ce4d84c9d7
Server shouldn't be sending chat messages back to the sender now
Sebastian Lenzlinger
2022-04-17 16:31:43 +02:00
ef8111553e
whisper chat messages now have a different background color than normal messages
Sebastian Lenzlinger
2022-04-17 16:28:10 +02:00
61697d7597
whisper is functional in with gui. decode whisper msg added to client handler and used in JServerProtcolParser now to correctly decode the messages
Sebastian Lenzlinger
2022-04-17 15:38:40 +02:00
6ebc4495e7
Added a networking process that updates the username in the ChatController of the ClientModel
Seraina
2022-04-17 15:11:01 +02:00
74fdca0efd
added whisper functionality for whisper in ClientHandler and Gui and deleted old recources that aren't needed.
Sebastian Lenzlinger
2022-04-17 15:06:24 +02:00
28b0c08ddb
Added ChatController to the running application
Seraina
2022-04-17 14:33:55 +02:00
edf5c65da2
Added static field to ChatApp and set it to the current application in the start()
Seraina
2022-04-17 14:05:38 +02:00
7ba20a9f62
lamdas were a bad idea
Sebastian Lenzlinger
2022-04-17 12:14:16 +02:00
bd5aa011a1
Merge branch 'revert-660883f7' into 'master'
Sebastian Lenzlinger
2022-04-17 10:13:28 +00:00
cb8dc1c56a
Revert "worked through a few warnings, changed a few anonymous classes to lambdas"
Sebastian Lenzlinger
2022-04-17 10:12:58 +00:00
660883f732
worked through a few warnings, changed a few anonymous classes to lambdas
Sebastian Lenzlinger
2022-04-17 11:35:16 +02:00
4bd9038146
Removed root from fxlm file, added constructor with no parameters to ChatController-> for some reason this gets called now the window pops up, but it cant communicate
Seraina
2022-04-17 10:55:58 +02:00
8e12e6e662
Some minor adjustments that localize the problem of GUI in fxlm file itself (root not correctly set?) I moved the fxml file to a spot, where gradle expects it
Seraina
2022-04-16 23:28:52 +02:00
88f72d7612
Added a way to end a game, when its lobby is closed.
Seraina
2022-04-16 21:34:36 +02:00
15b04171ca
Added "to be added" section, improved design a little. Might be final version if noone objects
Alexandr Sazonov
2022-04-16 16:42:50 +00:00
4d82af32f4
added javafx.graphics module
Sebastian Lenzlinger
2022-04-16 17:23:33 +02:00
11897a6a68
deleted unsupported modules
Sebastian Lenzlinger
2022-04-16 17:20:35 +02:00
f7324f2300
added needed javafx modules to build since I'm getting the following message at runtime: "JavaFX runtime components are missing, and are required to run this application"
Sebastian Lenzlinger
2022-04-16 17:06:27 +02:00
0270202c3f
Extending functionality to connect the incoming msgs to the gui via buffered readers.
Sebastian Lenzlinger
2022-04-16 16:05:21 +02:00
504aa9aef2
Commit to make sure everything is here as I accidentally deleted large portions of my local code.
Sebastian Lenzlinger
2022-04-16 14:28:02 +02:00
b76d57a407
Worked on game logic: - Spectators now get all information - votes for kicked off people don't count
Seraina
2022-04-16 13:13:20 +02:00
2f34de0136
Merge remote-tracking branch 'origin/master'
Jonas
2022-04-16 12:45:36 +02:00
b454cbee96
implemented Lobby.gameIsRunning, Lobby.getLobbyIsOpen updates on method call and considers both the number of players in the lobby as well as whether a game has already started in that lobby.
Jonas
2022-04-16 12:45:24 +02:00
3880b3f14f
ChatController fields slowly all initialized.
Sebastian Lenzlinger
2022-04-16 12:41:14 +02:00
22715e038d
Worked on game logic: -Ensured that votes of kicked off people don't count - Ensured that kicked off people don't get reentered in the game via gostification - fleshed out the Spectator class a litte
Seraina
2022-04-16 12:06:58 +02:00
b30f44df6c
Added ChatApp class, ChatController class and the fxml representing the view of the chat gui.
Sebastian Lenzlinger
2022-04-16 10:49:40 +02:00
6986a9906f
deleted unused classes
Sebastian Lenzlinger
2022-04-16 10:41:41 +02:00
d389a8fbb0
Removed some ToDos that are done and started creating a Spectator class and I'm in the process of ensuring only non kicked off passengers vote
Seraina
2022-04-15 23:22:38 +02:00
Seraina