Commit Graph

Select branches

Hide Pull Requests

feature/addChatBoxToGameWindow

feature/broadcastChatMsg

feature/disconnect

feature/guesedWord

feature/handleChatData

feature/jsonForWords

feature/leaveLobby

feature/playerList

feature/sendingCanvasData

feature/test/gameCommands

feature/test/testCanvasMessages

feature/test/testUserMessages

hotfix/fixClientServerComms

lobbies

master

setupBranch

stateful-canvas

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 302536575c Merge pull request #18 from SemvdH/feature/test/gameCommands master SemvdH 2020-10-23 23:57:26 +02:00
• 53c0cd515d Merge branch 'master' into feature/test/gameCommands feature/test/gameCommands SemvdH 2020-10-23 23:57:18 +02:00
• 3963e07568 [ADDITION] Game command unit tests Dogukan 2020-10-23 23:51:38 +02:00
• b13493537e Merge pull request #17 from SemvdH/feature/test/testCanvasMessages SemvdH 2020-10-23 23:46:50 +02:00
• 9199265eb6 [TESTS] tests for the canvas feature/test/testCanvasMessages Lars 2020-10-23 23:45:52 +02:00
• 9292919f26 Merge pull request #16 from SemvdH/feature/test/testUserMessages SemvdH 2020-10-23 23:35:38 +02:00
• 8018c9c6af Merge pull request #15 from SemvdH/feature/test/testLobbyMessages SemvdH 2020-10-23 23:35:08 +02:00
• 880d4b4424 [TEST] added test file Sem van der Hoeven 2020-10-23 23:34:29 +02:00
• 7601db667c Merge branch 'feature/test/testCanvasMessages' into feature/test/gameCommands Dogukan 2020-10-23 23:28:18 +02:00
• 7f8dfc0f9c [ADDITION] Added username tests, as well as random word tests. feature/test/testUserMessages Dogukan 2020-10-23 23:27:37 +02:00
• b1b03e136d Some tests Lars 2020-10-23 23:26:31 +02:00
• 5ac4b59e38 test Sem van der Hoeven 2020-10-23 22:25:50 +02:00
• 3c1f1a0028 rename Sem van der Hoeven 2020-10-23 22:25:13 +02:00
• e7b40d7e64 [ADD] test Sem van der Hoeven 2020-10-23 22:23:08 +02:00
• 27e70d1ec0 [FIX] tests?? Sem van der Hoeven 2020-10-23 22:04:36 +02:00
• 0e6a2bab59 Merge branch 'master' of https://github.com/SemvdH/Csharp-eindproject Sem van der Hoeven 2020-10-23 21:14:26 +02:00
• 125f4c0410 [ADD] added 2 test methods Sem van der Hoeven 2020-10-23 21:14:16 +02:00
• b9b217622a Merge remote-tracking branch 'origin/master' Lars 2020-10-23 21:07:27 +02:00
• 2d4540e28e [DELETED] something Lars 2020-10-23 21:07:12 +02:00
• 052f07db93 [ADD] added test project for real Sem van der Hoeven 2020-10-23 21:05:05 +02:00
• 898b579ca9 Merge branch 'master' of https://github.com/SemvdH/Csharp-eindproject Sem van der Hoeven 2020-10-23 21:04:29 +02:00
• 39ded8524b [ADD] added test project Sem van der Hoeven 2020-10-23 21:04:22 +02:00
• 398ba1d5bd [ADDED] other canvas can be reset via an other canvas Lars 2020-10-23 21:04:14 +02:00
• 8ca4efc296 stuff Sem van der Hoeven 2020-10-23 20:45:25 +02:00
• 3015c0312f [FIX] fix double drawing Sem van der Hoeven 2020-10-23 20:33:47 +02:00
• 3c0f5018db [TRYING] Lars 2020-10-23 20:26:05 +02:00
• 7ce04447d0 [FIX] fixed canvas data being sent to person drawing setupBranch Sem van der Hoeven 2020-10-23 17:44:39 +02:00
• 2d64accf09 [EDIT] made loginviewmodel kinda mvvm Sem van der Hoeven 2020-10-23 17:35:33 +02:00
• 1d8963ec60 [REMOVE] removed the checks for who is host Sem van der Hoeven 2020-10-23 17:27:43 +02:00
• 13cf0e44ee [ADDED] a begin for the turn base Lars 2020-10-23 16:46:29 +02:00
• eee4f0347f Merge branch 'master' into setupBranch Lars 2020-10-23 15:54:21 +02:00
• 9558c75eab Merge pull request #14 from SemvdH/feature/guesedWord SemvdH 2020-10-23 15:51:30 +02:00
• ec08fbfced [ADDITION] added a new property to the user (may be removed later on), and made a check for the random word feature/guesedWord Dogukan 2020-10-23 15:47:52 +02:00
• 87ebdeef58 Merge pull request #13 from SemvdH/feature/timer SemvdH 2020-10-23 15:45:12 +02:00
• bf09dba850 [ADD] added timer start on next round message receive Sem van der Hoeven 2020-10-23 15:44:18 +02:00
• fd59368c03 Merge branch 'master' into setupBranch Lars 2020-10-23 14:59:41 +02:00
• b14a7691b5 Merge pull request #12 from SemvdH/hotfix/fixClientServerComms SemvdH 2020-10-23 14:56:45 +02:00
• 7df48ab322 [FIX] Callbacks weren't properly called hotfix/fixClientServerComms Dogukan 2020-10-23 14:49:20 +02:00
• 6512518fb7 [FIX] made first user in lobby a host if the host leaves Sem van der Hoeven 2020-10-23 14:30:16 +02:00
• 80d970da35 [FIX] made login impossible if no name was entered Sem van der Hoeven 2020-10-23 14:13:22 +02:00
• 2c7bf3e217 Merge pull request #11 from SemvdH/setupBranch SemvdH 2020-10-23 14:06:36 +02:00
• 92f57a87bc Merge pull request #10 from SemvdH/update-scores SemvdH 2020-10-23 13:59:28 +02:00
• da5528c7b2 added updating scores on lobby list receive Sem van der Hoeven 2020-10-23 13:58:44 +02:00
• c16f7cf68f Merge branch 'master' into setupBranch Lars 2020-10-23 13:11:56 +02:00
• 5c2dea3ab4 Merge pull request #9 from SemvdH/feature/playerList SemvdH 2020-10-23 12:53:43 +02:00
• e2f9dfec78 Merge branch 'master' into feature/playerList feature/playerList SemvdH 2020-10-23 12:53:35 +02:00
• 7fcf424b65 [FIX] fixed the async for updating the label, as well as the chat messages Dogukan 2020-10-23 12:48:27 +02:00
• 97be0f937c [Cleanup] cleaned a null checking if-statement for the lobby id Dogukan 2020-10-23 12:42:24 +02:00
• 09056818df Merge remote-tracking branch 'origin/feature/playerList' into feature/playerList Dogukan 2020-10-23 12:33:06 +02:00
• 8d4f72c09d [CHANGED] Static function for handling to callbacks Dogukan 2020-10-23 12:32:11 +02:00
• f51d310787 [EDIT] removed uneccesary call to updatelobbies Sem van der Hoeven 2020-10-23 12:31:01 +02:00
• 9e829c47ff [FIX] lobbies now get correctly updated when someone leaves or joins Sem van der Hoeven 2020-10-23 12:26:31 +02:00
• f5d55ef405 [FIX] randomword is not visible Lars 2020-10-23 11:54:43 +02:00
• 0d44b2d840 [TRY] tried to bind the label data, doesn't work yet Dogukan 2020-10-23 11:30:06 +02:00
• 1c04ab95c0 [ADDED] player list in lobby updates on join! Not on disconnect yet. Tried to set the word label doesn't work yet. Dogukan 2020-10-22 23:54:07 +02:00
• ddf4594c5e [ADD] add canvas data sending on mouse up Sem van der Hoeven 2020-10-22 22:47:11 +02:00
• 09f9e227b8 merge stuff Sem van der Hoeven 2020-10-22 22:35:29 +02:00
• ec156f3dc6 Merge pull request #8 from SemvdH/stateful-canvas SemvdH 2020-10-22 22:31:09 +02:00
• 0158841159 Merge branch 'master' into stateful-canvas stateful-canvas SemvdH 2020-10-22 22:30:42 +02:00
• 8a490eb399 [FIX] AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA Sem van der Hoeven 2020-10-22 22:22:24 +02:00
• 5e408091cb the fuck????? Sem van der Hoeven 2020-10-22 22:04:20 +02:00
• 24eb43239b [FIX] nog when you click host, you are able to click the start game button Lars 2020-10-22 22:02:41 +02:00
• 335d17838c Merge branch 'master' into setupBranch Lars 2020-10-22 20:04:30 +02:00
• 242c435ac7 added something little, not that very important tho Lars 2020-10-22 17:46:45 +02:00
• eae05d17df [ADDED] Color can now we transfered, still need to get fixed with the buffer -_- Lars 2020-10-22 17:30:40 +02:00
• d37696d4bd [FIX] made message sending statful Sem van der Hoeven 2020-10-22 17:11:55 +02:00
• 4a400628df [FIX] merge stuff Sem van der Hoeven 2020-10-22 17:05:02 +02:00
• 9fa231ab00 Merge pull request #7 from SemvdH/fix-async-stuff SemvdH 2020-10-22 17:02:30 +02:00
• 21ee724056 Merge pull request #6 from SemvdH/feature/jsonForWords SemvdH 2020-10-22 17:01:41 +02:00
• 5075f285d1 Merge branch 'master' into feature/jsonForWords feature/jsonForWords SemvdH 2020-10-22 17:01:28 +02:00
• eca17cc70f [FIX] handled disconnects for everything Sem van der Hoeven 2020-10-22 17:00:26 +02:00
• 07b0357b0a Merge branch 'feature/jsonForWords' into fix-async-stuff Sem van der Hoeven 2020-10-22 16:37:05 +02:00
• d8bbaf5258 Merge branch 'feature/jsonForWords' of https://github.com/SemvdH/Csharp-eindproject into feature/jsonForWords Sem van der Hoeven 2020-10-22 16:36:45 +02:00
• 8190d9b31b [ADDITION] added a wait one to the client onread Dogukan 2020-10-22 16:36:00 +02:00
• bb289865b7 [ADD] added message received ok Sem van der Hoeven 2020-10-22 16:34:31 +02:00
• b8d0f206ba [FIX] IT FUCKING WORKS Dogukan 2020-10-22 16:34:02 +02:00
• f1878eaf25 Merge branch 'feature/jsonForWords' of https://github.com/SemvdH/Csharp-eindproject into feature/jsonForWords Sem van der Hoeven 2020-10-22 16:16:08 +02:00
• 3b667b3f0c [ADDITION] tried to fix the async methods. Dogukan 2020-10-22 16:11:19 +02:00
• 1fdba622cc Merge branch 'master' into setupBranch Lars 2020-10-22 15:46:20 +02:00
• cac0fdc0a4 [ADDED] lobby now secured when the game starts. start button is still for everyone available, not working yet Lars 2020-10-22 15:40:09 +02:00
• 674c4f1ba1 Merge branch 'feature/jsonForWords' of https://github.com/SemvdH/Csharp-eindproject into feature/jsonForWords Sem van der Hoeven 2020-10-22 13:55:49 +02:00
• d3bd1418d1 line Sem van der Hoeven 2020-10-22 13:55:46 +02:00
• 5b5d66c41b [ADDITION] Tried to send the random word to a lobby Dogukan 2020-10-22 13:55:19 +02:00
• d4d0545f0b Merge pull request #5 from SemvdH/feature/hostWhenEnterEmptyLobby SemvdH 2020-10-22 13:23:30 +02:00
• 0b72c4dc9b [ADD] added that when you join an empty lobby you become the host Sem van der Hoeven 2020-10-22 13:22:52 +02:00
• 471247827b [ADD] added host user check to join Sem van der Hoeven 2020-10-22 13:13:57 +02:00
• ef255e4828 [ADDED] a start for reading the random word from a file Dogukan 2020-10-22 01:37:59 +02:00
• 8190724f77 [ADDED] canvas data sending to the server works, but not fully yet to all the clients Lars 2020-10-21 23:18:37 +02:00
• b08e6cc749 Merge pull request #4 from SemvdH/feature/disconnect SemvdH 2020-10-21 22:55:28 +02:00
• c150bf3611 [FIX] fixed handling client disconnect feature/disconnect Sem van der Hoeven 2020-10-21 22:54:37 +02:00
• 332fcf799c Merge pull request #3 from SemvdH/feature/handleChatData SemvdH 2020-10-21 22:45:21 +02:00
• 4d3dda023c Merge branch 'master' into feature/handleChatData feature/handleChatData Dogukan 2020-10-21 22:43:18 +02:00
• e8a72e164f add try catch Sem van der Hoeven 2020-10-21 22:41:39 +02:00
• d5d6d59690 [FIX] fixed the broadcast for the chat messages. Dogukan 2020-10-21 22:40:36 +02:00
• 754c1c5db9 Merge pull request #2 from SemvdH/feature/leaveLobby SemvdH 2020-10-21 22:34:27 +02:00
• 8a90e74e74 [FIX] fixed leaving lobby feature/leaveLobby Sem van der Hoeven 2020-10-21 22:32:56 +02:00
• be99c8d3f9 [FIX] fixed equals operators Sem van der Hoeven 2020-10-21 22:18:37 +02:00
• 9e1ac07b80 [ADD] added equals operators Sem van der Hoeven 2020-10-21 22:03:20 +02:00
• cc5c71a30f [ADD] added buttons reenabled when leaving Sem van der Hoeven 2020-10-21 21:55:28 +02:00
• 442cdccc49 [ADD] add updating lobbies on exiting window Sem van der Hoeven 2020-10-21 21:40:35 +02:00