Commit Graph

310 Commits

Author SHA1 Message Date
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
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
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
shinichi
e09f4f1325 changed names 2020-10-07 21:21:12 +02:00
shinichi
a23b268dc9 login working
uuuuggglyyyyyyyyyyyyyy :(
2020-10-07 19:45:20 +02:00
shinichi
7bf5bdb1ce delete 2020-10-07 18:34:04 +02:00
shinichi
46083b3912 copy 2020-10-07 17:56:21 +02:00
shinichi
187beaf6c1 Merge branch 'develop' into Client-GUI 2020-10-07 16:42:17 +02:00
Sem van der Hoeven
d6da6b18c4 added value update to panel and adjusted speed to match, only need to display speed with 1 decimal 2020-10-07 16:40:41 +02:00
shinichi
04b0051e72 Merge branch 'develop' into Client-GUI 2020-10-07 16:32:42 +02:00
shinichi
91bb0d65b7 added status 2020-10-07 16:31:44 +02:00
fabjuuuh
fc0e70403f Icon en livechart library 2020-10-07 16:16:52 +02:00
Sem van der Hoeven
847fa68acb fix for displaying things on vr scene 2020-10-07 16:06:16 +02:00
shinichi
d7dfe32cc3 wip 2020-10-07 15:49:57 +02:00
Sem van der Hoeven
651a44762b input test 2020-10-07 15:15:42 +02:00
shinichi
6159f3f57b added login logic and text 2020-10-07 15:14:39 +02:00
Sem van der Hoeven
046389f3b7 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-10-07 15:09:16 +02:00
Sem van der Hoeven
57aa9b6deb finished reconnecting on sim not started and then sending the commands 2020-10-07 15:08:45 +02:00
fabjuuuh
acbe3e9d55 Connect new tab 2020-10-07 14:56:04 +02:00
fabjuuuh
aea1b4fce4 connectie met server 2020-10-07 13:21:30 +02:00
shinichi
6e2b3a80b3 wip 2020-10-07 13:17:40 +02:00
Logophilist
26a784277a Panel now shows more data 2020-10-07 12:58:50 +02:00
Sem van der Hoeven
bff4718d3f added route to client vr scene 2020-10-07 12:51:09 +02:00