Commit Graph

26 Commits

Author SHA1 Message Date
Dogukan
5b5d66c41b [ADDITION] Tried to send the random word to a lobby 2020-10-22 13:55:19 +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
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
Lars
2aeca40aa4 its not working yet, its getting a System.OutOfMemoryException, needs to be fixed 2020-10-20 23:52:10 +02:00
Sem van der Hoeven
76cd392525 [ADD] added joining lobbies 2020-10-20 22:49:25 +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
Dogukan
4d161391b1 Merge remote-tracking branch 'origin/setupBranch' into setupBranch 2020-10-20 19:53:35 +02:00
Dogukan
7dbdcc8bcc [ADDITION] fixed the chatbox size 2020-10-20 19:53:28 +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
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
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
Dogukan
eb7b8e2584 [Addition] Added a chatbox function! 2020-10-19 22:40:58 +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
f5453d2f56 [ADDED] title change 2020-10-13 15:16:54 +02:00
lars
e792d28746 CANVAS WORKS 2020-10-13 14:49:43 +02:00