539 commits

Author	SHA1	Message	Date
David Rowe	72d712ac76	Add "enabled" setting for Sixense; bail in update if note enabled	2017-06-26 16:43:06 +12:00
David Rowe	361bc1ce03	Add "enabled" setting for SDL2 joystick; bail in update if not enabled	2017-06-26 16:00:18 +12:00
David Rowe	5abd254a58	Bail in Neuron plugin update if plugin not enabled	2017-06-26 15:58:14 +12:00
Brad Davis	fe7d4b1d23	Remove dependency between codec plugins and UI	2017-06-23 12:25:18 -07: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
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -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	e125e1f608	fix issue that caused jenkin to fail buiuling code	2017-06-13 00:37:32 +01: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
Seth Alves	b1c7c251ac	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-07 10:09:46 -07: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
NeetBhagat	c3621d7c32	Resolved two issues: ... 1) While in HMD mode -> open Tablet -> Click Desktop. Desktop mode will be on. 2) Menu sync problem while switching modes.	2017-06-06 22:31:14 +05:30
Seth Alves	ad1ee97324	remove cruft	2017-06-06 09:50:40 -07: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	9654e007a6	most input plugins are not head or hand controllers	2017-06-02 16:31:08 -07:00
Seth Alves	3359a0a794	work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation	2017-06-02 15:29:20 -07: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
NeetBhagat	e08c3453a4	Merge branch 'master' into 21255	2017-06-02 12:36:07 +05:30
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
Seth Alves	7d21ab88b0	add some saftey checks. cleanups	2017-06-01 16:14:59 -07:00
anshuman64	694d1d042d	Merge pull request #10573 from druiz17/head-puck ... Added head puck configuration	2017-06-01 16:06:00 -07:00
Seth Alves	f45db99149	for the moment, vive input plugin isn't a head-controller unless the HMD is being worn	2017-06-01 14:35:53 -07:00