Sem van der Hoeven
|
1d8963ec60
|
[REMOVE] removed the checks for who is host
|
2020-10-23 17:27:43 +02:00 |
|
Lars
|
13cf0e44ee
|
[ADDED] a begin for the turn base
|
2020-10-23 16:46:29 +02:00 |
|
Dogukan
|
7df48ab322
|
[FIX] Callbacks weren't properly called
|
2020-10-23 14:49:20 +02:00 |
|
SemvdH
|
2c7bf3e217
|
Merge pull request #11 from SemvdH/setupBranch
merge Setup branch into master
|
2020-10-23 14:06:36 +02:00 |
|
Sem van der Hoeven
|
da5528c7b2
|
added updating scores on lobby list receive
|
2020-10-23 13:58:44 +02:00 |
|
Lars
|
c16f7cf68f
|
Merge branch 'master' into setupBranch
|
2020-10-23 13:11:56 +02:00 |
|
SemvdH
|
e2f9dfec78
|
Merge branch 'master' into feature/playerList
|
2020-10-23 12:53:35 +02:00 |
|
Dogukan
|
8d4f72c09d
|
[CHANGED] Static function for handling to callbacks
|
2020-10-23 12:32:11 +02:00 |
|
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
|
ddf4594c5e
|
[ADD] add canvas data sending on mouse up
|
2020-10-22 22:47:11 +02:00 |
|
Sem van der Hoeven
|
09f9e227b8
|
merge stuff
|
2020-10-22 22:35:29 +02:00 |
|
SemvdH
|
0158841159
|
Merge branch 'master' into stateful-canvas
|
2020-10-22 22:30:42 +02:00 |
|
Sem van der Hoeven
|
8a490eb399
|
[FIX] AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
2020-10-22 22:22:24 +02:00 |
|
Sem van der Hoeven
|
5e408091cb
|
the fuck?????
|
2020-10-22 22:04:20 +02:00 |
|
Lars
|
24eb43239b
|
[FIX] nog when you click host, you are able to click the start game button
|
2020-10-22 22:02:41 +02:00 |
|
Lars
|
335d17838c
|
Merge branch 'master' into setupBranch
|
2020-10-22 20:04:30 +02:00 |
|
Lars
|
eae05d17df
|
[ADDED] Color can now we transfered, still need to get fixed with the buffer -_-
|
2020-10-22 17:30:40 +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
|
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 |
|
Lars
|
1fdba622cc
|
Merge branch 'master' into setupBranch
|
2020-10-22 15:46:20 +02:00 |
|
Lars
|
cac0fdc0a4
|
[ADDED] lobby now secured when the game starts. start button is still for everyone available, not working yet
|
2020-10-22 15:40:09 +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 |
|
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 |
|
Lars
|
8190724f77
|
[ADDED] canvas data sending to the server works, but not fully yet to all the clients
|
2020-10-21 23:18:37 +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 |
|