 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 |
|
|
Lars
|
1a539efdd1
|
Merge remote-tracking branch 'origin/setupBranch' into setupBranch
|
2020-10-20 16:38:59 +02:00 |
|
|
Lars
|
84bf1b3e64
|
[ADDED] the inlog screen and a data singleton for the client
|
2020-10-20 16:36:34 +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 |
|
|
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 |
|