635 commits

Author	SHA1	Message	Date
David Rowe	5de585e320	Leap Motion activation	2017-06-17 13:56:44 +12:00
David Rowe	2ca4283828	Fix Leap Motion SDK access	2017-06-17 12:02:26 +12: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
David Rowe	febd0eaf98	Add Leap Motion settings	2017-06-16 10:58:11 +12:00
David Rowe	170cf8156f	Add plugin ID	2017-06-16 10:11:08 +12:00
David Rowe	6b2fbbf5fe	Add logging category	2017-06-16 10:05:33 +12: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
David Rowe	9c431a11af	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12: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
Seth Alves	552b69bb1c	cleanups	2017-06-01 13:47:19 -07:00
Seth Alves	ac6135387c	display plugins are never head controllers	2017-06-01 13:37:16 -07:00
Seth Alves	eb94c48c5b	merge from upstream	2017-06-01 10:10:11 -07:00
Sam Cake	07eb1d89e1	fixing the warning on macosx about the non portable file name	2017-05-31 23:59:44 -07:00
NeetBhagat	c7c07b28e9	Resolve the reviewed comments of @ZappoMan	2017-06-01 12:17:13 +05:30
Zach Pomerantz	954e4979f8	expose Audio.devices.input/output	2017-05-31 20:14:58 -04:00
Seth Alves	e37387f45c	sync	2017-05-31 14:01:09 -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
Seth Alves	2ad85c158a	more work on getting head routed through input system	2017-05-30 17:11:56 -07: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
Seth Alves	e82e80e8e0	OculusDebugDisplayPlugin is head controller	2017-05-30 09:55:33 -07:00
volansystech	212627bd5d	Merge branch 'master' into 21255	2017-05-29 17:51:45 +05:30
volansystech	0920dbc1a8	Resolve the comments of @ZappoMan.	2017-05-29 15:53:33 +05:30
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
volansystech	1f24e38585	Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift.	2017-05-25 14:56:06 +05:30
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
Dante Ruiz	bce9e9ea82	made requested chnages	2017-05-09 17:51:30 +01:00
Dante Ruiz	c3d57459d5	minimize diff 3.0	2017-05-09 00:32:47 +01:00
Dante Ruiz	03ba3f5944	minimize diff 2.0	2017-05-09 00:31:13 +01:00
Dante Ruiz	00546c55bb	minimize diff	2017-05-09 00:30:06 +01:00
Dante Ruiz	23c3a75116	finally fixed rotation issue	2017-05-09 00:27:30 +01:00
Dante Ruiz	a744db56aa	removed dead code	2017-05-06 00:21:52 +01:00
Dante Ruiz	8813306857	fixed the wierd rotation issue	2017-05-05 23:59:38 +01:00
Dante Ruiz	20c8356bb2	debugging rotation fix	2017-05-05 22:55:53 +01:00
Dante Ruiz	31f6038e45	limbs tracking pucks	2017-05-03 20:08:42 +01:00
Dante Ruiz	fb502a7fed	add offset function	2017-05-03 00:37:35 +01:00
Dante Ruiz	8e2b25eacc	working on computing offsets	2017-05-03 00:25:41 +01:00
Dante Ruiz	15cad1fee9	saving work	2017-05-02 21:33:58 +01:00
Ryan Huffman	aca7ad27c6	Fix ktx dependencies	2017-04-26 10:47:32 -07:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
Mohammed Nafees	3382f9f5eb	Remove unnecessary dependencies from hifiCodec	2017-04-25 00:42:45 -04:00
Sam Cake	2b97171061	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 01:06:01 -07:00
Sam Cake	038d01ce04	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 00:45:50 -07:00
Andrew Meadows	e64e2614e3	Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter ... Kinect hand filter	2017-04-12 14:27:05 -07:00
Al Bernstein	ead4793392	removed whitespace	2017-04-06 17:26:12 -07:00
Al Bernstein	c628b23895	removed whitespace	2017-04-06 17:21:58 -07:00
Al Bernstein	e737456dcd	used thread safe moving average for the quaternions	2017-04-06 16:56:03 -07:00
Al Bernstein	de1fdfacca	made requested changes in PR10147	2017-04-06 16:18:40 -07:00
Anthony J. Thibault	4e49774d0e	Moved device class check into handleTrackedObject	2017-04-06 13:20:00 -07:00
Al Bernstein	e6e5224647	clean ups - coding standard	2017-04-06 11:27:58 -07:00
Al Bernstein	001c92416b	clean ups - coding standard	2017-04-06 11:23:33 -07:00
Al Bernstein	4a17112478	Kinect moving average filter for hands	2017-04-06 11:08:09 -07:00
Anthony J. Thibault	42262aac78	OpenVR: upgrade to version 1.0.6, for better generic tracker support	2017-04-05 18:41:43 -07:00
Anthony Thibault	be2fdd9388	Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects ... Vive: Expose all 16 tracked poses to the controller system	2017-04-05 16:53:47 -07:00
Dante Ruiz	81ae3e44fd	Merge branch 'master' of github.com:highfidelity/hifi into oculus-tracking	2017-04-04 22:11:08 +01:00
Dante Ruiz	a31812821a	oculus lost tracking, delay hand to side	2017-04-04 22:10:47 +01:00
Andrew Meadows	66ff551a7c	Merge pull request #10080 from ZappoMan/footActions ... add foot IK targets as actions, map Kinect feet to foot targets	2017-04-03 12:06:14 -07:00
Sam Cake	dd73cb7b8e	Use a magic number gpu::Texture::SINGLE_MIP instead of 1	2017-03-30 23:46:37 -07:00
ZappoMan	4da8e5e18f	fix left/right legs for kinect	2017-03-30 20:01:59 -07:00
samcake	26000288d7	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-03-30 11:45:12 -07:00
Anthony J. Thibault	d47c040768	Vive: Expose all 16 tracked poses to the controller system. ... This is in preparation for the Vive hockey puck trackers...	2017-03-29 18:15:29 -07:00
samcake	b6504bba56	Moving the num mips per texture to the creator so it s immutable and simpler	2017-03-29 17:58:56 -07:00
ZappoMan	6f2f80e334	make sure kinect plugin debugging setting is actually saved and loaded	2017-03-29 14:06:11 -07:00
ZappoMan	9d3e8818f7	fix build	2017-03-28 18:49:36 -07:00
ZappoMan	80fb7bc287	add extra debugging to the kinect plugin	2017-03-28 18:42:15 -07:00
ZappoMan	bdfbc13185	add support for hand rotations to the kinect plugin, add notes on mapping from kinect orientations to our frame orientations	2017-03-28 15:09:03 -07:00
Ryan Huffman	56c5f06365	Fix Oculus Touch + Remote not being detected after initial launch	2017-03-23 16:29:08 -07:00
Brad Davis	e94f803b84	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-08 09:03:21 -08:00
Bradley Austin Davis	ce9d637b3f	Expose ASW activation status, provide normalized present rate information	2017-03-03 10:46:05 -08:00
Bradley Austin Davis	fa5b315e09	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-01 15:16:18 -08:00
Seth Alves	7a31a99e3c	back out previous experiment	2017-02-25 21:13:20 -08:00
Bradley Austin Davis	7fb7aa87eb	Working on new texture management strategy	2017-02-17 07:53:16 -08:00
Brad Hefta-Gaub	edf4cfa377	Merge pull request #9615 from kencooke/audio-packetloss-fix ... Reduce audio clicks/pops caused by packet loss	2017-02-06 13:12:08 -08:00
Ken Cooke	4acb99cd4f	Use interpolated audio (codec packet-loss concealment) or zero samples (if no codec) when audio packets are lost. This audio is still processed by the audio pipeline to avoid clicks/pops.	2017-02-06 09:29:39 -08:00
Brad Hefta-Gaub	2a20ce6062	fix kinect plugin claiming to have hands when not enabled	2017-02-04 10:38:46 -08:00
Stephen Birarda	1993e358d6	Merge pull request #9318 from birarda/ovr-platform-entitlement ... handle OVR Platform entitlement checks	2017-01-16 11:16:31 -08:00