sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
411 Commits 15 Branches 0 Tags
3ea42b65ed7680bbaa900578d481cc233b338a46
Commit Graph
411 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
fabjuuuh 3ea42b65ed Merge branch 'dataOnTabs' into develop 2020-10-19 14:11:59 +02:00
Sem van der Hoeven 55d3dd4eee actually fixed overflow exception 2020-10-19 14:09:03 +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 d9c8b7c6df Merge remote-tracking branch 'origin/develop' into develop 2020-10-19 14:02:07 +02:00
shinichi de9716128c restyle tabheader 2020-10-19 14:02:03 +02:00
Sem van der Hoeven f934dee2d0 made overflow return 255 instead of 0 2020-10-19 14:01:39 +02:00
Sem van der Hoeven 107d95b81a fixed overflowexception 2020-10-19 13:59:47 +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
Sem van der Hoeven 8249632d00 add set resistance 2020-10-19 13:31:29 +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
shinichi 4a238d9207 Auto stash before checking out "HEAD" 2020-10-19 12:07:00 +02:00
Sem van der Hoeven 31be096b94 added small comments 2020-10-19 11:57:42 +02:00
Sem van der Hoeven 7eb7b03d4f Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-10-19 11:55:34 +02:00
Sem van der Hoeven 17a17e3c6d added comments to dataparser 2020-10-19 11:55:20 +02:00
shinichi 163d2321cc username back added to tabs 2020-10-19 11:49:34 +02:00
shinichi c9e913474c Merge remote-tracking branch 'origin/develop' into develop 2020-10-19 11:26:18 +02:00
shinichi 63b5c6ab73 removed unnecessary code 2020-10-19 11:26:09 +02:00
Sem van der Hoeven 6b355a0b72 added resistance editing from client to vr engine 2020-10-19 11:26:04 +02:00
fabjuuuh 9a46b17067 Merge remote-tracking branch 'origin/develop' into dataOnTabs 2020-10-19 11:20:28 +02:00
shinichi b748bcf5c8 binded commands 2020-10-19 11:19:57 +02:00
fabjuuuh 62525f3a23 Merge remote-tracking branch 'origin/develop' into dataOnTabs 2020-10-19 11:14:57 +02:00
fabjuuuh 783c40d7d3 rip 2020-10-19 11:14:05 +02:00
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
fabjuuuh 5751bbed81 Progress with structure to send data 2020-10-16 16:23:50 +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