11 commits

Author	SHA1	Message	Date
vladest	f8ebe7e669	remoed no more used LOD dialogs. Fixed Slider properties min and max settings	2018-05-12 16:01:43 +02:00
vladest	ea66e04ab8	Removed unwanted code	2018-05-02 18:58:40 +02:00
vladest	3296ae0db8	Merge branch 'master' into menu-updates	2018-04-26 22:21:40 +02:00
Dante Ruiz	5af1ea54d3	Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data	2018-04-16 10:10:55 -07:00
vladest	6d53512c6c	Merge	2018-04-15 15:24:16 +02:00
Alexia Mandeville	8c9c7248d4	Reorganize of menu action items as well as QML categories	2018-03-12 12:52:12 -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