Sem van der Hoeven
|
f1878eaf25
|
Merge branch 'feature/jsonForWords' of https://github.com/SemvdH/Csharp-eindproject into feature/jsonForWords
|
2020-10-22 16:16:08 +02:00 |
|
Dogukan
|
3b667b3f0c
|
[ADDITION] tried to fix the async methods.
|
2020-10-22 16:11:19 +02:00 |
|
Sem van der Hoeven
|
674c4f1ba1
|
Merge branch 'feature/jsonForWords' of https://github.com/SemvdH/Csharp-eindproject into feature/jsonForWords
|
2020-10-22 13:55:49 +02:00 |
|
Sem van der Hoeven
|
d3bd1418d1
|
line
|
2020-10-22 13:55:46 +02:00 |
|
Dogukan
|
5b5d66c41b
|
[ADDITION] Tried to send the random word to a lobby
|
2020-10-22 13:55:19 +02:00 |
|
Dogukan
|
ef255e4828
|
[ADDED] a start for reading the random word from a file
|
2020-10-22 01:37:59 +02:00 |
|
SemvdH
|
b08e6cc749
|
Merge pull request #4 from SemvdH/feature/disconnect
merge Feature/disconnect into master
|
2020-10-21 22:55:28 +02:00 |
|
Dogukan
|
4d3dda023c
|
Merge branch 'master' into feature/handleChatData
|
2020-10-21 22:43:18 +02:00 |
|
Sem van der Hoeven
|
e8a72e164f
|
add try catch
|
2020-10-21 22:41:39 +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
|
3a13314519
|
[FIX] fixed showing of players in lobbies when joining and hosting
|
2020-10-21 20:34:11 +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 |
|
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
|
ba1b71d870
|
[AD
D] added lobby add methods
|
2020-10-20 19:55:36 +02:00 |
|
Sem van der Hoeven
|
33574a7b23
|
[FIX] fixed server client message structure
|
2020-10-20 17:43:28 +02:00 |
|
Sem van der Hoeven
|
0009393960
|
[ADD] added username handling sending with json convert
|
2020-10-20 16:31:59 +02:00 |
|
Sem van der Hoeven
|
5732f0b31d
|
[ADD] add constant identifiers to JSONConvert and made serverclient and client use them
|
2020-10-20 15:50:26 +02:00 |
|
Sem van der Hoeven
|
d9f2b97d3e
|
[ADD] added method for generating a message
|
2020-10-20 15:46:28 +02:00 |
|
Sem van der Hoeven
|
78c1aad696
|
[ADD] new constructor for user
|
2020-10-20 15:32:50 +02:00 |
|
Sem van der Hoeven
|
3d3dff2339
|
add serverclients to lobby
|
2020-10-13 15:12:09 +02:00 |
|
Sem van der Hoeven
|
fd3b926316
|
add todos
|
2020-10-13 13:33:02 +02:00 |
|
Sem van der Hoeven
|
1ae1b628f3
|
added methods to send to all in lobby
|
2020-10-13 13:28:18 +02:00 |
|
Sem van der Hoeven
|
3dc641680d
|
added template for receiving json chat message
|
2020-10-13 10:56:13 +02:00 |
|
Sem van der Hoeven
|
514460781b
|
added switch for incoming network data
|
2020-10-13 10:23:06 +02:00 |
|
Sem van der Hoeven
|
64615feb5e
|
added comments
|
2020-10-12 19:51:14 +02:00 |
|
Sem van der Hoeven
|
958d27c80d
|
made serverConnection true thread safe singleton
|
2020-10-12 19:38:21 +02:00 |
|
Sem van der Hoeven
|
7879aa301d
|
wpf sucks
|
2020-10-12 16:32:23 +02:00 |
|