229 commits

Author	SHA1	Message	Date
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	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
Anshuman Dewangan	e3cd85bd22	Changed calibration time from 2 to 1 sec	2017-05-16 13:55:04 -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
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
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
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
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
Anthony J. Thibault	4e49774d0e	Moved device class check into handleTrackedObject	2017-04-06 13:20:00 -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
Sam Cake	dd73cb7b8e	Use a magic number gpu::Texture::SINGLE_MIP instead of 1	2017-03-30 23:46:37 -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
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	a72f60152b	audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate	2016-12-29 08:53:37 -08:00