20 commits

Author	SHA1	Message	Date
Dante Ruiz	dc28e8f03f	fixing error	2018-06-13 18:24:06 -07:00
Dante Ruiz	eb01b50e6f	making code review changes	2018-06-13 17:58:10 -07:00
Dante Ruiz	5d570f030f	fixing calibration	2018-06-08 11:18:52 -07:00
Dante Ruiz	f5e2a6834b	fixing some issues	2018-06-04 16:09:31 -07:00
Dante Ruiz	48c0b7379a	fix vive configuration page	2018-06-04 15:16:11 -07:00
Dante Ruiz	60dd7e49ab	making requested changes	2018-05-18 16:41:39 -07:00
vladest	5127cb0ea6	Merge branch 'master' into menu-updates	2018-05-16 14:37:00 +02:00
Dante Ruiz	82422edb59	fixinig the controller settings page and have menu option on by default	2018-05-14 18:51:39 -07:00
vladest	f8ebe7e669	remoed no more used LOD dialogs. Fixed Slider properties min and max settings	2018-05-12 16:01:43 +02:00
Anthony J. Thibault	0ac12fa317	Bug fix for Vive Tracker Calibration Settings ... This issue was inadvertently introduced by the name change of the Vive display plugin.	2018-05-10 17:56:54 -07: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