Seraina
49ee585e3e
Removed ghostVoteTimer from vote handler, so that the game works again
2022-04-28 18:30:57 +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
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
Seraina
a66345259a
Updated Diary
2022-04-18 21:05:49 +02:00
Jonas
15d342f14b
Merge remote-tracking branch 'origin/master'
2022-04-18 20:17:51 +02:00
Jonas
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
2022-04-18 20:17:24 +02:00
Alexandr Sazonov
3fb473df17
Uploading updated project plan as .xls (openable by Gantt) since I didn't find a way to save it as .gan
2022-04-18 17:18:58 +00:00
Alexandr Sazonov
5ed5825e9a
Project plan updated for milestones 4 & 5
2022-04-18 16:51:51 +00:00
Seraina
a6fac4c1b3
increased vote time to 60 seconds
2022-04-18 17:01:22 +02:00
Seraina
c3aef4dd54
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# build.gradle
2022-04-18 16:25:37 +02:00
Seraina
b2823fc01a
added custom task that builds jar and javadoc
2022-04-18 16:24:43 +02:00
Sebastian Lenzlinger
2c81133c43
standard encoding for myJavadoc gradle task now also utf-8
2022-04-18 15:32:08 +02:00
Sebastian Lenzlinger
e9a4a61737
Reformatted to googlestyle and now gui colorcodes if you whisper and differentiates for all
2022-04-18 15:27:27 +02:00
Seraina
df3964a9fa
Merge remote-tracking branch 'origin/master'
2022-04-18 15:23:52 +02:00
Seraina
4ba62ec622
added encoding utf-8
2022-04-18 15:23:23 +02:00
Sebastian Lenzlinger
8926eaa8f8
CHATA now doesn't send chatmsg to sender gui
2022-04-18 15:01:03 +02:00
Sebastian Lenzlinger
5e50905f81
msg wont be sent to self from server now even when not in lobby
2022-04-18 14:49:37 +02:00
Seraina
1943e8c86b
added own task
2022-04-18 14:26:10 +02:00
Seraina
414da07a09
Merge remote-tracking branch 'origin/master'
2022-04-18 13:44:32 +02:00
