Commit Graph

44 Commits

Author SHA1 Message Date
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
Lars
55425bbec4 for some reason, didnt added this stuff-_- 2020-10-20 13:03:04 +02:00
Lars
f1901f0c35 added something to the user 2020-10-19 23:07:48 +02:00
Dogukan
f5c67fc2da Merge branch 'feature/addChatBoxToGameWindow' into setupBranch 2020-10-19 22:41:54 +02:00
Sem van der Hoeven
d41a2d2668 [EDIT] smol line edit 2020-10-19 22:41:15 +02:00
Dogukan
eb7b8e2584 [Addition] Added a chatbox function! 2020-10-19 22:40:58 +02:00
Lars
0b12e530aa [ADDED] User the shared project + integrated it with the other classes 2020-10-19 22:32:50 +02:00
Dogukan
35917e547a Added a border to the game window 2020-10-17 12:10:23 +02:00
lars
53c8a435a3 [ADDED] made a color picker for the canvas 2020-10-15 21:36:06 +02:00
lars
2c5ab12d94 the labels, not working but there are for the players. (future use) 2020-10-13 15:21:22 +02:00
lars
4aadf5c0c9 Merge remote-tracking branch 'origin/setupBranch' into setupBranch 2020-10-13 15:17:01 +02:00
lars
f5453d2f56 [ADDED] title change 2020-10-13 15:16:54 +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
lars
e792d28746 CANVAS WORKS 2020-10-13 14:49:43 +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
lars
52e83f111a Merge remote-tracking branch 'origin/setupBranch' into setupBranch 2020-10-13 11:49:40 +02:00
lars
d84899a712 [ADDED] lobby to the shared project and almost done with start GUI 2020-10-13 11:49:31 +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
lars
3b8ba77eca Merge remote-tracking branch 'origin/setupBranch' into setupBranch 2020-10-12 14:03:20 +02:00
lars
de0b12267b removed client server util 2020-10-12 14:03:13 +02:00
Sem van der Hoeven
419c03970a weird stuff 2020-10-12 14:01:55 +02:00
lars
1827cc6f21 Filled up the client server util 2020-10-12 13:59:36 +02:00
lars
9bf58f8339 [Removed] An old project. [ADDED] shared project for the client and serv 2020-10-12 13:54:13 +02:00
lars
3d381ae843 [ADDED] client and server project (both are WPF projects)) 2020-10-12 13:46:41 +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
SemvdH
dd0016a93b Initial commit 2020-09-29 17:25:26 +02:00