SemvdH
|
9fa231ab00
|
Merge pull request #7 from SemvdH/fix-async-stuff
merge Fix async stuff into master
|
2020-10-22 17:02:30 +02:00 |
|
SemvdH
|
5075f285d1
|
Merge branch 'master' into feature/jsonForWords
|
2020-10-22 17:01:28 +02:00 |
|
Sem van der Hoeven
|
bb289865b7
|
[ADD] added message received ok
|
2020-10-22 16:34:31 +02:00 |
|
Dogukan
|
3b667b3f0c
|
[ADDITION] tried to fix the async methods.
|
2020-10-22 16:11:19 +02:00 |
|
Dogukan
|
5b5d66c41b
|
[ADDITION] Tried to send the random word to a lobby
|
2020-10-22 13:55:19 +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 |
|
Dogukan
|
ef255e4828
|
[ADDED] a start for reading the random word from a file
|
2020-10-22 01:37:59 +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
|
442cdccc49
|
[ADD] add updating lobbies on exiting window
|
2020-10-21 21:40:35 +02:00 |
|
Sem van der Hoeven
|
61577e0df7
|
[FIX] fixed merge conflicts
|
2020-10-21 20:56:38 +02:00 |
|
Dogukan
|
a4e45b1a6b
|
[MISC] tried to send the message to the current lobby, didn't work.
|
2020-10-21 20:43:28 +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
|
24701f8bb3
|
[FIX] fix users not being sent with lobbies
|
2020-10-21 19:35:52 +02:00 |
|
Dogukan
|
74f8e868f6
|
[ADDITION] servercommunication towards the client.
Still in progress not functional because of a null exception when receiving the broadcast message.
|
2020-10-21 17:47:48 +02:00 |
|
Dogukan
|
381c142eaa
|
[ADDITION] Added databinding to the chatbox function.
Tried to broadcast the message, doesn't work yet.
|
2020-10-20 23:54:29 +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
|
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
|
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
|
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 |
|
Sem van der Hoeven
|
d41a2d2668
|
[EDIT] smol line edit
|
2020-10-19 22:41:15 +02:00 |
|
Lars
|
0b12e530aa
|
[ADDED] User the shared project + integrated it with the other classes
|
2020-10-19 22:32:50 +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
|
3dc641680d
|
added template for receiving json chat message
|
2020-10-13 10:56:13 +02:00 |
|
Sem van der Hoeven
|
7879aa301d
|
wpf sucks
|
2020-10-12 16:32:23 +02:00 |
|
Sem van der Hoeven
|
fd4b3d179a
|
added clientserverutil?
|
2020-10-12 14:12:29 +02:00 |
|
lars
|
de0b12267b
|
removed client server util
|
2020-10-12 14:03:13 +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 |
|