sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • c339746a82 [ADD] add closing method Sem van der Hoeven 2020-10-21 21:05:04 +02:00
  • 35ded2b5ea Merge branch 'master' into feature/sendingCanvasData feature/sendingCanvasData Lars 2020-10-21 21:01:58 +02:00
  • 0f01354b72 Merge pull request #1 from SemvdH/setupBranch SemvdH 2020-10-21 20:59:02 +02:00
  • 61577e0df7 [FIX] fixed merge conflicts Sem van der Hoeven 2020-10-21 20:56:38 +02:00
  • 298bd760e5 Merge remote-tracking branch 'origin/feature/sendingCanvasData' into setupBranch Sem van der Hoeven 2020-10-21 20:45:51 +02:00
  • c4c97a3fbe Merge branch 'lobbies' into setupBranch Sem van der Hoeven 2020-10-21 20:44:11 +02:00
  • a4e45b1a6b [MISC] tried to send the message to the current lobby, didn't work. feature/broadcastChatMsg Dogukan 2020-10-21 20:43:28 +02:00
  • 95448832c3 [ADD] added get lobby for users method lobbies Sem van der Hoeven 2020-10-21 20:42:00 +02:00
  • 3a13314519 [FIX] fixed showing of players in lobbies when joining and hosting Sem van der Hoeven 2020-10-21 20:34:11 +02:00
  • 4f07eeb95a useless Lars 2020-10-21 20:24:26 +02:00
  • fc5d51a876 [FIX] made user host when hosting a lobby Sem van der Hoeven 2020-10-21 19:38:40 +02:00
  • 24701f8bb3 [FIX] fix users not being sent with lobbies Sem van der Hoeven 2020-10-21 19:35:52 +02:00
  • 74f8e868f6 [ADDITION] servercommunication towards the client. Dogukan 2020-10-21 17:47:48 +02:00
  • 381c142eaa [ADDITION] Added databinding to the chatbox function. Dogukan 2020-10-20 23:54:29 +02:00
  • 2aeca40aa4 its not working yet, its getting a System.OutOfMemoryException, needs to be fixed Lars 2020-10-20 23:52:10 +02:00
  • 76cd392525 [ADD] added joining lobbies Sem van der Hoeven 2020-10-20 22:49:25 +02:00
  • 7b30911cd7 [ADD] added hosting a lobby Sem van der Hoeven 2020-10-20 22:16:19 +02:00
  • 671951c35b [ADD] added sending the lobbies data from the server to the clients on startup Sem van der Hoeven 2020-10-20 21:12:31 +02:00
  • ba1b71d870 [AD D] added lobby add methods Sem van der Hoeven 2020-10-20 19:55:36 +02:00
  • 4d161391b1 Merge remote-tracking branch 'origin/setupBranch' into setupBranch Dogukan 2020-10-20 19:53:35 +02:00
  • 7dbdcc8bcc [ADDITION] fixed the chatbox size Dogukan 2020-10-20 19:53:28 +02:00
  • 3255ae885b [ADD] added lobby identifier enum Sem van der Hoeven 2020-10-20 19:40:10 +02:00
  • b1237e53a2 [EDIT] made method for getting in lobby Sem van der Hoeven 2020-10-20 19:34:24 +02:00
  • a837611317 [ADD] made join buttons disabled when starting a game Sem van der Hoeven 2020-10-20 19:26:11 +02:00
  • 1552479f4d [FIX] made mainwindow MVVM Sem van der Hoeven 2020-10-20 19:25:56 +02:00
  • f1a47b509d [ADD] added mvvm button commands for host and join Sem van der Hoeven 2020-10-20 18:55:12 +02:00
  • 73dc0b94de [EDIT] made main window open only when the client has connected Sem van der Hoeven 2020-10-20 18:27:53 +02:00
  • f6c70bc717 [FIX] message can now be 4 bytes long Sem van der Hoeven 2020-10-20 18:17:42 +02:00
  • 33574a7b23 [FIX] fixed server client message structure Sem van der Hoeven 2020-10-20 17:43:28 +02:00
  • 1a539efdd1 Merge remote-tracking branch 'origin/setupBranch' into setupBranch Lars 2020-10-20 16:38:59 +02:00
  • 84bf1b3e64 [ADDED] the inlog screen and a data singleton for the client Lars 2020-10-20 16:36:34 +02:00
  • e90d782887 [EDIT] edited servercommunication methods to use serverclient users Sem van der Hoeven 2020-10-20 16:34:29 +02:00
  • 0009393960 [ADD] added username handling sending with json convert Sem van der Hoeven 2020-10-20 16:31:59 +02:00
  • 5732f0b31d [ADD] add constant identifiers to JSONConvert and made serverclient and client use them Sem van der Hoeven 2020-10-20 15:50:26 +02:00
  • d9f2b97d3e [ADD] added method for generating a message Sem van der Hoeven 2020-10-20 15:46:28 +02:00
  • 78c1aad696 [ADD] new constructor for user Sem van der Hoeven 2020-10-20 15:32:50 +02:00
  • 1e11bc5416 [FIX] removed bad getter for model Sem van der Hoeven 2020-10-20 15:21:11 +02:00
  • 3aaff90178 [EDIT] fixed some user stuff Sem van der Hoeven 2020-10-20 15:14:48 +02:00
  • 55425bbec4 for some reason, didnt added this stuff-_- Lars 2020-10-20 13:03:04 +02:00
  • f1901f0c35 added something to the user Lars 2020-10-19 23:07:48 +02:00
  • f5c67fc2da Merge branch 'feature/addChatBoxToGameWindow' into setupBranch Dogukan 2020-10-19 22:41:54 +02:00
  • d41a2d2668 [EDIT] smol line edit Sem van der Hoeven 2020-10-19 22:41:15 +02:00
  • eb7b8e2584 [Addition] Added a chatbox function! feature/addChatBoxToGameWindow Dogukan 2020-10-19 22:40:58 +02:00
  • 0b12e530aa [ADDED] User the shared project + integrated it with the other classes Lars 2020-10-19 22:32:50 +02:00
  • 35917e547a Added a border to the game window Dogukan 2020-10-17 12:10:23 +02:00
  • 53c8a435a3 [ADDED] made a color picker for the canvas lars 2020-10-15 21:36:06 +02:00
  • 2c5ab12d94 the labels, not working but there are for the players. (future use) lars 2020-10-13 15:21:22 +02:00
  • 4aadf5c0c9 Merge remote-tracking branch 'origin/setupBranch' into setupBranch lars 2020-10-13 15:17:01 +02:00
  • f5453d2f56 [ADDED] title change lars 2020-10-13 15:16:54 +02:00
  • 31f377c6f3 Merge branch 'setupBranch' of https://github.com/SemvdH/Csharp-eindproject into setupBranch Sem van der Hoeven 2020-10-13 15:12:23 +02:00
  • 3d3dff2339 add serverclients to lobby Sem van der Hoeven 2020-10-13 15:12:09 +02:00
  • e792d28746 CANVAS WORKS lars 2020-10-13 14:49:43 +02:00
  • 245130a648 wpf sucks v2 Sem van der Hoeven 2020-10-13 14:15:38 +02:00
  • fd3b926316 add todos Sem van der Hoeven 2020-10-13 13:33:02 +02:00
  • 1ae1b628f3 added methods to send to all in lobby Sem van der Hoeven 2020-10-13 13:28:18 +02:00
  • 52e83f111a Merge remote-tracking branch 'origin/setupBranch' into setupBranch lars 2020-10-13 11:49:40 +02:00
  • d84899a712 [ADDED] lobby to the shared project and almost done with start GUI lars 2020-10-13 11:49:31 +02:00
  • 9bd45a5ba6 added clients connected Sem van der Hoeven 2020-10-13 11:11:51 +02:00
  • 3dc641680d added template for receiving json chat message Sem van der Hoeven 2020-10-13 10:56:13 +02:00
  • 514460781b added switch for incoming network data Sem van der Hoeven 2020-10-13 10:23:06 +02:00
  • 66efaf736d fix smol bug Sem van der Hoeven 2020-10-13 09:42:24 +02:00
  • 64615feb5e added comments Sem van der Hoeven 2020-10-12 19:51:14 +02:00
  • bd94747da6 added send to all method Sem van der Hoeven 2020-10-12 19:41:22 +02:00
  • 958d27c80d made serverConnection true thread safe singleton Sem van der Hoeven 2020-10-12 19:38:21 +02:00
  • 934c1cd48b added test bool to server gui Sem van der Hoeven 2020-10-12 16:53:15 +02:00
  • 7879aa301d wpf sucks Sem van der Hoeven 2020-10-12 16:32:23 +02:00
  • 6967fb625d moved mainwindow to views folder Sem van der Hoeven 2020-10-12 14:39:09 +02:00
  • fd4b3d179a added clientserverutil? Sem van der Hoeven 2020-10-12 14:12:29 +02:00
  • 3b8ba77eca Merge remote-tracking branch 'origin/setupBranch' into setupBranch lars 2020-10-12 14:03:20 +02:00
  • de0b12267b removed client server util lars 2020-10-12 14:03:13 +02:00
  • 419c03970a weird stuff Sem van der Hoeven 2020-10-12 14:01:55 +02:00
  • 1827cc6f21 Filled up the client server util lars 2020-10-12 13:59:36 +02:00
  • 9bf58f8339 [Removed] An old project. [ADDED] shared project for the client and serv lars 2020-10-12 13:54:13 +02:00
  • 3d381ae843 [ADDED] client and server project (both are WPF projects)) lars 2020-10-12 13:46:41 +02:00
  • 90b3a130cc added empty project Sem van der Hoeven 2020-09-29 17:37:55 +02:00
  • b1774ec39d added csharp to gitignore Sem van der Hoeven 2020-09-29 17:29:49 +02:00
  • dd0016a93b Initial commit SemvdH 2020-09-29 17:25:26 +02:00