Commit Graph

  • df37c9bd58 made doctor window fancy shinichi 2020-10-16 11:18:29 +02:00
  • 6ec09ec995 error catching shinichi 2020-10-16 10:51:45 +02:00
  • 813545c2da Merge branch 'ValueConverters' into develop shinichi 2020-10-16 10:41:52 +02:00
  • 29037f1774 status is now shown by image shinichi 2020-10-16 10:41:38 +02:00
  • 5280e70feb wip shinichi 2020-10-16 10:13:59 +02:00
  • 94be6fd22d Merge remote-tracking branch 'origin/develop' into develop shinichi 2020-10-14 16:28:41 +02:00
  • dc2b2f06ae move styles to sharedproject and disposed client shinichi 2020-10-14 16:28:37 +02:00
  • 30c5d5a2a3 add message to server switch Sem van der Hoeven 2020-10-14 15:58:06 +02:00
  • bbb0220c11 Merge branch 'window-restyle' into develop shinichi 2020-10-14 15:54:02 +02:00
  • adf8435822 got rid of navigation ui shinichi 2020-10-14 15:53:52 +02:00
  • ed19714338 Merge branch 'develop' into window-restyle shinichi 2020-10-14 15:30:00 +02:00
  • c13cdf64b6 window works shinichi 2020-10-14 15:29:19 +02:00
  • e226ab586e added message method to dataparser Sem van der Hoeven 2020-10-14 15:27:35 +02:00
  • 6e534c318b Merge branch 'develop' into newDoctor fabjuuuh 2020-10-14 15:21:03 +02:00
  • d8a3baeec1 Relaycommands fabjuuuh 2020-10-14 15:19:43 +02:00
  • ea4093ff75 added message to dataparser Sem van der Hoeven 2020-10-14 15:19:20 +02:00
  • 11ebc67c13 moved observableobject to util Sem van der Hoeven 2020-10-14 15:01:13 +02:00
  • c5c74a3d7a moved dataparser to util Sem van der Hoeven 2020-10-14 14:59:00 +02:00
  • 756c646b93 before removing shadows shinichi 2020-10-14 14:55:58 +02:00
  • 037d7732f7 changed name from hasher to util Sem van der Hoeven 2020-10-14 14:55:31 +02:00
  • 91a20e0af7 set doctor of communication when doctor logs in Sem van der Hoeven 2020-10-14 14:49:53 +02:00
  • af5dca25f4 Remove Tabs when disconnect fabjuuuh 2020-10-14 14:35:14 +02:00
  • 6bec8f1651 wip shinichi 2020-10-14 14:35:02 +02:00
  • 3547207cad Merge branch 'develop' into newDoctor fabjuuuh 2020-10-14 13:51:19 +02:00
  • b519f33cb5 added new user when username not in file Sem van der Hoeven 2020-10-14 13:21:12 +02:00
  • 8263d51ca7 removed hashing username Sem van der Hoeven 2020-10-14 13:13:59 +02:00
  • ecb3be2916 Merge branch 'newDoctor' into develop fabjuuuh 2020-10-14 13:07:20 +02:00
  • 25176dbaeb Connections shit fabjuuuh 2020-10-14 13:05:56 +02:00
  • c9c0cf35a0 removed maincommand from placehouse sig Sem van der Hoeven 2020-10-14 13:05:55 +02:00
  • 568896c28d fully added the vr engine stuff to the client app Sem van der Hoeven 2020-10-14 12:21:53 +02:00
  • 56de6cfa24 wip shinichi 2020-10-14 12:05:28 +02:00
  • 22021dc821 removed vr engine retry button Sem van der Hoeven 2020-10-14 11:28:28 +02:00
  • ea3afdeda1 added automatic reconnect to vr engine Sem van der Hoeven 2020-10-14 11:19:39 +02:00
  • 3822508b4c added empty resource files shinichi 2020-10-14 09:53:49 +02:00
  • 2e5dbeee14 added icon shinichi 2020-10-14 09:34:47 +02:00
  • ee8333e6af try login failed popup to align shinichi 2020-10-14 08:55:31 +02:00
  • 6ed069d0f3 Merge branch 'try-refactor-to-page' into develop shinichi 2020-10-14 08:43:11 +02:00
  • fd4fcd0e51 Merge branch 'develop' into try-refactor-to-page shinichi 2020-10-14 08:42:53 +02:00
  • 073aa8c79a now pages shinichi 2020-10-14 08:42:40 +02:00
  • 301f6b447f Progress fabjuuuh 2020-10-12 16:50:02 +02:00
  • df5e276eb3 Vastgelopen fabjuuuh 2020-10-12 12:50:38 +02:00
  • 87e199d1b5 Showing message on panel Logophilist 2020-10-12 09:01:33 +02:00
  • 9761d189ec background image shinichi 2020-10-09 17:05:11 +02:00
  • 8ad861e18a conflicts Sem van der Hoeven 2020-10-09 16:59:31 +02:00
  • f6e5152939 connect new gui to vr engine Sem van der Hoeven 2020-10-09 16:58:39 +02:00
  • c8a812508f added folder for future use shinichi 2020-10-09 16:29:18 +02:00
  • 5fcf0d177b wip shinichi 2020-10-09 16:22:28 +02:00
  • 278a5adb5e change doctor password field to passwordbox shinichi 2020-10-09 16:03:49 +02:00
  • 528f515e0b Merge remote-tracking branch 'origin/develop' into develop shinichi 2020-10-09 15:37:30 +02:00
  • b4088f5d30 edited focusable shinichi 2020-10-09 15:37:23 +02:00
  • 34eed08234 Fixed grass texture, houses and time of day Logophilist 2020-10-09 15:35:54 +02:00
  • e410e9ec88 login failed popup shows shinichi 2020-10-09 15:07:27 +02:00
  • 4afbbe4c38 Thread.sleep graph fabjuuuh 2020-10-09 12:57:48 +02:00
  • 25d0bda483 added new reference Sem van der Hoeven 2020-10-09 12:52:14 +02:00
  • fafc96ad6a removed client Sem van der Hoeven 2020-10-09 12:50:46 +02:00
  • bcdf8587c0 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop Sem van der Hoeven 2020-10-09 12:49:22 +02:00
  • 5cc008cd03 merged client and clientapp Sem van der Hoeven 2020-10-09 12:49:06 +02:00
  • b642e17268 readded clientapp Sem van der Hoeven 2020-10-09 12:35:56 +02:00
  • 749498ba5b graph fabjuuuh 2020-10-09 12:33:35 +02:00
  • bcc479cf33 temp Sem van der Hoeven 2020-10-09 12:27:28 +02:00
  • 50a2ae9521 added popup not binded yet shinichi 2020-10-09 12:18:34 +02:00
  • c87c190d14 fix dataparser import Sem van der Hoeven 2020-10-09 12:06:24 +02:00
  • 8e48fe7902 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop Sem van der Hoeven 2020-10-09 12:02:34 +02:00
  • 39b935ecbc o p t i m i z e Sem van der Hoeven 2020-10-09 12:02:23 +02:00
  • 68994fd3fe added BLEHANDLER tag to blehandler cw Sem van der Hoeven 2020-10-09 12:02:03 +02:00
  • adf6073e42 added client project reference to server Sem van der Hoeven 2020-10-09 12:01:48 +02:00
  • 94d1c07c99 added client project reference to server Sem van der Hoeven 2020-10-09 12:01:34 +02:00
  • 2aa736b0a8 formatted speed to show km/h too Sem van der Hoeven 2020-10-09 12:01:23 +02:00
  • b5ea137bad removed 20 second sleep Sem van der Hoeven 2020-10-09 12:00:51 +02:00
  • dffeb39337 mainView is now binded shinichi 2020-10-09 11:40:52 +02:00
  • 2cb3fd5ec3 ble and simulation stop when window closes shinichi 2020-10-09 11:33:26 +02:00
  • 124eee5f12 implemented stop for BLEHandler and BikeSimulator shinichi 2020-10-09 11:16:51 +02:00
  • ab9180281e Merge branch 'dokter' into develop fabjuuuh 2020-10-09 10:57:16 +02:00
  • a043cdc723 Merge branch 'develop' into dokter fabjuuuh 2020-10-09 10:56:48 +02:00
  • 143f7e4d88 Merge branch 'move-Client-to-ClientApp' into develop shinichi 2020-10-07 21:21:19 +02:00
  • e09f4f1325 changed names shinichi 2020-10-07 21:21:12 +02:00
  • a23b268dc9 login working shinichi 2020-10-07 19:45:20 +02:00
  • 7bf5bdb1ce delete shinichi 2020-10-07 18:34:04 +02:00
  • 46083b3912 copy shinichi 2020-10-07 17:56:21 +02:00
  • 187beaf6c1 Merge branch 'develop' into Client-GUI shinichi 2020-10-07 16:42:17 +02:00
  • d6da6b18c4 added value update to panel and adjusted speed to match, only need to display speed with 1 decimal Sem van der Hoeven 2020-10-07 16:40:41 +02:00
  • 04b0051e72 Merge branch 'develop' into Client-GUI shinichi 2020-10-07 16:32:42 +02:00
  • 91bb0d65b7 added status shinichi 2020-10-07 16:31:44 +02:00
  • fc0e70403f Icon en livechart library dokter fabjuuuh 2020-10-07 16:16:52 +02:00
  • 847fa68acb fix for displaying things on vr scene Sem van der Hoeven 2020-10-07 16:06:16 +02:00
  • d7dfe32cc3 wip shinichi 2020-10-07 15:49:57 +02:00
  • 651a44762b input test Sem van der Hoeven 2020-10-07 15:15:42 +02:00
  • 6159f3f57b added login logic and text shinichi 2020-10-07 15:14:39 +02:00
  • 046389f3b7 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop Sem van der Hoeven 2020-10-07 15:09:16 +02:00
  • 57aa9b6deb finished reconnecting on sim not started and then sending the commands Sem van der Hoeven 2020-10-07 15:08:45 +02:00
  • acbe3e9d55 Connect new tab fabjuuuh 2020-10-07 14:56:04 +02:00
  • aea1b4fce4 connectie met server fabjuuuh 2020-10-07 13:21:30 +02:00
  • 6e2b3a80b3 wip shinichi 2020-10-07 13:17:40 +02:00
  • 26a784277a Panel now shows more data Logophilist 2020-10-07 12:58:50 +02:00
  • bff4718d3f added route to client vr scene Sem van der Hoeven 2020-10-07 12:51:09 +02:00
  • 499134fa9a Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop Sem van der Hoeven 2020-10-07 12:22:25 +02:00
  • f5eb59694e added comments Sem van der Hoeven 2020-10-07 12:22:10 +02:00
  • 71ff5dfc81 Merge branch 'fix-getBPMgraphdata' into develop shinichi 2020-10-07 11:55:56 +02:00
  • 472c514275 removed debugging shinichi 2020-10-07 11:55:49 +02:00
  • 7c943f4f73 fix shinichi 2020-10-07 11:54:47 +02:00