Commit graph

6 commits

Author SHA1 Message Date
Dante Ruiz
5af1ea54d3 Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data 2018-04-16 10:10:55 -07:00
Dante Ruiz
95e14446dd update qml file to show the current OpenVr headset 2018-03-01 09:03:52 -08:00
vladest
d92f461f12 Port ControllerSettings 2017-11-18 20:44:52 +01:00
Dante Ruiz
258c21838e finished calibration-ui updates 2017-07-06 17:32:40 +01:00
Dante Ruiz
2c3db0fb91 finished calibration-ui 2017-06-21 01:07:12 +01:00
Dante Ruiz
13dff29bd5 adding calibration screen 2017-06-20 01:19:10 +01:00