fabjuuuh
|
25176dbaeb
|
Connections shit
|
2020-10-14 13:05:56 +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
|
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
|
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 |
|
shinichi
|
dffeb39337
|
mainView is now binded
|
2020-10-09 11:40:52 +02:00 |
|
fabjuuuh
|
a043cdc723
|
Merge branch 'develop' into dokter
|
2020-10-09 10:56:48 +02:00 |
|
shinichi
|
7bf5bdb1ce
|
delete
|
2020-10-07 18:34:04 +02:00 |
|
fabjuuuh
|
acbe3e9d55
|
Connect new tab
|
2020-10-07 14:56:04 +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
|
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 |
|
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
|
fedf8c0e5b
|
added client server login with hashed passwords and usernames
|
2020-10-02 11:43:07 +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 |
|
shinichi
|
bd8994ad5b
|
added start and stop session
|
2020-09-30 15:12:10 +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 |
|
shinichi
|
6f1ab57fe4
|
saving in binairy format
took forever
|
2020-09-30 13:00:13 +02:00 |
|
fabjuuuh
|
99887a22ba
|
Merge remote-tracking branch 'origin/client' into client
|
2020-09-25 16:38:22 +02:00 |
|
fabjuuuh
|
68a43fb930
|
Save Raw data
|
2020-09-25 16:38:16 +02:00 |
|
shinichi
|
a353d6839e
|
added some flair
|
2020-09-25 15:50:20 +02:00 |
|
shinichi
|
21203fd3ff
|
login implemented
|
2020-09-25 15:33:39 +02:00 |
|
shinichi
|
9c3b2c3f9b
|
Auto stash before merge of "client" and "origin/client"
|
2020-09-25 15:00:43 +02:00 |
|
fabjuuuh
|
6ef5bbfe12
|
More SaveData
|
2020-09-25 14:06:45 +02:00 |
|
fabjuuuh
|
cf9341a93e
|
SaveData
|
2020-09-25 13:43:00 +02:00 |
|
shinichi
|
d0071bd13c
|
bug fix
|
2020-09-25 13:22:16 +02:00 |
|
fabjuuuh
|
80ee448acf
|
Handledata
|
2020-09-25 13:18:41 +02:00 |
|
shinichi
|
360ec4175f
|
OnRead for client updated
|
2020-09-25 13:04:39 +02:00 |
|
shinichi
|
96f2e6e973
|
rewrote OnRead
|
2020-09-25 12:58:12 +02:00 |
|
shinichi
|
2139fcf2b2
|
removed clientId
|
2020-09-25 12:51:54 +02:00 |
|
shinichi
|
dded1a5b24
|
johan's code
senior meeting
|
2020-09-25 12:43:01 +02:00 |
|
shinichi
|
8c6cb443e3
|
deleted stuff
|
2020-09-23 15:22:45 +02:00 |
|
shinichi
|
c782301cf2
|
connection from bike/simulator to client to server
|
2020-09-23 15:05:09 +02:00 |
|
shinichi
|
d5eadbe529
|
forgot to stage
|
2020-09-23 14:32:07 +02:00 |
|
shinichi
|
d67c8448ad
|
client and server connect
|
2020-09-23 14:31:37 +02:00 |
|
fabjuuuh
|
cd5f23d3e4
|
Works i think
|
2020-09-23 14:12:35 +02:00 |
|