256 commits

Author	SHA1	Message	Date
Brad Davis	c3f664502a	Add support for querying the desired output audio device for OpenVR	2017-06-13 10:57:10 -07:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07: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
Bradley Austin Davis	a36727732f	Fix bad initializer	2017-06-06 15:02:16 -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
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	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
Seth Alves	ac6135387c	display plugins are never head controllers	2017-06-01 13:37:16 -07:00
Dante Ruiz	7fcdc61244	add head puck offset preference	2017-05-31 18:20:35 +01:00
Dante Ruiz	f4328af66f	made final requested changes	2017-05-31 17:12:27 +01:00
Dante Ruiz	41869430f7	made some changes that were requested	2017-05-31 01:29:32 +01:00
Dante Ruiz	b3401d9762	making some final changes	2017-05-30 23:55:45 +01:00
Dante Ruiz	a0ba1a64b5	Merge branch 'master' of github.com:highfidelity/hifi into head-puck	2017-05-30 22:52:57 +01:00
Dante Ruiz	4c4811dca8	finished the head puck	2017-05-30 22:52:39 +01:00
Seth Alves	ffe844a8e7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-30 13:42:20 -07:00
Dante Ruiz	a45bea2c90	fixed merge conflicts	2017-05-27 00:57:09 +01:00
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
Dante Ruiz	d317d9236f	made requested changes	2017-05-26 16:40:21 +01:00
Seth Alves	af5ba3a90a	ask display-plugins if they are head-controllers	2017-05-25 15:14:10 -07:00
Dante Ruiz	cce19f7027	removed unnessary code	2017-05-25 22:07:51 +01:00
Dante Ruiz	108c444cc7	clean up code	2017-05-25 21:59:06 +01:00
Dante Ruiz	8538c700b5	saving head work	2017-05-25 21:41:41 +01:00
samcake	044110e4f3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-24 15:40:40 -07:00
Dante Ruiz	8cb9bfcc81	fixed merge conflict	2017-05-24 19:35:41 +01:00
Dante Ruiz	0fdf136251	got the shoulders working	2017-05-24 19:31:48 +01:00
Dante Ruiz	ac3c9655ec	added arms	2017-05-24 01:28:08 +01:00
David Kelly	1c71d2e6b1	don't create prefs for pucks if vive not supported	2017-05-23 09:05:14 -07:00
Dante Ruiz	d98e7d5bc6	adding left and right arm	2017-05-23 00:26:12 +01:00
David Kelly	ae54f9c80a	Should fix crash in general setting dialog	2017-05-22 16:25:21 -07:00
Sam Gateau	0f250e693d	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-17 09:49:20 -07:00
Anshuman Dewangan	e3cd85bd22	Changed calibration time from 2 to 1 sec	2017-05-16 13:55:04 -07:00
samcake	2df6d0df48	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-15 13:40:56 -07:00
Dante Ruiz	e6020e0137	added lookup table for tracking result and configs	2017-05-13 00:40:07 +01:00
Dante Ruiz	3f5a13d5a9	Merge branch 'master' of github.com:highfidelity/hifi into puck-lost-tracking	2017-05-12 18:18:10 +01:00
samcake	3393456d91	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-12 10:15:13 -07:00
Dante Ruiz	5042d4d312	add print when device changes tracking result	2017-05-12 00:28:31 +01:00
Dante Ruiz	66020cf446	Merge branch 'master' of github.com:highfidelity/hifi into puck-lost-tracking	2017-05-11 23:19:03 +01:00
Dante Ruiz	539aaf8c59	add debug statment and fixed sorting order	2017-05-11 23:00:41 +01:00
Dante Ruiz	5d457eaa39	better handling of when lost tracking of pucks	2017-05-11 20:44:08 +01:00
Dante Ruiz	7687617e91	made requested changes	2017-05-11 00:32:42 +01:00
Dante Ruiz	4365907462	drop down puck configuration for gernal settings	2017-05-10 22:12:11 +01:00
samcake	39f6e22da3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-10 09:48:26 -07:00
Dante Ruiz	0e1ef75d5b	fix comment wording	2017-05-10 16:18:26 +01:00
Dante Ruiz	571f0d5951	made requested changes	2017-05-10 16:14:29 +01:00
samcake	bc41be7ec1	Introucing the BackgroundStage to manage the background / skybox in one place	2017-05-09 17:10:05 -07:00
Dante Ruiz	bb4c0d972d	head routed through the vive input plugin	2017-05-10 00:10:26 +01:00
Dante Ruiz	53e254152d	fixed puck location	2017-05-09 22:30:29 +01:00
Dante Ruiz	c362ba9164	better calibration event	2017-05-09 19:13:47 +01:00
Dante Ruiz	d688b60282	no magic numbers	2017-05-09 18:02:12 +01:00