Commit Graph

34 Commits

Author SHA1 Message Date
Sem van der Hoeven
5f2e325cb1 [ADD] added chat to all method from docter, it works but there is sometimes an error in the doctor client app that the buffer in OnRead is full, so will try to fix that tomorrow 2020-10-27 21:35:07 +01:00
Sem van der Hoeven
cda8b47ca3 [
ADD] added message sending to all clients, doesn't work yet
2020-10-27 21:24:47 +01:00
fabjuuuh
960327a3e3 Merge remote-tracking branch 'origin/develop' into dataOnTabs 2020-10-19 14:05:55 +02:00
fabjuuuh
083f27411e chart 2020-10-19 14:02:42 +02:00
Sem van der Hoeven
fb443a33d7 add send message 2020-10-19 13:32:26 +02:00
Sem van der Hoeven
6a9e2b57ac Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-10-19 12:49:09 +02:00
Sem van der Hoeven
973ff20da4 small typo 2020-10-19 12:49:04 +02:00
shinichi
d98c32a508 Merge remote-tracking branch 'origin/develop' into develop 2020-10-19 12:24:09 +02:00
shinichi
dcf6c3c6d0 client can see if doctor connected 2020-10-19 12:23:52 +02:00
Sem van der Hoeven
689f7030e4 added displaying of last doctor message in vr scene 2020-10-19 12:20:26 +02:00
Sem van der Hoeven
31be096b94 added small comments 2020-10-19 11:57:42 +02:00
Sem van der Hoeven
6b355a0b72 added resistance editing from client to vr engine 2020-10-19 11:26:04 +02:00
fabjuuuh
783c40d7d3 rip 2020-10-19 11:14:05 +02:00
fabjuuuh
0427fa89aa Merge remote-tracking branch 'origin/develop' into newDoctor 2020-10-16 15:04:16 +02:00
fabjuuuh
173dbf2745 update 2020-10-16 15:02:26 +02:00
fabjuuuh
e3c580c8c2 Merge remote-tracking branch 'origin/develop' into newDoctor 2020-10-16 12:51:42 +02:00
fabjuuuh
aadbbc16a9 Workinng on communication 2020-10-16 12:48:14 +02:00
shinichi
777ed65707 Merge branch 'develop' into doctor-client-connecting 2020-10-16 12:19:04 +02:00
shinichi
44abffd7e7 closing windows works 2020-10-16 12:18:46 +02:00
Sem van der Hoeven
2f81f32a03 added checking for response from vr engine and automatic reconnect 2020-10-16 12:15:58 +02:00
shinichi
6ec09ec995 error catching 2020-10-16 10:51:45 +02:00
shinichi
dc2b2f06ae move styles to sharedproject and disposed client 2020-10-14 16:28:37 +02:00
fabjuuuh
6e534c318b Merge branch 'develop' into newDoctor 2020-10-14 15:21:03 +02:00
Sem van der Hoeven
c5c74a3d7a moved dataparser to util 2020-10-14 14:59:00 +02:00
Sem van der Hoeven
037d7732f7 changed name from hasher to util 2020-10-14 14:55:31 +02:00
fabjuuuh
af5dca25f4 Remove Tabs when disconnect 2020-10-14 14:35:14 +02:00
Sem van der Hoeven
8263d51ca7 removed hashing username 2020-10-14 13:13:59 +02:00
Sem van der Hoeven
f6e5152939 connect new gui to vr engine 2020-10-09 16:58:39 +02:00
Sem van der Hoeven
bcdf8587c0 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-10-09 12:49:22 +02:00
Sem van der Hoeven
5cc008cd03 merged client and clientapp 2020-10-09 12:49:06 +02:00
shinichi
50a2ae9521 added popup not binded yet 2020-10-09 12:18:34 +02:00
shinichi
a23b268dc9 login working
uuuuggglyyyyyyyyyyyyyy :(
2020-10-07 19:45:20 +02:00
shinichi
7bf5bdb1ce delete 2020-10-07 18:34:04 +02:00
shinichi
46083b3912 copy 2020-10-07 17:56:21 +02:00