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 |
|
Sebastian Lenzlinger
|
017a8a1c99
|
C
|
2022-04-30 18:51:10 +02:00 |
|
Seraina
|
c066763f97
|
Merge remote-tracking branch 'origin/master'
|
2022-04-30 18:49:08 +02:00 |
|
Seraina
|
48df7cf950
|
Readded some variables that were deleted
|
2022-04-30 18:48:36 +02:00 |
|
Alexander Sazonov
|
3e1ab66397
|
Fixed typo, commented out code causing compiling errors
|
2022-04-30 18:48:29 +02:00 |
|
Alexander Sazonov
|
a0b0b3e330
|
Completed noise handler tests (they will fail if there are unsolved issues in other classes though!)
|
2022-04-30 18:09:00 +02:00 |
|
Sebastian Lenzlinger
|
6a520ca83a
|
Added Method for adding clients to gui view
|
2022-04-30 17:44:30 +02:00 |
|
Seraina
|
2996f7aca7
|
Merge remote-tracking branch 'origin/master'
|
2022-04-30 16:59:29 +02:00 |
|
Seraina
|
044d0b362c
|
Something left over from my merge
|
2022-04-30 16:59:18 +02:00 |
|
Seraina Schöb
|
71ed59b571
|
Merge branch 'GUI_MilestoneIV' into 'master'
Started implementing the gui for milestone IV
See merge request cs108-fs22/Gruppe-8!7
|
2022-04-30 14:58:25 +00:00 |
|
Seraina Schöb
|
99a794f5ee
|
Merge branch 'master' into 'GUI_MilestoneIV'
# Conflicts:
# src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java
# src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/GameStateModel.java
# src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameController.java
|
2022-04-30 14:58:21 +00:00 |
|
Seraina
|
dcdf902b3f
|
Merge remote-tracking branch 'origin/master'
|
2022-04-30 16:52:19 +02:00 |
|
Seraina
|
7109ed113f
|
Commits maybe need to be added to merge with GUI_MilestoneIV is possible
|
2022-04-30 16:52:04 +02:00 |
|
Sebastian Lenzlinger
|
9f7fc2556b
|
Adding Functionality to the view
|
2022-04-30 16:35:54 +02:00 |
|