658 commits

Author	SHA1	Message	Date
SamGondelman	bd942ec406	merge from master	2017-08-04 12:17:54 -07:00
Brad Davis	5a7a6bab70	Remove PDB files, eliminate sixense	2017-08-02 14:08:46 -07:00
Anthony J. Thibault	2383933252	Merge branch 'master' into feature/secondary-pose-support	2017-07-31 10:55:40 -07:00
Andrew Meadows	d4e72df928	Merge pull request #10711 from burtsloane/midi ... Midi support for Entities	2017-07-28 10:51:43 -07:00
Chris Collins	4684b388c7	Merge pull request #10987 from SamGondelman/hmd59Crash2 ... Fix crash when putting on HMD for Qt 5.9	2017-07-28 07:41:07 -07:00
Anthony J. Thibault	6c2b6674bb	load and save shoulderConfig to settings.	2017-07-27 17:33:54 -07:00
Anthony J. Thibault	78c6564174	Merge branch 'master' into feature/secondary-pose-support	2017-07-27 09:09:32 -07:00
Anthony J. Thibault	8dc9714282	Pass armCircumference and shoulderWidth to qml.	2017-07-27 09:08:34 -07:00
Sam Gondelman	fcaa39b245	Merge branch 'master' into sharks	2017-07-26 18:18:09 -07:00
Anthony J. Thibault	2a45c6d3dc	Removed eigen dependency, fixed Debug Draw IK Chains ... Also, clarified for special case for secondary shoulder joint look-at constraint.	2017-07-26 16:55:12 -07:00
burtsloane	d4ae298a8d	Merge branch 'master' into midi	2017-07-26 13:59:07 -07:00
Burt Sloane	4f7243e444	Merge branch 'master' of https://github.com/burtsloane/hifi into midi	2017-07-26 13:30:57 -07:00
Burt Sloane	d2975c79c9	add midi to 3 CMakeLists.txt for linking	2017-07-26 08:41:26 -07:00
Anthony J. Thibault	572213daaf	Added shoulder config to Controller Settings UI ... All offset values in Controller Settings UI are now in cm.	2017-07-25 17:05:07 -07:00
Anthony J. Thibault	c81875a280	Improved shoulder calibration using hard-coded measured shoulder width	2017-07-25 15:50:44 -07:00
Brad Davis	8d37e54a4e	Merge pull request #11051 from highfidelity/qt59 ... Changes for Qt 5.9 warnings and build issues	2017-07-25 15:05:28 -07:00
Andrew Meadows	9d1fba3a3b	Merge pull request #10821 from ctrlaltdavid/21418 ... Don't execute body of controllers' plugin update methods if not enabled	2017-07-25 08:51:17 -07:00
SamGondelman	3c8b964cc9	replace setHandLasers with drawHUDLayer overlay property	2017-07-24 18:16:40 -07:00
Anthony J. Thibault	9f6641ed10	Shoulder puck calibration work in progress ... * AnimInverseKinematics: debug draw for secondary targets * AnimInverseKienmatics: better clean up of ik target debug draw * GeometryUtil: added findPlaneFromPoints() * ViveControllerManager: external dependency on eigen * ViveControllerManager: record history of left/right hand controllers * ViveControllerManager: use history to determine user shoulder location for better calibration * ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions. * CMake: added external depenency to eigen linear algebra library.	2017-07-24 17:22:48 -07:00
Brad Davis	3a31805dff	Fix warnings in Qt 59 / VS 2017 build	2017-07-20 11:57:12 -07:00
Anthony J. Thibault	2e0bc36cfd	warning fix + whitespace	2017-07-13 15:17:49 -07:00
Anthony J. Thibault	22d8adcb99	Better shoulder/arm puck calibration.	2017-07-13 10:39:48 -07:00
Anthony J. Thibault	eb486c8f47	comments	2017-07-06 11:03:03 -07:00
Anthony J. Thibault	4e9b8c1ef9	updated comments	2017-07-06 11:01:59 -07:00
Anthony J. Thibault	dee9769be3	Can now use chest, hips, shoulder & feet pucks in desktop mode. ... * Fixed bug where head puck would sometimes not work properly when other vive trackers were enabled. * Fixed calibration to work in sensor space instead of avatar space, this was necessary because the sensor to world matrix is unreliable when in desktop mode.	2017-07-06 10:54:03 -07:00
Anthony J. Thibault	8c15d1bab9	delete-trailing-whitespace	2017-07-06 10:54:02 -07:00
David Rowe	cfd155c198	Merge branch 'master' into 21418	2017-07-06 16:56:10 +12:00
Dante Ruiz	07d098b95b	coding standard fix	2017-07-05 19:45:52 +01:00
Dante Ruiz	275f48b65a	another requested change made	2017-07-05 19:22:19 +01:00
Dante Ruiz	e567cf0196	made requested changes	2017-07-05 19:04:34 +01:00
Dante Ruiz	27a9880eff	removed double add of head offset	2017-07-05 18:34:33 +01:00
Dante Ruiz	691b59ffff	remove debug statments	2017-07-05 18:26:58 +01:00
Dante Ruiz	a417f74bad	Merge branch 'calibration-ui-update' into vive-in-desktop	2017-07-03 16:56:58 +01:00
Dante Ruiz	5fbcd494be	made final requested changes	2017-07-03 16:46:58 +01:00
Dante Ruiz	063984f573	Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update	2017-07-03 16:44:47 +01:00
Dante Ruiz	6f30cb1825	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-01 00:48:49 +01:00
Dante Ruiz	51792769b5	finished vive in desktop mode	2017-07-01 00:48:36 +01:00
David Rowe	07697c5083	Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.	2017-07-01 11:19:00 +12:00
Dante Ruiz	309a03230c	Merge branch 'calibration-ui-update' into vive-in-desktop	2017-06-30 23:43:59 +01:00
Dante Ruiz	577969481d	head puck working	2017-06-30 23:43:12 +01:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
Dante Ruiz	a749fa19ad	made requested changes	2017-06-30 19:14:22 +01:00
Dante Ruiz	3e1aee4d8a	saving work	2017-06-30 19:07:34 +01:00
Dante Ruiz	a7e4dc1473	clean up code	2017-06-28 23:51:00 +01:00
David Rowe	be0e1a75a4	User-friendly SDL2 controller name	2017-06-29 10:03:58 +12:00
David Rowe	88ed69a4a1	Code review	2017-06-29 08:58:27 +12:00
Dante Ruiz	a2df2f8472	added user activity status	2017-06-28 19:52:19 +01:00
Seth Alves	59e72470f3	Merge pull request #10793 from druiz17/wide-stance-fix ... MoCap wide stance fix for calibration	2017-06-26 10:13:26 -07:00
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
David Rowe	384e2cefdb	Update make file per master changes	2017-06-24 09:53:58 +12:00
David Rowe	6e266dfbac	Merge branch 'master' into 21396	2017-06-24 09:19:12 +12:00
Brad Davis	fe7d4b1d23	Remove dependency between codec plugins and UI	2017-06-23 12:25:18 -07:00
David Rowe	9f48a139cc	Fix crash when enable Leap Motion	2017-06-23 18:37:48 +12:00
David Rowe	e1dcf01706	Better settings text	2017-06-23 17:33:02 +12:00
Dante Ruiz	b48efc4317	fixed wide stance issue	2017-06-22 22:48:32 +01:00
David Rowe	f633f074b3	Post-merge fix	2017-06-23 00:24:28 +12:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
David Rowe	3bdf267900	Implement fingers control	2017-06-22 23:32:06 +12: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
David Rowe	61bb853cdd	Fix hand position	2017-06-19 17:26:55 +12:00
David Rowe	cacc89e8b6	HMD hand positions and orientations	2017-06-19 17:21:44 +12:00
David Rowe	deae33fd1e	Add setting for desktop "zero" height offset	2017-06-18 17:43:52 +12:00
David Rowe	2d1cc12bc5	Desktop hand positions and orientations	2017-06-18 16:40:55 +12:00
David Rowe	5b6a5525b6	Initial control of avatar hand positions	2017-06-18 13:03:54 +12:00
David Rowe	0d986b8dc2	Signal when Leap Motion is connected	2017-06-17 14:43:32 +12:00
David Rowe	8d84e86d19	Apply sensor location setting	2017-06-17 13:57:43 +12:00
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