Commit Graph
364 Commits
Author SHA1 Message Date
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
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
Sem van der Hoeven b519f33cb5 added new user when username not in file 2020-10-14 13:21:12 +02:00
Sem van der Hoeven 8263d51ca7 removed hashing username 2020-10-14 13:13:59 +02:00
fabjuuuh ecb3be2916 Merge branch 'newDoctor' into develop 2020-10-14 13:07:20 +02:00
fabjuuuh 25176dbaeb Connections shit 2020-10-14 13:05:56 +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
shinichi ee8333e6af try login failed popup to align
plz someone fix
2020-10-14 08:55:31 +02:00
shinichi 6ed069d0f3 Merge branch 'try-refactor-to-page' into develop 2020-10-14 08:43:11 +02:00
shinichi fd4fcd0e51 Merge branch 'develop' into try-refactor-to-page 2020-10-14 08:42:53 +02:00
shinichi 073aa8c79a now pages
background image doesn't work so it is lime
2020-10-14 08:42:40 +02:00