Lars
|
f5d55ef405
|
[FIX] randomword is not visible
|
2020-10-23 11:54:43 +02:00 |
|
Dogukan
|
0d44b2d840
|
[TRY] tried to bind the label data, doesn't work yet
|
2020-10-23 11:30:06 +02:00 |
|
Dogukan
|
1c04ab95c0
|
[ADDED] player list in lobby updates on join! Not on disconnect yet. Tried to set the word label doesn't work yet.
|
2020-10-22 23:54:07 +02:00 |
|
Sem van der Hoeven
|
d37696d4bd
|
[FIX] made message sending statful
|
2020-10-22 17:11:55 +02:00 |
|
Sem van der Hoeven
|
4a400628df
|
[FIX] merge stuff
|
2020-10-22 17:05:02 +02:00 |
|
SemvdH
|
9fa231ab00
|
Merge pull request #7 from SemvdH/fix-async-stuff
merge Fix async stuff into master
|
2020-10-22 17:02:30 +02:00 |
|
SemvdH
|
21ee724056
|
Merge pull request #6 from SemvdH/feature/jsonForWords
Feature/json for words
|
2020-10-22 17:01:41 +02:00 |
|
SemvdH
|
5075f285d1
|
Merge branch 'master' into feature/jsonForWords
|
2020-10-22 17:01:28 +02:00 |
|
Sem van der Hoeven
|
eca17cc70f
|
[FIX] handled disconnects for everything
|
2020-10-22 17:00:26 +02:00 |
|
Sem van der Hoeven
|
07b0357b0a
|
Merge branch 'feature/jsonForWords' into fix-async-stuff
|
2020-10-22 16:37:05 +02:00 |
|
Sem van der Hoeven
|
d8bbaf5258
|
Merge branch 'feature/jsonForWords' of https://github.com/SemvdH/Csharp-eindproject into feature/jsonForWords
|
2020-10-22 16:36:45 +02:00 |
|
Dogukan
|
8190d9b31b
|
[ADDITION] added a wait one to the client onread
|
2020-10-22 16:36:00 +02:00 |
|
Sem van der Hoeven
|
bb289865b7
|
[ADD] added message received ok
|
2020-10-22 16:34:31 +02:00 |
|
Dogukan
|
b8d0f206ba
|
[FIX] IT FUCKING WORKS
|
2020-10-22 16:34:02 +02:00 |
|
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 |
|
SemvdH
|
d4d0545f0b
|
Merge pull request #5 from SemvdH/feature/hostWhenEnterEmptyLobby
merge Feature/host when enter empty lobby into master
|
2020-10-22 13:23:30 +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 |
|
Sem van der Hoeven
|
471247827b
|
[ADD] added host user check to join
|
2020-10-22 13:13:57 +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 |
|
Sem van der Hoeven
|
c150bf3611
|
[FIX] fixed handling client disconnect
|
2020-10-21 22:54:37 +02:00 |
|
SemvdH
|
332fcf799c
|
Merge pull request #3 from SemvdH/feature/handleChatData
merga Feature/handle chat data in master
|
2020-10-21 22:45:21 +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 |
|
SemvdH
|
754c1c5db9
|
Merge pull request #2 from SemvdH/feature/leaveLobby
merge Feature/leave lobby into master
|
2020-10-21 22:34:27 +02:00 |
|
Sem van der Hoeven
|
8a90e74e74
|
[FIX] fixed leaving lobby
|
2020-10-21 22:32:56 +02:00 |
|
Sem van der Hoeven
|
be99c8d3f9
|
[FIX] fixed equals operators
|
2020-10-21 22:18:37 +02:00 |
|
Sem van der Hoeven
|
9e1ac07b80
|
[ADD] added equals operators
|
2020-10-21 22:03:20 +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
|
c339746a82
|
[ADD] add closing method
|
2020-10-21 21:05:04 +02:00 |
|
SemvdH
|
0f01354b72
|
Merge pull request #1 from SemvdH/setupBranch
merge Setup branch into develop
|
2020-10-21 20:59:02 +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 |
|
Sem van der Hoeven
|
c4c97a3fbe
|
Merge branch 'lobbies' into setupBranch
|
2020-10-21 20:44:11 +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
|
fc5d51a876
|
[FIX] made user host when hosting a lobby
|
2020-10-21 19:38:40 +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 |
|