sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108 Commits 17 Branches 0 Tags
d37696d4bddc20d4b03604c209c4f3167a3b15f9
Commit Graph
65 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Sem van der Hoeven c150bf3611 [FIX] fixed handling client disconnect 2020-10-21 22:54:37 +02:00
Sem van der Hoeven e8a72e164f add try catch 2020-10-21 22:41:39 +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
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
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
Sem van der Hoeven fc5d51a876 [FIX] made user host when hosting a lobby 2020-10-21 19:38:40 +02:00
Sem van der Hoeven 24701f8bb3 [FIX] fix users not being sent with lobbies 2020-10-21 19:35:52 +02:00
Sem van der Hoeven 76cd392525 [ADD] added joining lobbies 2020-10-20 22:49:25 +02:00
Sem van der Hoeven 7b30911cd7 [ADD] added hosting a lobby 2020-10-20 22:16:19 +02:00
Sem van der Hoeven 671951c35b [ADD] added sending the lobbies data from the server to the clients on startup 2020-10-20 21:12:31 +02:00
Sem van der Hoeven ba1b71d870 [AD 
D] added lobby add methods
 2020-10-20 19:55:36 +02:00
Sem van der Hoeven 3255ae885b [ADD] added lobby identifier enum 2020-10-20 19:40:10 +02:00
Sem van der Hoeven b1237e53a2 [EDIT] made method for getting in lobby 2020-10-20 19:34:24 +02:00
Sem van der Hoeven a837611317 [ADD] made join buttons disabled when starting a game 2020-10-20 19:26:11 +02:00
Sem van der Hoeven 1552479f4d [FIX] made mainwindow MVVM 2020-10-20 19:25:56 +02:00
Sem van der Hoeven f1a47b509d [ADD] added mvvm button commands for host and join 2020-10-20 18:55:12 +02:00
Sem van der Hoeven 73dc0b94de [EDIT] made main window open only when the client has connected 2020-10-20 18:27:53 +02:00
Sem van der Hoeven f6c70bc717 [FIX] message can now be 4 bytes long 2020-10-20 18:17:42 +02:00
Sem van der Hoeven 33574a7b23 [FIX] fixed server client message structure 2020-10-20 17:43:28 +02:00
Sem van der Hoeven e90d782887 [EDIT] edited servercommunication methods to use serverclient users 2020-10-20 16:34:29 +02:00
Sem van der Hoeven 0009393960 [ADD] added username handling sending with json convert 2020-10-20 16:31:59 +02:00
Sem van der Hoeven 5732f0b31d [ADD] add constant identifiers to JSONConvert and made serverclient and client use them 2020-10-20 15:50:26 +02:00
Sem van der Hoeven d9f2b97d3e [ADD] added method for generating a message 2020-10-20 15:46:28 +02:00
Sem van der Hoeven 78c1aad696 [ADD] new constructor for user 2020-10-20 15:32:50 +02:00
Sem van der Hoeven 1e11bc5416 [FIX] removed bad getter for model 2020-10-20 15:21:11 +02:00
Sem van der Hoeven 3aaff90178 [EDIT] fixed some user stuff 2020-10-20 15:14:48 +02:00
Sem van der Hoeven d41a2d2668 [EDIT] smol line edit 2020-10-19 22:41:15 +02:00
Sem van der Hoeven 31f377c6f3 Merge branch 'setupBranch' of https://github.com/SemvdH/Csharp-eindproject into setupBranch 2020-10-13 15:12:23 +02:00
Sem van der Hoeven 3d3dff2339 add serverclients to lobby 2020-10-13 15:12:09 +02:00
Sem van der Hoeven 245130a648 wpf sucks v2 2020-10-13 14:15:38 +02:00
Sem van der Hoeven fd3b926316 add todos 2020-10-13 13:33:02 +02:00
Sem van der Hoeven 1ae1b628f3 added methods to send to all in lobby 2020-10-13 13:28:18 +02:00
Sem van der Hoeven 9bd45a5ba6 added clients connected 2020-10-13 11:11:51 +02:00
Sem van der Hoeven 3dc641680d added template for receiving json chat message 2020-10-13 10:56:13 +02:00
Sem van der Hoeven 514460781b added switch for incoming network data 2020-10-13 10:23:06 +02:00
Sem van der Hoeven 66efaf736d fix smol bug 2020-10-13 09:42:24 +02:00
Sem van der Hoeven 64615feb5e added comments 2020-10-12 19:51:14 +02:00
Sem van der Hoeven bd94747da6 added send to all method 2020-10-12 19:41:22 +02:00
Sem van der Hoeven 958d27c80d made serverConnection true thread safe singleton 2020-10-12 19:38:21 +02:00
Sem van der Hoeven 934c1cd48b added test bool to server gui 2020-10-12 16:53:15 +02:00
Sem van der Hoeven 7879aa301d wpf sucks 2020-10-12 16:32:23 +02:00
Sem van der Hoeven 6967fb625d moved mainwindow to views folder 2020-10-12 14:39:09 +02:00
Sem van der Hoeven fd4b3d179a added clientserverutil? 2020-10-12 14:12:29 +02:00
Sem van der Hoeven 419c03970a weird stuff 2020-10-12 14:01:55 +02:00
Sem van der Hoeven 90b3a130cc added empty project 2020-09-29 17:37:55 +02:00
Sem van der Hoeven b1774ec39d added csharp to gitignore 2020-09-29 17:29:49 +02:00