Commit Graph

73 Commits

Author SHA1 Message Date
Logophilist
8385f09313 Bike animation added 2020-10-19 14:25:09 +02: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
shinichi
de9716128c restyle tabheader 2020-10-19 14:02:03 +02:00
Sem van der Hoeven
c50f898ec0 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-10-19 13:32:33 +02:00
Sem van der Hoeven
fb443a33d7 add send message 2020-10-19 13:32:26 +02:00
shinichi
134bf235c3 multiple clients works 2020-10-19 13:24:38 +02:00
shinichi
bc738d0fa3 Merge remote-tracking branch 'origin/develop' into develop 2020-10-19 12:52:39 +02:00
shinichi
2ecc90ff2c doctor can now disconnect 2020-10-19 12:52:35 +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
shinichi
9ef51ddeca connecting to doctor after works 2020-10-16 12:18:03 +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
Sem van der Hoeven
014191b350 smol fix 2020-10-16 11:27:12 +02:00
Sem van der Hoeven
1c3e48f676 added ralfs message display on vr panel into engineconnection 2020-10-16 11:23:52 +02:00
shinichi
6ec09ec995 error catching 2020-10-16 10:51:45 +02:00
shinichi
29037f1774 status is now shown by image 2020-10-16 10:41:38 +02:00
shinichi
5280e70feb wip 2020-10-16 10:13:59 +02:00
shinichi
dc2b2f06ae move styles to sharedproject and disposed client 2020-10-14 16:28:37 +02:00
shinichi
adf8435822 got rid of navigation ui 2020-10-14 15:53:52 +02:00
shinichi
ed19714338 Merge branch 'develop' into window-restyle 2020-10-14 15:30:00 +02:00
shinichi
c13cdf64b6 window works 2020-10-14 15:29:19 +02:00
fabjuuuh
6e534c318b Merge branch 'develop' into newDoctor 2020-10-14 15:21:03 +02:00
Sem van der Hoeven
11ebc67c13 moved observableobject to util 2020-10-14 15:01:13 +02:00
Sem van der Hoeven
c5c74a3d7a moved dataparser to util 2020-10-14 14:59:00 +02:00
shinichi
756c646b93 before removing shadows 2020-10-14 14:55:58 +02:00
Sem van der Hoeven
037d7732f7 changed name from hasher to util 2020-10-14 14:55:31 +02:00
Sem van der Hoeven
91a20e0af7 set doctor of communication when doctor logs in 2020-10-14 14:49:53 +02:00
fabjuuuh
af5dca25f4 Remove Tabs when disconnect 2020-10-14 14:35:14 +02:00
shinichi
6bec8f1651 wip 2020-10-14 14:35:02 +02:00
Sem van der Hoeven
8263d51ca7 removed hashing username 2020-10-14 13:13:59 +02:00
Sem van der Hoeven
c9c0cf35a0 removed maincommand from placehouse sig 2020-10-14 13:05:55 +02:00
Sem van der Hoeven
568896c28d fully added the vr engine stuff to the client app 2020-10-14 12:21:53 +02:00
shinichi
56de6cfa24 wip 2020-10-14 12:05:28 +02:00
Sem van der Hoeven
22021dc821 removed vr engine retry button 2020-10-14 11:28:28 +02:00
Sem van der Hoeven
ea3afdeda1 added automatic reconnect to vr engine 2020-10-14 11:19:39 +02:00
shinichi
3822508b4c added empty resource files 2020-10-14 09:53:49 +02:00
shinichi
2e5dbeee14 added icon 2020-10-14 09:34:47 +02:00