Commit Graph

330 Commits

Author SHA1 Message Date
Sem van der Hoeven
c5c74a3d7a moved dataparser to util 2020-10-14 14:59:00 +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
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
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
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
fabjuuuh
301f6b447f Progress 2020-10-12 16:50:02 +02:00
fabjuuuh
df5e276eb3 Vastgelopen 2020-10-12 12:50:38 +02:00
Logophilist
87e199d1b5 Showing message on panel 2020-10-12 09:01:33 +02:00
shinichi
9761d189ec background image
i give up
2020-10-09 17:05:11 +02:00
Sem van der Hoeven
8ad861e18a conflicts 2020-10-09 16:59:31 +02:00
Sem van der Hoeven
f6e5152939 connect new gui to vr engine 2020-10-09 16:58:39 +02:00
shinichi
c8a812508f added folder for future use 2020-10-09 16:29:18 +02:00
shinichi
5fcf0d177b wip 2020-10-09 16:22:28 +02:00
shinichi
278a5adb5e change doctor password field to passwordbox 2020-10-09 16:03:49 +02:00
shinichi
528f515e0b Merge remote-tracking branch 'origin/develop' into develop 2020-10-09 15:37:30 +02:00
shinichi
b4088f5d30 edited focusable 2020-10-09 15:37:23 +02:00
Logophilist
34eed08234 Fixed grass texture, houses and time of day 2020-10-09 15:35:54 +02:00
shinichi
e410e9ec88 login failed popup shows 2020-10-09 15:07:27 +02:00
Sem van der Hoeven
25d0bda483 added new reference 2020-10-09 12:52:14 +02:00
Sem van der Hoeven
fafc96ad6a removed client 2020-10-09 12:50:46 +02:00
Sem van der Hoeven
bcdf8587c0 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-10-09 12:49:22 +02:00
Sem van der Hoeven
5cc008cd03 merged client and clientapp 2020-10-09 12:49:06 +02:00
Sem van der Hoeven
b642e17268 readded clientapp 2020-10-09 12:35:56 +02:00
Sem van der Hoeven
bcc479cf33 temp 2020-10-09 12:27:28 +02:00
shinichi
50a2ae9521 added popup not binded yet 2020-10-09 12:18:34 +02:00
Sem van der Hoeven
c87c190d14 fix dataparser import 2020-10-09 12:06:24 +02:00
Sem van der Hoeven
8e48fe7902 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-10-09 12:02:34 +02:00
Sem van der Hoeven
39b935ecbc o p t i m i z e 2020-10-09 12:02:23 +02:00
Sem van der Hoeven
68994fd3fe added BLEHANDLER tag to blehandler cw 2020-10-09 12:02:03 +02:00
Sem van der Hoeven
adf6073e42 added client project reference to server 2020-10-09 12:01:48 +02:00
Sem van der Hoeven
94d1c07c99 added client project reference to server 2020-10-09 12:01:34 +02:00
Sem van der Hoeven
2aa736b0a8 formatted speed to show km/h too 2020-10-09 12:01:23 +02:00
Sem van der Hoeven
b5ea137bad removed 20 second sleep 2020-10-09 12:00:51 +02:00
shinichi
dffeb39337 mainView is now binded 2020-10-09 11:40:52 +02:00
shinichi
2cb3fd5ec3 ble and simulation stop when window closes 2020-10-09 11:33:26 +02:00
shinichi
124eee5f12 implemented stop for BLEHandler and BikeSimulator 2020-10-09 11:16:51 +02:00
fabjuuuh
ab9180281e Merge branch 'dokter' into develop 2020-10-09 10:57:16 +02:00
fabjuuuh
a043cdc723 Merge branch 'develop' into dokter 2020-10-09 10:56:48 +02:00
shinichi
143f7e4d88 Merge branch 'move-Client-to-ClientApp' into develop 2020-10-07 21:21:19 +02:00