Sem van der Hoeven
|
28dc2c2f9c
|
Merge branch 'unittest-setup' into develop
|
2020-10-29 23:49:19 +01:00 |
|
Sem van der Hoeven
|
cd1a95ae85
|
Merge branch 'unittest-setup' of https://github.com/SemvdH/Proftaak-RH-B4 into unittest-setup
|
2020-10-29 23:48:29 +01:00 |
|
Sem van der Hoeven
|
cad1a508e6
|
tests
|
2020-10-29 23:48:20 +01:00 |
|
Logophilist
|
06e1d1edee
|
Last command tests
|
2020-10-29 23:47:18 +01:00 |
|
Logophilist
|
7c98aa6536
|
CommandTest Update
|
2020-10-29 23:40:11 +01:00 |
|
shinichi
|
d6cf5902da
|
[ADD] update data in doctor applicatie
|
2020-10-29 23:32:47 +01:00 |
|
Sem van der Hoeven
|
c1ee84fd2e
|
[ADD] added test methods for bools
|
2020-10-29 23:31:56 +01:00 |
|
Sem van der Hoeven
|
9f7a01170b
|
Merge branch 'gethistoricdata' into develop
|
2020-10-29 22:58:51 +01:00 |
|
Sem van der Hoeven
|
6dd9bd4107
|
[ADD] finished writing historic data to documents
|
2020-10-29 22:57:50 +01:00 |
|
shinichi
|
4207eaefea
|
[ADD] bike speed is set to 0 when session is not running
|
2020-10-29 22:57:10 +01:00 |
|
Logophilist
|
acc2fddf82
|
TerrainAdd, AddLayer, UpdateTerrain and renderTerrain tests done
|
2020-10-29 22:51:47 +01:00 |
|
Sem van der Hoeven
|
87b9ee65d0
|
[ADD] added writing contents to file
|
2020-10-29 22:51:14 +01:00 |
|
Logophilist
|
a333d6cd8d
|
UnitTesting set up completed
|
2020-10-29 22:04:02 +01:00 |
|
Sem van der Hoeven
|
dffdae2cb4
|
[EDIT] tried adding lots of bike data
|
2020-10-29 21:01:45 +01:00 |
|
Sem van der Hoeven
|
baf89dac3f
|
[ADD] added checking of all folders in username directory
|
2020-10-29 20:35:21 +01:00 |
|
Sem van der Hoeven
|
b98ac77261
|
[EDIT] some comments
|
2020-10-29 17:44:47 +01:00 |
|
shinichi
|
6d599cfcd2
|
wip gtg
|
2020-10-29 17:01:14 +01:00 |
|
Logophilist
|
c48e396e81
|
UnitTest Push
|
2020-10-28 12:01:20 +01:00 |
|
shinichi
|
da9d3184a1
|
token and volatile
|
2020-10-19 16:41:38 +02:00 |
|
fabjuuuh
|
2b6ea121c9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-10-19 16:24:34 +02:00 |
|
fabjuuuh
|
478a2daab7
|
hi
|
2020-10-19 16:24:24 +02:00 |
|
shinichi
|
8b8dd901c7
|
Merge branch 'NextFocusOnEnter' into develop
|
2020-10-19 16:19:10 +02:00 |
|
fabjuuuh
|
aa5ea7a3e0
|
works kinda
|
2020-10-19 16:13:51 +02:00 |
|
shinichi
|
aeb5d59ce9
|
implemented nextfocuable
|
2020-10-19 15:32:14 +02:00 |
|
shinichi
|
ab1662f0fe
|
Merge branch 'develop' into NextFocusOnEnter
|
2020-10-19 15:15:34 +02:00 |
|
shinichi
|
f07c3f9484
|
moving and fixing
|
2020-10-19 15:14:01 +02:00 |
|
fabjuuuh
|
2adfcc5bd7
|
fix
|
2020-10-19 15:13:27 +02:00 |
|
shinichi
|
3acdc942bc
|
move files and copy code
from stackoverflow :P
|
2020-10-19 14:53:47 +02:00 |
|
shinichi
|
84cbcb4a6d
|
send data to doctor
|
2020-10-19 14:35:51 +02:00 |
|
Logophilist
|
8385f09313
|
Bike animation added
|
2020-10-19 14:25:09 +02:00 |
|
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 |
|
Sem van der Hoeven
|
2ebfea1a01
|
Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop
|
2020-10-16 12:16:06 +02:00 |
|
Sem van der Hoeven
|
2f81f32a03
|
added checking for response from vr engine and automatic reconnect
|
2020-10-16 12:15:58 +02:00 |
|
fabjuuuh
|
b31fa293fb
|
Commands
|
2020-10-16 11:42:32 +02:00 |
|
Sem van der Hoeven
|
014191b350
|
smol fix
|
2020-10-16 11:27:12 +02:00 |
|
shinichi
|
ac11f6c53b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-10-16 11:25:39 +02:00 |
|
shinichi
|
5bacfdc8ce
|
added so only one doctor can login to server
|
2020-10-16 11:25:35 +02:00 |
|
Sem van der Hoeven
|
effdd887af
|
Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop
|
2020-10-16 11:24:08 +02:00 |
|
Sem van der Hoeven
|
1c3e48f676
|
added ralfs message display on vr panel into engineconnection
|
2020-10-16 11:23:52 +02:00 |
|
shinichi
|
df37c9bd58
|
made doctor window fancy
|
2020-10-16 11:18:29 +02:00 |
|
shinichi
|
6ec09ec995
|
error catching
|
2020-10-16 10:51:45 +02:00 |
|
shinichi
|
813545c2da
|
Merge branch 'ValueConverters' into develop
|
2020-10-16 10:41:52 +02:00 |
|
shinichi
|
29037f1774
|
status is now shown by image
|
2020-10-16 10:41:38 +02:00 |
|
shinichi
|
5280e70feb
|
wip
|
2020-10-16 10:13:59 +02:00 |
|
shinichi
|
94be6fd22d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-10-14 16:28:41 +02:00 |
|
shinichi
|
dc2b2f06ae
|
move styles to sharedproject and disposed client
|
2020-10-14 16:28:37 +02:00 |
|
Sem van der Hoeven
|
30c5d5a2a3
|
add message to server switch
|
2020-10-14 15:58:06 +02:00 |
|
shinichi
|
bbb0220c11
|
Merge branch 'window-restyle' into develop
|
2020-10-14 15:54:02 +02:00 |
|
shinichi
|
adf8435822
|
got rid of navigation ui
|
2020-10-14 15:53:52 +02:00 |
|
shinichi
|
ed19714338
|
Merge branch 'develop' into window-restyle
|
2020-10-14 15:30:00 +02:00 |
|
shinichi
|
c13cdf64b6
|
window works
|
2020-10-14 15:29:19 +02:00 |
|
Sem van der Hoeven
|
e226ab586e
|
added message method to dataparser
|
2020-10-14 15:27:35 +02:00 |
|
fabjuuuh
|
6e534c318b
|
Merge branch 'develop' into newDoctor
|
2020-10-14 15:21:03 +02:00 |
|
fabjuuuh
|
d8a3baeec1
|
Relaycommands
|
2020-10-14 15:19:43 +02:00 |
|
Sem van der Hoeven
|
ea4093ff75
|
added message to dataparser
|
2020-10-14 15:19:20 +02:00 |
|
Sem van der Hoeven
|
11ebc67c13
|
moved observableobject to util
|
2020-10-14 15:01:13 +02:00 |
|
Sem van der Hoeven
|
c5c74a3d7a
|
moved dataparser to util
|
2020-10-14 14:59:00 +02:00 |
|
shinichi
|
756c646b93
|
before removing shadows
|
2020-10-14 14:55:58 +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 |
|
fabjuuuh
|
af5dca25f4
|
Remove Tabs when disconnect
|
2020-10-14 14:35:14 +02:00 |
|
shinichi
|
6bec8f1651
|
wip
|
2020-10-14 14:35:02 +02:00 |
|
fabjuuuh
|
3547207cad
|
Merge branch 'develop' into newDoctor
|
2020-10-14 13:51:19 +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 |
|
shinichi
|
56de6cfa24
|
wip
|
2020-10-14 12:05:28 +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
|
3822508b4c
|
added empty resource files
|
2020-10-14 09:53:49 +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 |
|
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 |
|
Sem van der Hoeven
|
499134fa9a
|
Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop
|
2020-10-07 12:22:25 +02:00 |
|
Sem van der Hoeven
|
f5eb59694e
|
added comments
|
2020-10-07 12:22:10 +02:00 |
|
shinichi
|
71ff5dfc81
|
Merge branch 'fix-getBPMgraphdata' into develop
|
2020-10-07 11:55:56 +02:00 |
|
shinichi
|
472c514275
|
removed debugging
|
2020-10-07 11:55:49 +02:00 |
|
shinichi
|
7c943f4f73
|
fix
|
2020-10-07 11:54:47 +02:00 |
|
Sem van der Hoeven
|
f31cdeb467
|
some writelines
|
2020-10-07 11:52:14 +02:00 |
|
Logophilist
|
05354b5ebe
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-10-07 11:51:07 +02:00 |
|
Logophilist
|
f6c2b3c662
|
Panel fixed
|
2020-10-07 11:51:02 +02:00 |
|
Sem van der Hoeven
|
475159bbb2
|
fix conflicts
|
2020-10-07 11:24:19 +02:00 |
|
Sem van der Hoeven
|
c2b4b259a3
|
comment
|
2020-10-07 11:23:09 +02:00 |
|
fabjuuuh
|
a2937c0427
|
Merge branch 'wpf' into develop
|
2020-10-07 11:08:05 +02:00 |
|
fabjuuuh
|
02bd68d142
|
Merge branch 'develop' into wpf
|
2020-10-07 11:07:40 +02:00 |
|
Logophilist
|
699528bb83
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-10-05 20:21:08 +02:00 |
|
Logophilist
|
e4d192fb06
|
Commit alt code of VR engine
|
2020-10-05 20:20:57 +02:00 |
|
shinichi
|
5d14d53df5
|
wip
|
2020-10-02 16:29:11 +02:00 |
|
shinichi
|
09db19246e
|
quick fix
|
2020-10-02 15:53:50 +02:00 |
|
shinichi
|
eb2738168b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-10-02 15:38:00 +02:00 |
|
shinichi
|
d85c5ff935
|
added function to get BPM graph data
|
2020-10-02 15:37:57 +02:00 |
|
Sem van der Hoeven
|
d420bdc2a4
|
merge conflicts 7: conflictnado
|
2020-10-02 11:49:48 +02:00 |
|
Sem van der Hoeven
|
cb2435bf53
|
weird fix
|
2020-10-02 11:48:03 +02:00 |
|
Sem van der Hoeven
|
ca2e61eb8e
|
Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop
|
2020-10-02 11:44:30 +02:00 |
|
Sem van der Hoeven
|
32ef17365e
|
pull
|
2020-10-02 11:44:26 +02:00 |
|
Sem van der Hoeven
|
fedf8c0e5b
|
added client server login with hashed passwords and usernames
|
2020-10-02 11:43:07 +02:00 |
|
shinichi
|
505c4907d0
|
Merge branch 'set-resistance' into develop
|
2020-09-30 19:40:46 +02:00 |
|
shinichi
|
a5e679e6fb
|
server now gets response when resistance is set
|
2020-09-30 19:40:37 +02:00 |
|
Sem van der Hoeven
|
3e5f6e46c4
|
progress on validation
|
2020-09-30 16:22:57 +02:00 |
|
shinichi
|
adea08cfb7
|
server can set resistance
|
2020-09-30 16:22:26 +02:00 |
|
wouter
|
c20a1b292e
|
upgraded doktor stuff
|
2020-09-30 16:08:35 +02:00 |
|
shinichi
|
599b79ceee
|
correctly implemented IHandler
|
2020-09-30 15:26:34 +02:00 |
|
shinichi
|
bd8994ad5b
|
added start and stop session
|
2020-09-30 15:12:10 +02:00 |
|
Sem van der Hoeven
|
97f9d863aa
|
fix
|
2020-09-30 15:10:47 +02:00 |
|
fabjuuuh
|
f777b583f5
|
progress
|
2020-09-30 14:37:40 +02:00 |
|
Sem van der Hoeven
|
d6b938668f
|
added reconnecting to the vr server when no tunnel id is found
|
2020-09-30 14:33:15 +02:00 |
|
shinichi
|
45edbe5936
|
Merge branch 'binairy-writer' into develop
|
2020-09-30 14:25:29 +02:00 |
|
shinichi
|
a65c36b8d1
|
fix bug and more efficient code
|
2020-09-30 14:24:38 +02:00 |
|
shinichi
|
82f2d6b71c
|
saving bike and bpm data in separate files
|
2020-09-30 14:17:26 +02:00 |
|
fabjuuuh
|
41e77ba16c
|
hi
|
2020-09-30 13:12:18 +02:00 |
|
shinichi
|
6f1ab57fe4
|
saving in binairy format
took forever
|
2020-09-30 13:00:13 +02:00 |
|
Sem van der Hoeven
|
341723d1d1
|
added maincommand to engineconnection
|
2020-09-30 12:59:04 +02:00 |
|
Sem van der Hoeven
|
0cd3753b76
|
properly added engineconnection to client
|
2020-09-30 12:30:40 +02:00 |
|
Sem van der Hoeven
|
4388b39be5
|
only connects when username and password are entered
|
2020-09-30 12:27:31 +02:00 |
|
Sem van der Hoeven
|
0dc4bb6fad
|
connected engine to client
|
2020-09-30 12:23:53 +02:00 |
|
Sem van der Hoeven
|
3ca3c1ad78
|
added engineconnection to client
|
2020-09-30 12:17:57 +02:00 |
|
Sem van der Hoeven
|
d06d621b13
|
added necessary methods and added method sig to cw of engineconnect
|
2020-09-30 12:13:59 +02:00 |
|
Sem van der Hoeven
|
7b05fcc898
|
added engineconnect as singleton
|
2020-09-30 12:01:53 +02:00 |
|
fabjuuuh
|
cc7f2d154c
|
wpf
|
2020-09-30 11:52:38 +02:00 |
|
Sem van der Hoeven
|
c5b9a7ec09
|
made rh engine classes public
|
2020-09-30 11:44:00 +02:00 |
|
Sem van der Hoeven
|
3494f678e3
|
added doctor project
|
2020-09-30 10:15:30 +02:00 |
|