129 commits

Author	SHA1	Message	Date
Dante Ruiz	13dff29bd5	adding calibration screen	2017-06-20 01:19:10 +01:00
Dante Ruiz	734cde33e7	better calibrate button	2017-06-19 21:40:09 +01:00
Dante Ruiz	2015f059c7	fixed hand calibration	2017-06-17 00:37:33 +01: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
Dante Ruiz	ef9a211f6e	adding hand punck	2017-06-13 21:15:16 +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
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	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
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
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	4c4811dca8	finished the head puck	2017-05-30 22:52:39 +01:00
Dante Ruiz	a45bea2c90	fixed merge conflicts	2017-05-27 00:57:09 +01:00
Dante Ruiz	d317d9236f	made requested changes	2017-05-26 16:40:21 +01: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
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