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 |
|
Seraina
|
1257d102b8
|
Handled NullPointerException in closeLobby
|
2022-04-18 13:43:57 +02:00 |
|
Jonas
|
40c528612b
|
Merge remote-tracking branch 'origin/master'
|
2022-04-17 21:13:10 +02:00 |
|
Jonas
|
b717a73a38
|
Added human-readable protocol.
|
2022-04-17 21:12:22 +02:00 |
|
Seraina
|
08f9f44fab
|
Added javadoc statements to loads of methods where there was a warning
|
2022-04-17 20:41:31 +02:00 |
|
Jonas
|
bf31670ec1
|
tried to implement build-cs108 task
|
2022-04-17 20:07:15 +02:00 |
|
Seraina
|
cee7196566
|
Aaaaaaand another typo
|
2022-04-17 19:30:16 +02:00 |
|
Seraina
|
7509b943bc
|
Fixed Typo in QA-Concept
|
2022-04-17 19:27:58 +02:00 |
|
Seraina
|
8fb4ae1534
|
Finalized QA-Concept and added all Plots from measurement to a separate QA-Folder
|
2022-04-17 19:11:54 +02:00 |
|
Seraina
|
bc77f5dad2
|
Ensured Client username updating in ClientModle for ui
|
2022-04-17 17:22:15 +02:00 |
|
Seraina
|
8c9d40a6d8
|
Changed default cmd to CHATA
|
2022-04-17 17:21:11 +02:00 |
|
Seraina Schöb
|
764c06f26b
|
Merge branch 'SerainaGui' into 'master'
Debugged the UI now its working
See merge request cs108-fs22/Gruppe-8!6
|
2022-04-17 15:15:40 +00:00 |
|
Sebastian Lenzlinger
|
5cd0612022
|
Diary update
|
2022-04-17 16:36:45 +02:00 |
|
Sebastian Lenzlinger
|
ce4d84c9d7
|
Server shouldn't be sending chat messages back to the sender now
|
2022-04-17 16:31:43 +02:00 |
|
Sebastian Lenzlinger
|
ef8111553e
|
whisper chat messages now have a different background color than normal messages
|
2022-04-17 16:28:10 +02:00 |
|
Sebastian Lenzlinger
|
61697d7597
|
whisper is functional in with gui. decode whisper msg added to client handler and used in JServerProtcolParser now to correctly decode the messages
|
2022-04-17 15:38:40 +02:00 |
|
Seraina
|
dad2cf1cd8
|
Merge remote-tracking branch 'origin/SerainaGui' into SerainaGui
|
2022-04-17 15:11:28 +02:00 |
|
Seraina
|
6ebc4495e7
|
Added a networking process that updates the username in the ChatController of the ClientModel
|
2022-04-17 15:11:01 +02:00 |
|
Sebastian Lenzlinger
|
74fdca0efd
|
added whisper functionality for whisper in ClientHandler and Gui and deleted old recources that aren't needed.
|
2022-04-17 15:06:24 +02:00 |
|
Seraina
|
28b0c08ddb
|
Added ChatController to the running application
|
2022-04-17 14:33:55 +02:00 |
|
Seraina
|
edf5c65da2
|
Added static field to ChatApp and set it to the current application in the start()
|
2022-04-17 14:05:38 +02:00 |
|
Sebastian Lenzlinger
|
7ba20a9f62
|
lamdas were a bad idea
|
2022-04-17 12:14:16 +02:00 |
|
Sebastian Lenzlinger
|
bd5aa011a1
|
Merge branch 'revert-660883f7' into 'master'
Revert "worked through a few warnings, changed a few anonymous classes to lambdas"
See merge request cs108-fs22/Gruppe-8!5
|
2022-04-17 10:13:28 +00:00 |
|
Sebastian Lenzlinger
|
cb8dc1c56a
|
Revert "worked through a few warnings, changed a few anonymous classes to lambdas"
This reverts commit 660883f732495dbee294bbe436055dd0a49a3b57
|
2022-04-17 10:12:58 +00:00 |
|
Sebastian Lenzlinger
|
660883f732
|
worked through a few warnings, changed a few anonymous classes to lambdas
|
2022-04-17 11:35:16 +02:00 |
|
Seraina
|
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
|
2022-04-17 10:55:58 +02:00 |
|
Seraina
|
4899f06f73
|
Merge remote-tracking branch 'origin/master'
|
2022-04-16 23:29:10 +02:00 |
|
Seraina
|
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
|
2022-04-16 23:28:52 +02:00 |
|
Seraina
|
88f72d7612
|
Added a way to end a game, when its lobby is closed.
|
2022-04-16 21:34:36 +02:00 |
|
Alexandr Sazonov
|
15b04171ca
|
Added "to be added" section, improved design a little. Might be final version if noone objects
|
2022-04-16 16:42:50 +00:00 |
|
Sebastian Lenzlinger
|
4d82af32f4
|
added javafx.graphics module
|
2022-04-16 17:23:33 +02:00 |
|
Sebastian Lenzlinger
|
11897a6a68
|
deleted unsupported modules
|
2022-04-16 17:20:35 +02:00 |
|
Sebastian Lenzlinger
|
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"
|
2022-04-16 17:06:27 +02:00 |
|
Sebastian Lenzlinger
|
0270202c3f
|
Extending functionality to connect the incoming msgs to the gui via buffered readers.
|
2022-04-16 16:05:21 +02:00 |
|
Sebastian Lenzlinger
|
504aa9aef2
|
Commit to make sure everything is here as I accidentally deleted large portions of my local code.
|
2022-04-16 14:28:02 +02:00 |
|
Seraina
|
8e434e3e14
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Lobby.java
|
2022-04-16 13:15:28 +02:00 |
|
Seraina
|
b76d57a407
|
Worked on game logic:
- Spectators now get all information
- votes for kicked off people don't count
|
2022-04-16 13:13:20 +02:00 |
|
Jonas
|
2f34de0136
|
Merge remote-tracking branch 'origin/master'
|
2022-04-16 12:45:36 +02:00 |
|