sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131 Commits 17 Branches 0 Tags
92f57a87bc36d7bc479f82c40c797737de6c3a24
Commit Graph
77 Commits
Author SHA1 Message Date
Sem van der Hoeven da5528c7b2 added updating scores on lobby list receive 2020-10-23 13:58:44 +02:00
SemvdH e2f9dfec78 Merge branch 'master' into feature/playerList 2020-10-23 12:53:35 +02:00
Dogukan 97be0f937c [Cleanup] cleaned a null checking if-statement for the lobby id 2020-10-23 12:42:24 +02:00
Dogukan 09056818df Merge remote-tracking branch 'origin/feature/playerList' into feature/playerList 2020-10-23 12:33:06 +02:00
Dogukan 8d4f72c09d [CHANGED] Static function for handling to callbacks 2020-10-23 12:32:11 +02:00
Sem van der Hoeven f51d310787 [EDIT] removed uneccesary call to updatelobbies 2020-10-23 12:31:01 +02:00
Sem van der Hoeven 9e829c47ff [FIX] lobbies now get correctly updated when someone leaves or joins 2020-10-23 12:26:31 +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 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 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
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
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 c339746a82 [ADD] add closing method 2020-10-21 21:05:04 +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 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