Commit Graph
158 Commits
Author SHA1 Message Date
Sem van der Hoeven 3c1f1a0028 rename 2020-10-23 22:25:13 +02:00
Sem van der Hoeven e7b40d7e64 [ADD] test 2020-10-23 22:23:08 +02:00
Sem van der Hoeven 27e70d1ec0 [FIX] tests?? 2020-10-23 22:04:36 +02:00
Sem van der Hoeven 0e6a2bab59 Merge branch 'master' of https://github.com/SemvdH/Csharp-eindproject 2020-10-23 21:14:26 +02:00
Sem van der Hoeven 125f4c0410 [ADD] added 2 test methods 2020-10-23 21:14:16 +02:00
Lars b9b217622a Merge remote-tracking branch 'origin/master' 2020-10-23 21:07:27 +02:00
Lars 2d4540e28e [DELETED] something 2020-10-23 21:07:12 +02:00
Sem van der Hoeven 052f07db93 [ADD] added test project for real 2020-10-23 21:05:05 +02:00
Sem van der Hoeven 898b579ca9 Merge branch 'master' of https://github.com/SemvdH/Csharp-eindproject 2020-10-23 21:04:29 +02:00
Sem van der Hoeven 39ded8524b [ADD] added test project 2020-10-23 21:04:22 +02:00
Lars 398ba1d5bd [ADDED] other canvas can be reset via an other canvas 2020-10-23 21:04:14 +02:00
Sem van der Hoeven 8ca4efc296 stuff 2020-10-23 20:45:25 +02:00
Sem van der Hoeven 3015c0312f [FIX] fix double drawing 2020-10-23 20:33:47 +02:00
Lars 3c0f5018db [TRYING] 2020-10-23 20:26:05 +02:00
SemvdH 9558c75eab Merge pull request #14 from SemvdH/feature/guesedWord
[ADDITION] added a new property to the user (may be removed later on)…
2020-10-23 15:51:30 +02:00
Dogukan ec08fbfced [ADDITION] added a new property to the user (may be removed later on), and made a check for the random word 2020-10-23 15:47:52 +02:00
SemvdH 87ebdeef58 Merge pull request #13 from SemvdH/feature/timer
Feature/timer
2020-10-23 15:45:12 +02:00
Sem van der Hoeven bf09dba850 [ADD] added timer start on next round message receive 2020-10-23 15:44:18 +02:00
SemvdH b14a7691b5 Merge pull request #12 from SemvdH/hotfix/fixClientServerComms
[FIX] Callbacks weren't properly called
2020-10-23 14:56:45 +02:00
Dogukan 7df48ab322 [FIX] Callbacks weren't properly called 2020-10-23 14:49:20 +02:00
Sem van der Hoeven 6512518fb7 [FIX] made first user in lobby a host if the host leaves 2020-10-23 14:30:16 +02:00
Sem van der Hoeven 80d970da35 [FIX] made login impossible if no name was entered 2020-10-23 14:13:22 +02:00
SemvdH 2c7bf3e217 Merge pull request #11 from SemvdH/setupBranch
merge Setup branch into master
2020-10-23 14:06:36 +02:00
SemvdH 92f57a87bc Merge pull request #10 from SemvdH/update-scores
added updating scores on lobby list receive
2020-10-23 13:59:28 +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 5c2dea3ab4 Merge pull request #9 from SemvdH/feature/playerList
Feature/player list
2020-10-23 12:53:43 +02:00
SemvdH e2f9dfec78 Merge branch 'master' into feature/playerList 2020-10-23 12:53:35 +02:00
Dogukan 7fcf424b65 [FIX] fixed the async for updating the label, as well as the chat messages 2020-10-23 12:48:27 +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 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