Commit Graph

30 Commits

Author SHA1 Message Date
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
eae05d17df [ADDED] Color can now we transfered, still need to get fixed with the buffer -_- 2020-10-22 17:30:40 +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
bb289865b7 [ADD] added message received ok 2020-10-22 16:34:31 +02:00
Dogukan
3b667b3f0c [ADDITION] tried to fix the async methods. 2020-10-22 16:11:19 +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
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
ef255e4828 [ADDED] a start for reading the random word from a file 2020-10-22 01:37:59 +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
Sem van der Hoeven
442cdccc49 [ADD] add updating lobbies on exiting window 2020-10-21 21:40:35 +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
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
3255ae885b [ADD] added lobby identifier enum 2020-10-20 19:40:10 +02:00
Sem van der Hoeven
f6c70bc717 [FIX] message can now be 4 bytes long 2020-10-20 18:17:42 +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
d41a2d2668 [EDIT] smol line edit 2020-10-19 22:41:15 +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