23 Commits
Author SHA1 Message Date
SemvdH 302536575c Merge pull request #18 from SemvdH/feature/test/gameCommands
Feature/test/game commands
2020-10-23 23:57:26 +02:00
SemvdH 53c0cd515d Merge branch 'master' into feature/test/gameCommands 2020-10-23 23:57:18 +02:00
SemvdH b13493537e Merge pull request #17 from SemvdH/feature/test/testCanvasMessages
merge testcanvas messages in to master
2020-10-23 23:46:50 +02:00
SemvdH 9292919f26 Merge pull request #16 from SemvdH/feature/test/testUserMessages
merge test user messages in master
2020-10-23 23:35:38 +02:00
SemvdH 8018c9c6af Merge pull request #15 from SemvdH/feature/test/testLobbyMessages
merge lobby tests in master
2020-10-23 23:35:08 +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
SemvdH 87ebdeef58 Merge pull request #13 from SemvdH/feature/timer
Feature/timer
2020-10-23 15:45:12 +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
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
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
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
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
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
SemvdH b08e6cc749 Merge pull request #4 from SemvdH/feature/disconnect
merge Feature/disconnect into master
2020-10-21 22:55:28 +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
SemvdH 754c1c5db9 Merge pull request #2 from SemvdH/feature/leaveLobby
merge Feature/leave lobby into master
2020-10-21 22:34:27 +02:00
SemvdH 0f01354b72 Merge pull request #1 from SemvdH/setupBranch
merge Setup branch into develop
2020-10-21 20:59:02 +02:00
SemvdH dd0016a93b Initial commit 2020-09-29 17:25:26 +02:00