299 commits

Author	SHA1	Message	Date
Dante Ruiz	07d098b95b	coding standard fix	2017-07-05 19:45:52 +01:00
Dante Ruiz	275f48b65a	another requested change made	2017-07-05 19:22:19 +01:00
Dante Ruiz	e567cf0196	made requested changes	2017-07-05 19:04:34 +01:00
Dante Ruiz	27a9880eff	removed double add of head offset	2017-07-05 18:34:33 +01:00
Dante Ruiz	691b59ffff	remove debug statments	2017-07-05 18:26:58 +01:00
Dante Ruiz	a417f74bad	Merge branch 'calibration-ui-update' into vive-in-desktop	2017-07-03 16:56:58 +01:00
Dante Ruiz	5fbcd494be	made final requested changes	2017-07-03 16:46:58 +01:00
Dante Ruiz	51792769b5	finished vive in desktop mode	2017-07-01 00:48:36 +01:00
Dante Ruiz	309a03230c	Merge branch 'calibration-ui-update' into vive-in-desktop	2017-06-30 23:43:59 +01:00
Dante Ruiz	577969481d	head puck working	2017-06-30 23:43:12 +01:00
Dante Ruiz	a749fa19ad	made requested changes	2017-06-30 19:14:22 +01:00
Dante Ruiz	3e1aee4d8a	saving work	2017-06-30 19:07:34 +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	b48efc4317	fixed wide stance issue	2017-06-22 22:48:32 +01:00
Dante Ruiz	c4699e00ca	added hand offsets	2017-06-21 23:10:08 +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	cfffb74a29	Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks	2017-06-19 21:40:26 +01:00
Dante Ruiz	734cde33e7	better calibrate button	2017-06-19 21:40:09 +01:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
Dante Ruiz	da29157a3c	fixed merge conflict'	2017-06-17 00:40:50 +01:00
Dante Ruiz	2015f059c7	fixed hand calibration	2017-06-17 00:37:33 +01:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Dante Ruiz	07102cc98d	improving the ui	2017-06-16 00:25:27 +01:00
Dante Ruiz	a1782bf7d2	Merge branch 'controller-ui' into hand-pucks	2017-06-15 16:27:55 +01:00
Dante Ruiz	d65c0dfbac	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-15 16:24:59 +01:00
Dante Ruiz	ff422153b1	got hand working	2017-06-15 00:26:53 +01:00
Dante Ruiz	aa23986618	finxing rotation problem	2017-06-14 00:46:55 +01:00
Zach Pomerantz	607379980e	update plugin api	2017-06-13 17:59:46 -04:00
Dante Ruiz	ef9a211f6e	adding hand punck	2017-06-13 21:15:16 +01:00
Brad Davis	c3f664502a	Add support for querying the desired output audio device for OpenVR	2017-06-13 10:57:10 -07:00
Dante Ruiz	f9f9aeac01	saving work	2017-06-13 00:29:45 +01:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Dante Ruiz	bbe675ab72	making final changes	2017-06-12 22:01:41 +01:00
Dante Ruiz	067fc9bb98	fixed merge conflict	2017-06-12 16:45:34 +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
Seth Alves	485df396ef	Merge pull request #10628 from jherico/qt59 ... Fixes for Qt 5.9 compatibility	2017-06-08 16:51:08 -07: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	4ba1fdc323	elimated uncofigurable items from the list	2017-06-07 00:48:12 +01:00
Bradley Austin Davis	a36727732f	Fix bad initializer	2017-06-06 15:02:16 -07:00
Dante Ruiz	bb7c424d47	get ui working	2017-06-06 21:09:09 +01:00
Dante Ruiz	038ffe920a	fixing merge conflicts	2017-06-06 16:42:08 +01:00
Dante Ruiz	19b134b0ac	base ui working	2017-06-06 00:32:20 +01:00
Seth Alves	9088e288e0	don't worry about head controller being enabled, just check to see if head pose is valid	2017-06-02 13:57:53 -07:00
Seth Alves	27664756de	with vive head-puck, isHeadController is true, even when HMD isn't mounted	2017-06-01 16:37:04 -07:00
Seth Alves	48ee546545	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 16:15:03 -07:00