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

651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Lenzlinger
d7f12d760d HERE THE CHAT WORKS WELL GO HERE TO GET IT! 2022-05-02 00:17:27 +02:00
Sebastian Lenzlinger
802b8d1154 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
 2022-05-02 00:17:18 +02:00
Sebastian Lenzlinger
7b9c1f964a HERE THE CHAT WORKS WELL GO HERE TO GET IT! 2022-05-02 00:11:24 +02:00
Seraina
34127102da Merge remote-tracking branch 'origin/master' 2022-05-01 22:05:14 +02:00
Seraina
4ba87a91a3 Added some documentation where it was appropriate. 
Positively knackered - what ever happens: I'm out for the Day
 2022-05-01 22:04:41 +02:00
Alexandr Sazonov
8c347364f5 Update Diary.txt 2022-05-01 20:00:23 +00:00
Seraina Schöb
26b9243df2 Merge branch 'Application' into 'master' 
In Client: added 3 new methods

See merge request cs108-fs22/Gruppe-8!8
 2022-05-01 19:30:20 +00:00
Seraina
b0b2984968 Changed a line to correct a noise Notification issue 2022-05-01 21:29:11 +02:00
Seraina Schöb
470969cc30 Update Diary.txt 2022-05-01 19:28:48 +00:00
Seraina
8ee8cd6e4d Adjusted Documentation so javadoc would build 2022-05-01 21:02:09 +02:00
Seraina
a655df2e41 Added a way to list HighScore and added very simple textFlow view for LobbyDisplay, in case ListView wont work till tomorrow 2022-05-01 20:34:59 +02:00
Seraina
68d84b9493 Ensured that noise notifications can only come from non kickedOff passenegers 2022-05-01 19:44:10 +02:00
Seraina
c9f0654eef Implemented highScore functionality into Gui 2022-05-01 18:28:12 +02:00
Sebastian Lenzlinger
d6f28a63e8 no list of who is in lobby yet but at least functionally one is in a lobby and can play a game 2022-05-01 16:53:40 +02:00
Sebastian Lenzlinger
a4a12fc9d2 trying to get the join button to work 2022-05-01 16:24:53 +02:00
Seraina
87e465099a Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
 2022-05-01 15:56:49 +02:00
Sebastian Lenzlinger
e58f01e4b6 .getID() from lobbylistview for debugging 2022-05-01 15:55:32 +02:00
Seraina
317968e368 Added static field to retain ListView reference 2022-05-01 15:55:20 +02:00
Sebastian Lenzlinger
115e39c34f .getID() from lobbylistview for debugging 2022-05-01 15:37:47 +02:00
Sebastian Lenzlinger
c333d4486f Merge remote-tracking branch 'origin/Application' into Application 2022-05-01 15:30:35 +02:00
Sebastian Lenzlinger
5dfa53c001 added RMVLSt command to remove a client from gui 2022-05-01 15:30:30 +02:00
Seraina
39c0d4e52f Merge remote-tracking branch 'origin/Application' into Application 2022-05-01 15:28:53 +02:00
Seraina
2907f95b4e Added a s*t tone of Logger statements to find why LobbyListView is null 2022-05-01 15:28:15 +02:00
Sebastian Lenzlinger
58e2d693bb added RMVLSt command to remove a client from gui 2022-05-01 15:15:06 +02:00
Sebastian Lenzlinger
578016d11d Added method to add new player to loungeview withing Client.java 2022-05-01 15:07:54 +02:00
Sebastian Lenzlinger
927416f224 added MSG to add new client to the gui of whoever is on the server 2022-05-01 15:03:20 +02:00
Sebastian Lenzlinger
111bd67bd4 error correcting type refactor 2022-05-01 14:56:44 +02:00
Sebastian Lenzlinger
b58c371b7b Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
 2022-05-01 14:54:14 +02:00
Sebastian Lenzlinger
fdc7ba6668 Debugging NewLobby() 2022-05-01 14:49:46 +02:00
Seraina
79528e4efc Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
 2022-05-01 14:46:27 +02:00
Seraina
f16d87f8d3 Added the chat to the lobby view, isnt resizable yet but works just fine 2022-05-01 14:42:10 +02:00
Sebastian Lenzlinger
70c553d608 refactored newLobby and addClientToList. Changed the leaveLobby response to go to lounge view. 2022-05-01 13:58:36 +02:00
Sebastian Lenzlinger
4a987ffc1c Deleted an unused method 2022-05-01 13:36:14 +02:00
Sebastian Lenzlinger
0abf86731a Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
 2022-05-01 13:35:01 +02:00
Sebastian Lenzlinger
5244742c84 added cell factories for the lists 2022-05-01 13:32:11 +02:00
Seraina
f0f4f9142e Now the Game appears when a game is started and disapears again when it is over 2022-05-01 13:11:17 +02:00
Seraina
1b30cd6435 Added game view to lounge viwe via anchor pane, currently there is a dedicated button for starting a game, might need to be removed later 2022-05-01 12:41:59 +02:00
Seraina
505577817e Made loungeView a sensible size and added a button and made it at the moment the main scene 2022-05-01 10:46:58 +02:00
Seraina
3f88831466 Merge remote-tracking branch 'origin/Application' into Application 2022-05-01 09:46:54 +02:00
Seraina
a8fa462949 Fixed some wonky bugs, and added minimum vote time of 5 seconds to calm the game down a litte 2022-05-01 09:46:29 +02:00
Sebastian Lenzlinger
ff33163cb6 Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/ChatApp.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/GUI.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/GuiParameters.java
 2022-05-01 08:56:55 +02:00
Sebastian Lenzlinger
2e9a47cbd4 Fever dream 2022-05-01 08:52:58 +02:00
Seraina
17fc986c50 Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/GuiParameters.java
 2022-05-01 03:08:16 +02:00
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
Alexander Sazonov
0e37985884 Improved documentation 2022-04-30 22:42:33 +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
Alexandr Sazonov
9cb1668ab0 Update Diary.txt 2022-04-30 16:58:03 +00:00
Sebastian Lenzlinger
77d1976332 No more errors 2022-04-30 18:51:47 +02:00