41 commits

Author	SHA1	Message	Date
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
John Conklin II	236e75b6c6	Merge pull request #12903 from druiz17/add-more-hmd-data ... Get the correct device name connect to OpenVr	2018-04-24 13:29:41 -07:00
vladest	0e28e41107	Fix various issues with SpinBox-es and Sliders	2018-04-20 19:15:29 +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
Dante Ruiz	95e14446dd	update qml file to show the current OpenVr headset	2018-03-01 09:03:52 -08:00
vladest	8c9e530adf	Merge branch 'master' into move_to_qqc2	2017-11-29 16:33:59 +01:00
Menithal	693da50a68	21539: Fixed None Checkmark being on Desktop mode	2017-11-27 07:59:04 +02:00
Menithal	5d52b9936b	21539: Updated Logic to match request	2017-11-27 07:42:18 +02:00
Menithal	ba1cd74ffe	21539: Moved Desktop HMD to None	2017-11-26 21:58:16 +02:00
vladest	0c13c2b6e2	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
Menithal	ac1df7b815	21539: Allow HMD to turned off in Desktop Mode	2017-11-05 01:02:08 +02:00
Anthony J. Thibault	6c2b6674bb	load and save shoulderConfig to settings.	2017-07-27 17:33:54 -07:00
Anthony J. Thibault	8dc9714282	Pass armCircumference and shoulderWidth to qml.	2017-07-27 09:08:34 -07:00
Anthony J. Thibault	572213daaf	Added shoulder config to Controller Settings UI ... All offset values in Controller Settings UI are now in cm.	2017-07-25 17:05:07 -07:00
Dante Ruiz	1fcb3b32d6	fixed letter cap	2017-07-06 20:55:19 +01:00
Dante Ruiz	9e4b5693c7	fixed merge conflicts	2017-07-06 18:49:46 +01:00
Dante Ruiz	6e1f9d275c	chnaged default head offset	2017-07-06 17:54:06 +01:00
Dante Ruiz	258c21838e	finished calibration-ui updates	2017-07-06 17:32:40 +01:00
Dante Ruiz	6c15dffb9d	added new glyph	2017-07-06 00:45:59 +01:00
Dante Ruiz	51792769b5	finished vive in desktop mode	2017-07-01 00:48:36 +01:00
Dante Ruiz	a7e4dc1473	clean up code	2017-06-28 23:51:00 +01:00
Dante Ruiz	a2df2f8472	added user activity status	2017-06-28 19:52:19 +01:00
Dante Ruiz	c4699e00ca	added hand offsets	2017-06-21 23:10:08 +01:00
Dante Ruiz	17832b6022	edited some button behavior	2017-06-21 01:38:05 +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
Dante Ruiz	734cde33e7	better calibrate button	2017-06-19 21:40:09 +01:00
Dante Ruiz	2015f059c7	fixed hand calibration	2017-06-17 00:37:33 +01:00
Dante Ruiz	07102cc98d	improving the ui	2017-06-16 00:25:27 +01:00
Dante Ruiz	ef9a211f6e	adding hand punck	2017-06-13 21:15:16 +01:00
Dante Ruiz	89b0e31edc	update calibrate button glyph	2017-06-12 22:21:46 +01:00
Dante Ruiz	bbe675ab72	making final changes	2017-06-12 22:01:41 +01:00
druiz17	f6ef1443c8	some more clean up	2017-06-11 12:08:45 -07:00
Dante Ruiz	ef1be931dc	preparing to clean code	2017-06-10 00:50:32 +01:00
Dante Ruiz	73e628461e	confiration update status	2017-06-09 00:44:05 +01:00
Dante Ruiz	c97ea84cbf	saving work	2017-06-08 17:44:55 +01:00
Dante Ruiz	11409aae9b	connect the ui with the input plugins	2017-06-08 00:34:52 +01:00
Dante Ruiz	70ba344f1b	finished openvr ui	2017-06-07 00:25:08 +01:00
Dante Ruiz	bb7c424d47	get ui working	2017-06-06 21:09:09 +01:00