shinichi
|
e9e3381960
|
icon works
|
2020-10-16 16:32:17 +02:00 |
|
shinichi
|
75ff7fe336
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-10-16 16:24:13 +02:00 |
|
shinichi
|
cc046d6611
|
wip
|
2020-10-16 16:24:07 +02:00 |
|
Sem van der Hoeven
|
a76433803c
|
Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop
|
2020-10-16 15:39:28 +02:00 |
|
Sem van der Hoeven
|
ae01646de6
|
added doctor icon
|
2020-10-16 15:39:17 +02:00 |
|
shinichi
|
e8a4901f09
|
fix
|
2020-10-16 15:15:09 +02:00 |
|
fabjuuuh
|
b868515ade
|
Merge branch 'newDoctor' into develop
|
2020-10-16 15:06:52 +02:00 |
|
fabjuuuh
|
93eeea856f
|
errors
|
2020-10-16 15:06:38 +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 |
|
shinichi
|
fd9b321292
|
doctor can see patients who logged on before
|
2020-10-16 15:02:19 +02:00 |
|
fabjuuuh
|
e3c580c8c2
|
Merge remote-tracking branch 'origin/develop' into newDoctor
|
2020-10-16 12:51:42 +02:00 |
|
shinichi
|
6fb9d0efaa
|
Merge branch 'doctor-client-connecting' into develop
|
2020-10-16 12:49:18 +02:00 |
|
shinichi
|
540a640bc6
|
removed debuggers
|
2020-10-16 12:49:06 +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
|
2ebfea1a01
|
Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop
|
2020-10-16 12:16:06 +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 |
|
fabjuuuh
|
b31fa293fb
|
Commands
|
2020-10-16 11:42:32 +02:00 |
|
Sem van der Hoeven
|
014191b350
|
smol fix
|
2020-10-16 11:27:12 +02:00 |
|
shinichi
|
ac11f6c53b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-10-16 11:25:39 +02:00 |
|
shinichi
|
5bacfdc8ce
|
added so only one doctor can login to server
|
2020-10-16 11:25:35 +02:00 |
|
Sem van der Hoeven
|
effdd887af
|
Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop
|
2020-10-16 11:24:08 +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
|
df37c9bd58
|
made doctor window fancy
|
2020-10-16 11:18:29 +02:00 |
|
shinichi
|
6ec09ec995
|
error catching
|
2020-10-16 10:51:45 +02:00 |
|
shinichi
|
813545c2da
|
Merge branch 'ValueConverters' into develop
|
2020-10-16 10:41:52 +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
|
94be6fd22d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-10-14 16:28:41 +02:00 |
|
shinichi
|
dc2b2f06ae
|
move styles to sharedproject and disposed client
|
2020-10-14 16:28:37 +02:00 |
|
Sem van der Hoeven
|
30c5d5a2a3
|
add message to server switch
|
2020-10-14 15:58:06 +02:00 |
|
shinichi
|
bbb0220c11
|
Merge branch 'window-restyle' into develop
|
2020-10-14 15:54:02 +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 |
|
Sem van der Hoeven
|
e226ab586e
|
added message method to dataparser
|
2020-10-14 15:27:35 +02:00 |
|
fabjuuuh
|
6e534c318b
|
Merge branch 'develop' into newDoctor
|
2020-10-14 15:21:03 +02:00 |
|
fabjuuuh
|
d8a3baeec1
|
Relaycommands
|
2020-10-14 15:19:43 +02:00 |
|
Sem van der Hoeven
|
ea4093ff75
|
added message to dataparser
|
2020-10-14 15:19:20 +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 |
|
fabjuuuh
|
3547207cad
|
Merge branch 'develop' into newDoctor
|
2020-10-14 13:51:19 +02:00 |
|