Commit Graph

  • b2e1c90c16 Merge branch 'develop' master Sem van der Hoeven 2020-11-02 10:38:07 +01:00
  • 86a8b2b789 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop develop Sem van der Hoeven 2020-11-02 10:37:48 +01:00
  • aa2e16de89 fix Sem van der Hoeven 2020-11-02 10:37:40 +01:00
  • b112fc131e Merge pull request #11 from SemvdH/develop SemvdH 2020-10-30 00:00:03 +01:00
  • 6725f2ff85 [FIX] changes one line shinichi 2020-10-29 23:59:15 +01:00
  • 89fe104418 test Sem van der Hoeven 2020-10-29 23:52:30 +01:00
  • 2177f9bd19 Merge pull request #10 from SemvdH/develop SemvdH 2020-10-29 23:50:48 +01:00
  • 28dc2c2f9c Merge branch 'unittest-setup' into develop Sem van der Hoeven 2020-10-29 23:49:19 +01:00
  • cd1a95ae85 Merge branch 'unittest-setup' of https://github.com/SemvdH/Proftaak-RH-B4 into unittest-setup unittest-setup Sem van der Hoeven 2020-10-29 23:48:29 +01:00
  • cad1a508e6 tests Sem van der Hoeven 2020-10-29 23:48:20 +01:00
  • 06e1d1edee Last command tests Logophilist 2020-10-29 23:47:18 +01:00
  • 7c98aa6536 CommandTest Update Logophilist 2020-10-29 23:40:11 +01:00
  • d6cf5902da [ADD] update data in doctor applicatie shinichi 2020-10-29 23:32:47 +01:00
  • c1ee84fd2e [ADD] added test methods for bools Sem van der Hoeven 2020-10-29 23:31:56 +01:00
  • 9f7a01170b Merge branch 'gethistoricdata' into develop Sem van der Hoeven 2020-10-29 22:58:51 +01:00
  • 6dd9bd4107 [ADD] finished writing historic data to documents gethistoricdata Sem van der Hoeven 2020-10-29 22:57:50 +01:00
  • 4207eaefea [ADD] bike speed is set to 0 when session is not running shinichi 2020-10-29 22:57:10 +01:00
  • acc2fddf82 TerrainAdd, AddLayer, UpdateTerrain and renderTerrain tests done Logophilist 2020-10-29 22:51:47 +01:00
  • 87b9ee65d0 [ADD] added writing contents to file Sem van der Hoeven 2020-10-29 22:51:14 +01:00
  • a333d6cd8d UnitTesting set up completed Logophilist 2020-10-29 22:04:02 +01:00
  • dffdae2cb4 [EDIT] tried adding lots of bike data Sem van der Hoeven 2020-10-29 21:01:45 +01:00
  • baf89dac3f [ADD] added checking of all folders in username directory Sem van der Hoeven 2020-10-29 20:35:21 +01:00
  • b98ac77261 [EDIT] some comments Sem van der Hoeven 2020-10-29 17:44:47 +01:00
  • 1f163325cf [FIX] fixed the panel not showing, it was because of the animation. removed it for now and it works sendmessageToAllClients Sem van der Hoeven 2020-10-29 17:09:20 +01:00
  • 6d599cfcd2 wip gtg shinichi 2020-10-29 17:01:14 +01:00
  • 1c7f9cf70a [FIX] fixed doctor buffer overflow Sem van der Hoeven 2020-10-28 13:23:20 +01:00
  • c48e396e81 UnitTest Push Logophilist 2020-10-28 12:01:20 +01:00
  • 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 Sem van der Hoeven 2020-10-27 21:35:07 +01:00
  • cda8b47ca3 [ ADD] added message sending to all clients, doesn't work yet Sem van der Hoeven 2020-10-27 21:24:47 +01:00
  • fab3ed7705 [EDIT] made seperate method for sending message Sem van der Hoeven 2020-10-27 20:59:46 +01:00
  • da9d3184a1 token and volatile shinichi 2020-10-19 16:41:38 +02:00
  • 2b6ea121c9 Merge remote-tracking branch 'origin/develop' into develop fabjuuuh 2020-10-19 16:24:34 +02:00
  • 478a2daab7 hi fabjuuuh 2020-10-19 16:24:24 +02:00
  • 8b8dd901c7 Merge branch 'NextFocusOnEnter' into develop shinichi 2020-10-19 16:19:10 +02:00
  • aa5ea7a3e0 works kinda fabjuuuh 2020-10-19 16:13:51 +02:00
  • aeb5d59ce9 implemented nextfocuable NextFocusOnEnter shinichi 2020-10-19 15:32:14 +02:00
  • ab1662f0fe Merge branch 'develop' into NextFocusOnEnter shinichi 2020-10-19 15:15:34 +02:00
  • f07c3f9484 moving and fixing shinichi 2020-10-19 15:14:01 +02:00
  • 2adfcc5bd7 fix fabjuuuh 2020-10-19 15:13:27 +02:00
  • 3acdc942bc move files and copy code shinichi 2020-10-19 14:53:47 +02:00
  • 84cbcb4a6d send data to doctor shinichi 2020-10-19 14:35:51 +02:00
  • 8385f09313 Bike animation added Logophilist 2020-10-19 14:25:09 +02:00
  • 3ea42b65ed Merge branch 'dataOnTabs' into develop fabjuuuh 2020-10-19 14:11:59 +02:00
  • 55d3dd4eee actually fixed overflow exception Sem van der Hoeven 2020-10-19 14:09:03 +02:00
  • 960327a3e3 Merge remote-tracking branch 'origin/develop' into dataOnTabs dataOnTabs fabjuuuh 2020-10-19 14:05:55 +02:00
  • 083f27411e chart fabjuuuh 2020-10-19 14:02:42 +02:00
  • d9c8b7c6df Merge remote-tracking branch 'origin/develop' into develop shinichi 2020-10-19 14:02:07 +02:00
  • de9716128c restyle tabheader shinichi 2020-10-19 14:02:03 +02:00
  • f934dee2d0 made overflow return 255 instead of 0 Sem van der Hoeven 2020-10-19 14:01:39 +02:00
  • 107d95b81a fixed overflowexception Sem van der Hoeven 2020-10-19 13:59:47 +02:00
  • c50f898ec0 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop Sem van der Hoeven 2020-10-19 13:32:33 +02:00
  • fb443a33d7 add send message Sem van der Hoeven 2020-10-19 13:32:26 +02:00
  • 8249632d00 add set resistance Sem van der Hoeven 2020-10-19 13:31:29 +02:00
  • 134bf235c3 multiple clients works shinichi 2020-10-19 13:24:38 +02:00
  • bc738d0fa3 Merge remote-tracking branch 'origin/develop' into develop shinichi 2020-10-19 12:52:39 +02:00
  • 2ecc90ff2c doctor can now disconnect shinichi 2020-10-19 12:52:35 +02:00
  • 6a9e2b57ac Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop Sem van der Hoeven 2020-10-19 12:49:09 +02:00
  • 973ff20da4 small typo Sem van der Hoeven 2020-10-19 12:49:04 +02:00
  • d98c32a508 Merge remote-tracking branch 'origin/develop' into develop shinichi 2020-10-19 12:24:09 +02:00
  • dcf6c3c6d0 client can see if doctor connected shinichi 2020-10-19 12:23:52 +02:00
  • 689f7030e4 added displaying of last doctor message in vr scene Sem van der Hoeven 2020-10-19 12:20:26 +02:00
  • 4a238d9207 Auto stash before checking out "HEAD" shinichi 2020-10-19 12:07:00 +02:00
  • 31be096b94 added small comments Sem van der Hoeven 2020-10-19 11:57:42 +02:00
  • 7eb7b03d4f Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop Sem van der Hoeven 2020-10-19 11:55:34 +02:00
  • 17a17e3c6d added comments to dataparser Sem van der Hoeven 2020-10-19 11:55:20 +02:00
  • 163d2321cc username back added to tabs shinichi 2020-10-19 11:49:34 +02:00
  • c9e913474c Merge remote-tracking branch 'origin/develop' into develop shinichi 2020-10-19 11:26:18 +02:00
  • 63b5c6ab73 removed unnecessary code shinichi 2020-10-19 11:26:09 +02:00
  • 6b355a0b72 added resistance editing from client to vr engine Sem van der Hoeven 2020-10-19 11:26:04 +02:00
  • 9a46b17067 Merge remote-tracking branch 'origin/develop' into dataOnTabs fabjuuuh 2020-10-19 11:20:28 +02:00
  • b748bcf5c8 binded commands shinichi 2020-10-19 11:19:57 +02:00
  • 62525f3a23 Merge remote-tracking branch 'origin/develop' into dataOnTabs fabjuuuh 2020-10-19 11:14:57 +02:00
  • 783c40d7d3 rip fabjuuuh 2020-10-19 11:14:05 +02:00
  • e9e3381960 icon works shinichi 2020-10-16 16:32:17 +02:00
  • 75ff7fe336 Merge remote-tracking branch 'origin/develop' into develop shinichi 2020-10-16 16:24:13 +02:00
  • cc046d6611 wip shinichi 2020-10-16 16:24:07 +02:00
  • 5751bbed81 Progress with structure to send data fabjuuuh 2020-10-16 16:23:50 +02:00
  • a76433803c Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop Sem van der Hoeven 2020-10-16 15:39:28 +02:00
  • ae01646de6 added doctor icon Sem van der Hoeven 2020-10-16 15:39:17 +02:00
  • e8a4901f09 fix shinichi 2020-10-16 15:15:09 +02:00
  • b868515ade Merge branch 'newDoctor' into develop fabjuuuh 2020-10-16 15:06:52 +02:00
  • 93eeea856f errors fabjuuuh 2020-10-16 15:06:38 +02:00
  • 0427fa89aa Merge remote-tracking branch 'origin/develop' into newDoctor fabjuuuh 2020-10-16 15:04:16 +02:00
  • 173dbf2745 update newDoctor fabjuuuh 2020-10-16 15:02:26 +02:00
  • fd9b321292 doctor can see patients who logged on before shinichi 2020-10-16 15:02:19 +02:00
  • e3c580c8c2 Merge remote-tracking branch 'origin/develop' into newDoctor fabjuuuh 2020-10-16 12:51:42 +02:00
  • 6fb9d0efaa Merge branch 'doctor-client-connecting' into develop shinichi 2020-10-16 12:49:18 +02:00
  • 540a640bc6 removed debuggers shinichi 2020-10-16 12:49:06 +02:00
  • aadbbc16a9 Workinng on communication fabjuuuh 2020-10-16 12:48:14 +02:00
  • 777ed65707 Merge branch 'develop' into doctor-client-connecting shinichi 2020-10-16 12:19:04 +02:00
  • 44abffd7e7 closing windows works shinichi 2020-10-16 12:18:46 +02:00
  • 9ef51ddeca connecting to doctor after works shinichi 2020-10-16 12:18:03 +02:00
  • 2ebfea1a01 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop Sem van der Hoeven 2020-10-16 12:16:06 +02:00
  • 2f81f32a03 added checking for response from vr engine and automatic reconnect Sem van der Hoeven 2020-10-16 12:15:58 +02:00
  • b31fa293fb Commands fabjuuuh 2020-10-16 11:42:32 +02:00
  • 014191b350 smol fix Sem van der Hoeven 2020-10-16 11:27:12 +02:00
  • ac11f6c53b Merge remote-tracking branch 'origin/develop' into develop shinichi 2020-10-16 11:25:39 +02:00
  • 5bacfdc8ce added so only one doctor can login to server shinichi 2020-10-16 11:25:35 +02:00
  • effdd887af Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop Sem van der Hoeven 2020-10-16 11:24:08 +02:00
  • 1c3e48f676 added ralfs message display on vr panel into engineconnection Sem van der Hoeven 2020-10-16 11:23:52 +02:00