sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170 Commits 17 Branches 0 Tags
master
Commit Graph

170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sem van der Hoeven
09f9e227b8 merge stuff 2020-10-22 22:35:29 +02:00
SemvdH
ec156f3dc6 Merge pull request #8 from SemvdH/stateful-canvas 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 2020-10-22 22:31:09 +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
242c435ac7 added something little, not that very important tho 2020-10-22 17:46:45 +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
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
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
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
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
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