SemvdH
|
5075f285d1
|
Merge branch 'master' into feature/jsonForWords
|
2020-10-22 17:01:28 +02:00 |
|
Dogukan
|
5b5d66c41b
|
[ADDITION] Tried to send the random word to a lobby
|
2020-10-22 13:55:19 +02:00 |
|
Sem van der Hoeven
|
0b72c4dc9b
|
[ADD] added that when you join an empty lobby you become the host
|
2020-10-22 13:22:52 +02:00 |
|
Dogukan
|
4d3dda023c
|
Merge branch 'master' into feature/handleChatData
|
2020-10-21 22:43:18 +02:00 |
|
Dogukan
|
d5d6d59690
|
[FIX] fixed the broadcast for the chat messages.
|
2020-10-21 22:40:36 +02:00 |
|
Sem van der Hoeven
|
cc5c71a30f
|
[ADD] added buttons reenabled when leaving
|
2020-10-21 21:55:28 +02:00 |
|
Sem van der Hoeven
|
442cdccc49
|
[ADD] add updating lobbies on exiting window
|
2020-10-21 21:40:35 +02:00 |
|
Sem van der Hoeven
|
61577e0df7
|
[FIX] fixed merge conflicts
|
2020-10-21 20:56:38 +02:00 |
|
Sem van der Hoeven
|
298bd760e5
|
Merge remote-tracking branch 'origin/feature/sendingCanvasData' into setupBranch
|
2020-10-21 20:45:51 +02:00 |
|
Dogukan
|
a4e45b1a6b
|
[MISC] tried to send the message to the current lobby, didn't work.
|
2020-10-21 20:43:28 +02:00 |
|
Sem van der Hoeven
|
95448832c3
|
[ADD] added get lobby for users method
|
2020-10-21 20:42:00 +02:00 |
|
Sem van der Hoeven
|
3a13314519
|
[FIX] fixed showing of players in lobbies when joining and hosting
|
2020-10-21 20:34:11 +02:00 |
|
Lars
|
4f07eeb95a
|
useless
|
2020-10-21 20:24:26 +02:00 |
|
Sem van der Hoeven
|
24701f8bb3
|
[FIX] fix users not being sent with lobbies
|
2020-10-21 19:35:52 +02:00 |
|
Dogukan
|
74f8e868f6
|
[ADDITION] servercommunication towards the client.
Still in progress not functional because of a null exception when receiving the broadcast message.
|
2020-10-21 17:47:48 +02:00 |
|
Dogukan
|
381c142eaa
|
[ADDITION] Added databinding to the chatbox function.
Tried to broadcast the message, doesn't work yet.
|
2020-10-20 23:54:29 +02:00 |
|
Lars
|
2aeca40aa4
|
its not working yet, its getting a System.OutOfMemoryException, needs to be fixed
|
2020-10-20 23:52:10 +02:00 |
|
Sem van der Hoeven
|
76cd392525
|
[ADD] added joining lobbies
|
2020-10-20 22:49:25 +02:00 |
|
Sem van der Hoeven
|
7b30911cd7
|
[ADD] added hosting a lobby
|
2020-10-20 22:16:19 +02:00 |
|
Sem van der Hoeven
|
671951c35b
|
[ADD] added sending the lobbies data from the server to the clients on startup
|
2020-10-20 21:12:31 +02:00 |
|
Sem van der Hoeven
|
b1237e53a2
|
[EDIT] made method for getting in lobby
|
2020-10-20 19:34:24 +02:00 |
|
Sem van der Hoeven
|
a837611317
|
[ADD] made join buttons disabled when starting a game
|
2020-10-20 19:26:11 +02:00 |
|
Sem van der Hoeven
|
1552479f4d
|
[FIX] made mainwindow MVVM
|
2020-10-20 19:25:56 +02:00 |
|
Sem van der Hoeven
|
f1a47b509d
|
[ADD] added mvvm button commands for host and join
|
2020-10-20 18:55:12 +02:00 |
|
Sem van der Hoeven
|
33574a7b23
|
[FIX] fixed server client message structure
|
2020-10-20 17:43:28 +02:00 |
|
Lars
|
1a539efdd1
|
Merge remote-tracking branch 'origin/setupBranch' into setupBranch
|
2020-10-20 16:38:59 +02:00 |
|
Lars
|
84bf1b3e64
|
[ADDED] the inlog screen and a data singleton for the client
|
2020-10-20 16:36:34 +02:00 |
|
Sem van der Hoeven
|
78c1aad696
|
[ADD] new constructor for user
|
2020-10-20 15:32:50 +02:00 |
|
Sem van der Hoeven
|
1e11bc5416
|
[FIX] removed bad getter for model
|
2020-10-20 15:21:11 +02:00 |
|
Dogukan
|
eb7b8e2584
|
[Addition] Added a chatbox function!
|
2020-10-19 22:40:58 +02:00 |
|
lars
|
e792d28746
|
CANVAS WORKS
|
2020-10-13 14:49:43 +02:00 |
|