Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 11:54:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
83215 commits 67 branches 56 tags 1.2 GiB
Commit graph

870 commits

Author SHA1 Message Date
Brad Hefta-Gaub
47cd6b332c
Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode 
Bug fix for head trackers in desktop mode
 2018-11-13 11:49:24 -08:00
Brad Hefta-Gaub
4bafcd2cfa
Merge pull request #14271 from SamGondelman/oculus 
Case 19475: Fix various Oculus Store test failures
 2018-11-13 11:06:39 -08:00
Jeff Clinton
6bd08325ec
Merge pull request #14272 from FlameSoulis/fix/spacenavigator 
Update Spacemouse plugin + Proposal to main build
 2018-11-13 10:59:11 -08:00
sabrina-shanman
753557736e Merge branch 'master' into hfm_library 2018-11-12 15:03:30 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
Anthony Thibault
ac8869eb61 Bug fix for head trackers in desktop mode 
Sitting and standing modes work even in desktop mode.
We were inadvertently checking for HMD Mode instead of if the head was valid.
* A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode.
* The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level.
* Sitting mode, walking mode and recentering flags are now visible in the AnimStats.
 2018-11-05 16:21:19 -08:00
sabrina-shanman
2801f324b7 Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00
SamGondelman
dd96881724 don't submit frames while oculus says it's not visible 2018-10-30 12:15:46 -07:00
SamGondelman
83fba2ee41 shutdown when oculus display lost 2018-10-30 11:23:36 -07:00
SamGondelman
799db33b34 reenable entitlements check 2018-10-29 17:22:45 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter 
Quality Improvements to Avatars driven by Vive Trackers
 2018-10-25 08:51:59 -07:00
Flame Soulis
f1f5f57650 Re-enabled all Axis (by popular request) 2018-10-24 08:52:34 -04:00
Flame Soulis
f25820c81a Add destroyInputPlugins() 2018-10-24 08:24:42 -04:00
Flame Soulis
f86518df08 Changed QString to char* for SpacemouseManager 2018-10-24 07:59:43 -04:00
John Conklin II
e21e7d30d7
Merge pull request #14126 from amantley/squattyPottyFix 
Sit State for the seated user in HMD:  Squatty Potty Fix
 2018-10-23 15:20:49 -07:00
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -07:00
amantley
cce2f295a1 fixed conflict in myskeletonmodel.cpp 2018-10-22 17:49:30 -07:00
amantley
ab7a70acba Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix 2018-10-11 22:55:55 -07:00
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
Anthony Thibault
a776f7e55a Changed default for OutOfRange data to Drop. 2018-10-09 10:51:02 -07:00
Anthony Thibault
7777f3edd0 Added OutOfRangeDataStrategy parameter to Controller Settings 
The openvr SDK provides a way to gauge the quality of tracking on a given device via the eTrackingResult enum.

* Drop - Only Running_OK is considered valid, all other eTrackingResults will return invalid poses.
* Freeze - Only Running_OK is considered valid, but other valid TrackingResults will return the last Running_OK pose.
  In esseces this will freeze the puck in place at the last good value.
* None - All valid eTrackingResults will be valid, including OutOfRange and Calibrating results.  This is the default.
 2018-10-09 10:51:02 -07:00
amantley
c4187f0d60 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-08 17:07:55 -07:00
Gabriel Calero
1719f4a474 Build libplugins_libhifiCodec.so 2018-10-05 23:49:06 -03:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586 
Teleport with play area
 2018-10-03 11:02:33 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix 
Disable Hand Touch when Leap Motion is running
 2018-10-03 09:03:43 -07:00
Anthony Thibault
b62ca2b75c Better configuration, i.e. which puck is associated with which limb. 
Previously we where incorrectly sorting the pucks along the x axis.
This could cause the order to be wrong if you were not standing along the z axis w.r.t the vive tracked volume.
 2018-10-01 18:43:19 -07:00
amantley
90feeffa9d cleaning up. putting squat fix in vertical recenter 2018-10-01 14:21:00 -07:00
luiscuenca
5ccbc5c029 Disable Hand Touch when Leap Motion is running 2018-10-01 10:47:06 -07:00
amantley
3a2a8fe4f8 adjusted openvr to use 0.0 for the floor instead of -1.6 2018-09-29 15:49:11 -07:00
amantley
fa9abf0fff added the floor at 0.0 in sensor space for oculus. to do: vive 2018-09-26 18:08:00 -07:00
amantley
ad6bbc7ff6 latest squatty changes 2018-09-25 11:22:44 -07:00
Anthony Thibault
b6d7b9b544 spelling 2018-09-25 10:44:00 -07:00
Anthony Thibault
a41591323b Code review feedback. 2018-09-25 10:42:43 -07:00
Anthony Thibault
fa27bb7e11 Bug fix for Vive puck calibration of hands and feet 
Before this PR, there were small errors that can occur if you calibrate while not facing down the z-axis in vive sensor space.
As indicated by the small arrow in the steam vr grid.

The hands could end up flipped 180 degrees and the feet could end up with an incorrect offset resulting in a wider or narrower stance then expected.
This PR is intended to fix these issues.
 2018-09-24 16:56:22 -07:00
David Rowe
96767c1103 Merge branch 'master' into M17217-b 
# Conflicts:
#	plugins/openvr/src/OpenVrDisplayPlugin.cpp
 2018-08-08 10:43:58 +12:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
David Rowe
11b85e30db Merge branch 'master' into M17217-a 2018-08-04 09:44:39 +12:00
David Rowe
41c4ecd465 Add HMD play area to API; Oculus and Vive 2018-08-01 15:20:51 +12:00
David Rowe
a3e677e64f Code review 2018-07-20 08:32:21 +12:00
David Rowe
5e624246a8 Fix HMD.mountedChanged() API signal 2018-07-19 13:00:57 +12:00
Alexander Ivash
57f32e64c1 remove the code of the rendering vive controllers and any code that uses that menu option. 2018-07-06 21:00:56 +03:00
Alexander Ivash
eb97f99db1 Revert "commented out code responsible for creating / populating 'Avatar' menu (per request from Mukul)" 
This reverts commit d40d1a9985770d2da82f5291ee33a7cfe8a73652.
 2018-07-06 21:00:55 +03:00
Alexander Ivash
bc6bfc1003 commented out code responsible for creating / populating 'Avatar' menu (per request from Mukul) 2018-07-06 21:00:55 +03:00
Brad Davis
197fb469eb Fix touch controller button handling when Oculus remote is paired 2018-06-15 10:16:32 -07:00
John Conklin II
287fd67e67
Merge pull request #13313 from dback2/gamepadEnabled 
Enable gamepad by default
 2018-06-07 12:42:04 -07:00
Bradley Austin Davis
e38059797d Update Oculus integration 2018-06-06 17:27:30 -07:00
David Back
c1dceda4ac enable gamepad by default 2018-06-05 12:01:06 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache 
Shader load time performance optimiziations
 2018-05-30 13:55:34 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
Anthony J. Thibault
ed726c9d77 OpenVR: Remove reference to HMD Standing Mode menu item 
This menu item has not existed for over a year.
I was sometimes seeing a crash on startup when the display plugin
attempted to reference this menu item.
 2018-05-14 13:51:13 -07:00
John Conklin II
5cd225e4de
Merge pull request #12947 from jherico/feature/splash2 
Additional work on splash screen
 2018-05-11 11:26:37 -07:00
Brad Davis
72526781d9 Additional work on splash screen 2018-05-04 16:40:05 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data 
Get the correct device name connect to OpenVr
 2018-04-24 13:29:41 -07:00
David Rowe
f865a13326 Doc review 2018-04-21 14:10:14 +12:00
David Rowe
748052614f Doc review 2018-04-21 12:45:00 +12:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12:00
Dante Ruiz
aa985fa682 add-more-hmd-data 2018-04-16 15:30:28 -07:00
Dante Ruiz
5af1ea54d3 Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data 2018-04-16 10:10:55 -07:00
John Conklin II
5bd3d0fab9
Merge pull request #12647 from birarda/feat/client-only-installer 
add a CLIENT_ONLY build option and handle for installer
 2018-03-21 11:20:36 -07:00
Sam Gateau
4341347148
Merge pull request #12639 from SamGondelman/aa 
Use correct platform-specific gpu library
 2018-03-20 14:47:26 -07:00
Stephen Birarda
1405c8fcb3 add a client only option to cmake 2018-03-20 14:20:58 -07:00
Stephen Birarda
f8df90e36d disable the sixense plugin by default 2018-03-15 13:53:10 -07:00
SamGondelman
21381a7295 fix building with gles on desktop (still crashes) 2018-03-14 11:44:00 -07:00
Dante Ruiz
1bae22fed0 get actual name for OpenVrDispayPlugin 2018-02-28 16:32:53 -08:00
Dante Ruiz
1bc8484a4b determine OpenVr headset namme 2018-02-28 11:50:52 -08:00
Brad Davis
8853bd6388 Fix spectator camera crash 2018-02-14 11:11:28 -08:00
Andrew Meadows
342ba5f8aa add 'task' lib dependency to HMD plugins 2018-02-13 08:57:20 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml 
Migrating QML rendering off the main thread
 2018-02-12 15:32:33 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs 
Misc bug fixes
 2018-02-12 14:31:38 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Atlante45
8ebb3e52d8 Misc bug fixes 2018-02-02 13:10:49 -08:00
samcake
f078ff611a Refining the declaraion signatures and adding the binary capture 2018-01-30 15:10:52 -08:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Bradley Austin Davis
cb3456195e Fix OSX Oculus plugin 2018-01-15 10:48:39 -08:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Brad Davis
c924cbf2a7 Remove explicit gpu-gl dependencies 2018-01-13 12:20:41 -08:00
Brad Davis
22d133c71f Allow GLES client on desktop builds 2018-01-11 23:31:34 -08:00
Anthony J. Thibault
dd0e57026e Oculus Touch: More accurate spin on thrown objects 
The internal computation of angular velocity was incorrect.
Apparently, the ovrPoseStatef.AngularRotation is not in sensor frame but local to the controller rotation.
 2018-01-08 15:28:59 -08:00
Dante Ruiz
82fb58ed96 remove debug statement 2017-11-29 10:58:10 -08:00
Dante Ruiz
eba8a6e17b Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose 2017-11-29 10:50:37 -08:00
Dante Ruiz
9a5f0dea95 better solution 2017-11-28 13:16:47 -08:00
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
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