683 commits

Author	SHA1	Message	Date
Anthony J. Thibault	8364700b7a	Head tracking bug fix for vive HMD users	2017-11-28 12:19:16 -08:00
Dante Ruiz	7daad29906	Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose	2017-11-28 10:44:04 -08:00
Dante Ruiz	039abff861	fix viveControllerManager not registering the vive input is no hand controllers are present	2017-11-28 10:43:37 -08:00
MiladNazeri	83d13717fe	Merge pull request #11752 from Menithal/21539 ... 21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected	2017-11-27 16:02:01 -08:00
Menithal	5d52b9936b	21539: Updated Logic to match request	2017-11-27 07:42:18 +02:00
Menithal	e28f80401f	21539: Removed debug, added whitespace for format	2017-11-05 01:07:35 +02:00
Menithal	ac1df7b815	21539: Allow HMD to turned off in Desktop Mode	2017-11-05 01:02:08 +02:00
luiscuenca	70b37f2e8a	Cleaning some old tabs	2017-10-27 11:32:44 -07:00
luiscuenca	f32282afdd	Clean update bug 8027	2017-10-27 11:03:02 -07:00
Anthony J. Thibault	d8e2cbf871	Oculus: Bug fix for head offset on large/small scaled avatars.	2017-09-28 16:20:09 -07:00
Seth Alves	ae42d56cd6	Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale ... Teleport.js: can now teleport small distances with small avatar scale	2017-09-26 19:05:14 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Anthony J. Thibault	f081c36f25	ViveControllerManager: Code review feedback on PR #11422	2017-09-26 14:19:31 -07:00
Anthony J. Thibault	09c61deda8	Fixes for Vive puck calibration	2017-09-20 15:41:49 -07:00
Bradley Austin Davis	bc4193f276	Merge branch 'master' into android_new	2017-09-19 14:27:31 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Anthony J. Thibault	f314ba38df	Oculus: fix for lighting changes as avatar scale changes ... The code was incorrectly NOT using the near and far clip distances when computing the culling projection matrix. This projection matrix is used by the lighting system to for deferred lighting, if it does not match actual projection used for rendering into the g-buffer, the lighting will be incorrect.	2017-09-18 14:38:03 -07:00
Anthony J. Thibault	7e2b2960ed	Fix for lighting as IPD scale changes. ... (cherry picked from commit a260aaaae8)	2017-09-18 12:15:32 -07:00
Anthony J. Thibault	b81f85e1ae	Merge branch 'master' into feature/ant-man	2017-09-11 15:14:03 -07:00
Bradley Austin Davis	48b6586d01	Modifying SDL initialization due to crash on OSX	2017-09-08 11:36:32 -07:00
Anthony J. Thibault	2f850826f2	Allow override of near/far clip planes in Oculus and OpenVR plugins	2017-09-06 11:02:44 -07:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
ZappoMan	87b2af25ba	re-enable sixense and update comment	2017-08-10 12:03:56 -07:00
SamGondelman	489e08aef0	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
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