Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 02:07:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69287 commits 25 branches 0 tags 1.1 GiB
Commit graph

1850 commits

Author SHA1 Message Date
howard-stearns
d730b7b87b consistent goToUser behavior in PAL, and be able to go to flying user. 2017-12-15 17:00:54 -08:00
Anthony Thibault
f3fcac8e58
Merge pull request #11903 from Delanir/IPD8258 
8258 IPD Tertiary Task List: Changing to Smaller Avatar Does not Resize Tablet
 2017-12-15 15:37:27 -08:00
Daniela Fontes
46583a90be Change abs to fabsf and other corrections requested. 2017-12-09 00:14:36 +00:00
Anthony J. Thibault
542af47e9e Fix for hand controller avatar scaling. 
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
  so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
  and also when the skeleton is no longer valid.  These hooks are used to cache the unscaled eye height of the avatar.
 2017-12-07 17:08:13 -08:00
Andrew Meadows
ed231fa4a1
Merge pull request #11894 from hyperlogic/bug-fix/flying 
Improvements to HMD flying
 2017-12-07 16:31:33 -08:00
Anthony J. Thibault
47b52238d9 code review feedback 2017-12-07 10:49:23 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Daniela Fontes
9bc165d8b4 Changing to Smaller Avatar Resizes Tablet 2017-11-30 18:49:53 +00:00
Anthony J. Thibault
a4d70e89df hmd turn roll tuning 
* Tighten action motor timescale while flying. This should cause less drift as the user
  changes direction and should lead to more comfort and control.
* Hmd head roll is only enabled if you are forward or backward faster then 2 meters per
  second. This should prevent un-intentional turning/rolling when hovering or moving at
  slow speeds.
* Documented hmdRoll tuning parameters accessible from JavaScript.
* Removed roll feathering code, because it is non-linear and can perhaps induce nausea.
* Tuned default dead spot and turning speeds to match Eagle Flight's defaults.
 2017-11-28 17:20:26 -08:00
Anthony J. Thibault
7327b79ce3 WIP 2017-11-28 11:37:58 -08:00
Anthony J. Thibault
b3896f664d Made increaseScale and decreaseScale more responsive at limits 2017-11-22 14:45:52 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -08:00
ZappoMan
b44ced4c21 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-20 17:19:18 -08:00
ZappoMan
04ee1adabd Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-19 14:40:31 -08:00
Seth Alves
93fd2a6a6b clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared 2017-11-15 20:10:05 -08:00
luiscuenca
10f484c668 6944 Avatar scale is saved across domains 2017-11-09 12:21:23 -07:00
MissLiviRose
45e58b93e5 add skeleton scale change signal so scripts can detect scaling change 2017-11-08 14:23:49 -08:00
ZappoMan
b5199220ab cleanup SpatiallyNestable Velocity to match WorldVelocity naming 2017-11-02 17:07:53 -07:00
ZappoMan
afaad5fcd7 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-02 13:39:51 -07:00
ZappoMan
f63db42c0e migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation 2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition() 2017-10-27 18:39:17 -07:00
luiscuenca
f0eab58ebd Bug 6719 fixed 2017-10-26 09:41:24 -07:00
Seth Alves
f2cb5d4aff clean-up concept of puffed queryAACube 2017-10-19 13:19:13 -07:00
Seth Alves
f1abb0cd55 don't send avatar-entity updates for queryCube-changes, because avatar-entities don't use them 2017-10-17 19:01:24 -07:00
Seth Alves
23f41457be Revert "Revert "fix importing of avatar entities"" 
This reverts commit 28a8b18060.
 2017-10-09 11:52:43 -07:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -07:00
Andrew Meadows
171151b92a use new form of MovingEntitiesOperator ctor 2017-09-29 11:34:32 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2 
Secondary IPD fixes
 2017-09-26 11:53:45 -07:00
Anthony J. Thibault
09c61deda8 Fixes for Vive puck calibration 2017-09-20 15:41:49 -07:00
Cain Kilgore
796e9e7ab3 Fixed things 2017-09-20 23:23:30 +01:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
Anthony Thibault
c7fc45e0ae Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering 
Avatar Attachments now render correctly
 2017-09-15 13:28:00 -07:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Cain Kilgore
67a5c75a0d Doesn't need to be here anymore 2017-09-15 06:08:22 +01:00
Cain Kilgore
c2e342ddac Gravity Implementation 2017-09-15 06:03:56 +01:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
Cain Kilgore
72ca62c4af Initial Commit - more to do. 2017-09-14 00:25:11 +01:00
Dante Ruiz
fec8482b69 Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man 2017-09-05 16:26:51 -07:00
Anthony J. Thibault
23ff1b9ead Fixes for scaling controller display 
Adds MyAvatar.sensorToWorldScaleChanged signal.
 2017-09-05 15:03:41 -07:00
Dante Ruiz
9f2bdce190 Merge pull request #11005 from Armads/WL21424 
WL21424 hide head attachments when head joint is hidden
 2017-09-05 13:04:14 -07:00
Anthony J. Thibault
a1b94fd9d2 Bug fixes for laser offset and avatar hold action 2017-08-31 17:26:00 -07:00
Anthony J. Thibault
c9cdaadeb5 Better scale support in SpatiallyNestable class. 
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.

Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field.  a new _dimensions member variable is used instead.  The SpatiallyNestable scale
field for entities should always be one.

Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.

Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.

Added qDebug stream support for Transform class.
 2017-08-30 15:46:36 -07:00
Anthony J. Thibault
9cd8b6991e Merge branch 'master' into feature/ant-man 2017-08-30 08:58:55 -07:00
Chris Collins
47a2e57e26 Merge pull request #10625 from humbletim/21180-C++ 
CR 21180-C++ Camera app -- core changes
 2017-08-30 07:20:00 -07:00
Anthony J. Thibault
5230b03f4f clang warning fixes 2017-08-28 10:35:03 -07:00
Anthony J. Thibault
573985c7c9 Merge branch 'master' into feature/ant-man 2017-08-28 09:27:04 -07:00
Anthony J. Thibault
3ac09b7716 Fix run blends and removed debug draws 2017-08-25 15:48:53 -07:00
Anthony J. Thibault
4f830cf1dc Calculate jump speed based on canonical jump height. 2017-08-25 15:34:51 -07:00
Anthony J. Thibault
e0ff7f5f40 Moved speed constants into AvatarConstants.h 2017-08-25 10:47:54 -07:00
Anthony J. Thibault
dd9ee28b18 Adjust avatar walking and flying speed based on sensor scale factor 2017-08-25 10:10:23 -07:00
Armads
b30562b9ce Adding checks to hide avatar attachments to other head and facial joints 2017-08-25 10:25:34 -04:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
humbletim
9348048387 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-08-24 16:23:47 -04:00
Anthony J. Thibault
d62a0ea8ff Correct controller offsets with sensor scaling 2017-08-22 11:43:39 -07:00
Anthony J. Thibault
ffdb10681e Fix for laser rendering and positioning with sensor scale 2017-08-22 11:07:04 -07:00
Anthony J. Thibault
de2262968e Fix for CAMERA_RELATIVE controllers with sensor scale 2017-08-22 09:44:32 -07:00
Anthony J. Thibault
8e56404c40 Fixes for flying and rotation re-centering in wikiplanet 2017-08-21 17:42:25 -07:00
Anthony J. Thibault
963ddce7bc Use eye-height to match user and avatar scales, follow fixes 
Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.
 2017-08-21 17:42:24 -07:00
Anthony J. Thibault
80b660b258 Added userHeight accessors and preference 
Also made Avatar::getHeight thread-safe
 2017-08-21 17:42:23 -07:00
Anthony J. Thibault
d196743986 Added Avatar::getHeight() method 2017-08-21 17:42:22 -07:00
Anthony J. Thibault
a0d72f08ac Fix for incorrectly scaled avatar collision on startup 2017-08-21 17:42:21 -07:00
Anthony Thibault
342f8acff5 Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision 
Improve avatar hand vs body collision
 2017-08-15 13:43:21 -07:00
Anthony J. Thibault
6e0ddadb29 Fix for array size. 2017-08-15 11:45:22 -07:00
Anthony J. Thibault
04006a9f76 code review feedback 2017-08-15 11:19:41 -07:00
Anthony J. Thibault
cd57c0706a more warning fixes 2017-08-11 17:46:50 -07:00
Anthony J. Thibault
49adf04913 Added Developer > Avatar > Show Detailed Collision menu option 2017-08-10 16:36:09 -07:00
Anthony J. Thibault
ae98974d79 improve 14-dop generation for avatar joint collision 
Also added debug rendering functionality.
 2017-08-10 15:52:51 -07:00
Anthony J. Thibault
4d845bd208 Bug fix for HMD roll causing avatar yaw when standing still 
HMD roll should only cause the avatar to yaw when actively driving.
 2017-08-09 15:52:27 -07:00
Anthony J. Thibault
98bbe887b9 Merge branch 'master' into feature/secondary-pose-support 2017-08-04 16:11:13 -07:00
Anthony Thibault
8a87ebd2a8 Merge pull request #11036 from AndrewMeadows/walkabout 
fix bugs preventing avatar from walking on spherical planet
 2017-08-01 16:36:35 -07:00
humbletim
3a9b8c02a6 * disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" 
* restore access to "View > Mirror" from HMD mode
 2017-08-01 13:41:28 -04:00
Anthony J. Thibault
2383933252 Merge branch 'master' into feature/secondary-pose-support 2017-07-31 10:55:40 -07:00
humbletim
3bcbec87e0 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-07-30 16:15:34 -04:00
Andrew Meadows
3ec9640ea1 fix calculation of walk motor for HMD 2017-07-28 09:22:47 -07:00
David Rowe
c1d179eba1 Add "dominant hand changed" signal 2017-07-28 14:20:49 +12:00
Brad Hefta-Gaub
d572510770 Merge pull request #11009 from AndrewMeadows/fix-QueryAACube 
update EntityItem bounding cube when on changed dimensions
 2017-07-27 18:21:06 -07:00
Anthony J. Thibault
78c6564174 Merge branch 'master' into feature/secondary-pose-support 2017-07-27 09:09:32 -07:00
Ryan Huffman
9421e6ebb6 Merge pull request #11029 from cain-kilgore/dominant-hands 
WL 21453 - Add a "Dominant Hand" setting
 2017-07-25 08:01:31 -07:00
Anthony J. Thibault
33a1d6e225 Merge branch 'master' into feature/secondary-pose-support 2017-07-24 17:27:33 -07:00
Andrew Meadows
8c55476c65 fix motor direction when walking upside down 
also maintain worldUp and remove unnecessary cruft
 2017-07-24 16:00:13 -07:00
Andrew Meadows
29be9aee65 move nextAttitude() from AvatarData to MyAvatar 2017-07-24 16:00:13 -07:00
Andrew Meadows
f0871c6878 avoid unnecessary and expensive gets 2017-07-24 16:00:13 -07:00
Cain Kilgore
9ff7891c88 Fixed reference error, Gustavo should build now. 2017-07-24 19:56:02 +01:00
Cain Kilgore
fd2264f7c9 removed duplicate 2017-07-24 19:05:49 +01:00
Cain Kilgore
e6fd85f45a Some code cleanup 2017-07-24 19:02:40 +01:00
Cain Kilgore
42742ba1f9 Changed the Return to a String "left/right" instead. 2017-07-24 18:31:16 +01:00
Cain Kilgore
630922dd95 Dominant Hands Branch Initial Commit 
Adds a new option in the Avatar Basics section of the Avatar Settings.

API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()

Defaults to false (Right Hand). Will return True if set to Left Hand.
 2017-07-24 06:18:24 +01:00
vladest
33a8ab2d58 Adjusted according discussion in PR 2017-07-21 18:18:23 +02:00
Andrew Meadows
a8dac0cb79 don't send constant updates for grabbed objects 2017-07-20 15:45:50 -07:00
vladest
4b94d24c29 Change default mouse speeds for avatar 2017-07-18 23:51:19 +02:00
humbletim
f9e0e616f7 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-07-18 17:34:39 -04:00
humbletim
190e1ac7d9 move/scope viewOrientation into the related code block 2017-07-18 17:22:16 -04:00
Brad Hefta-Gaub
2dfaf7b02a Merge pull request #10862 from NeetBhagat/5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 
Case 5783: Restarting Interface allows you to have Avatar Scale Too Big
 2017-07-18 08:51:13 -07:00
NeetBhagat
ff51fa7199 Resolved review comments. 2017-07-18 10:42:01 +05:30
Anthony J. Thibault
fe711ccbe9 Refactored how controller poses are stored in MyAvatar. 2017-07-13 15:01:14 -07:00
Cain Kilgore
521babb6bd Avatar Scaler - should be PR Ready. 2017-07-13 19:18:51 +01:00
NeetBhagat
11f8f5cffc Solve : implicit conversion from ‘float’ to ‘double’ issue 2017-07-13 18:26:52 +05:30
NeetBhagat
e08e9d6821 The current scale of avatar should not be more than domain's max_avatar_scale and not less than domain's min_avatar_scale. 2017-07-11 20:42:00 +05:30
NeetBhagat
1a47383d4f Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 2017-07-11 19:23:46 +05:30
NeetBhagat
dd2dbd9b39 Initial Commit to resolve problem :> When Max Avatar scale is set in Sandbox -> setting, take that value as default max value 2017-07-10 18:26:33 +05:30
Liv
060e3a9c5a Add signal for avatar skeleton changing 2017-07-07 11:48:12 -07:00
NeetBhagat
685b1c2445 Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 2017-07-07 11:30:54 +05:30
Dante Ruiz
b86a8b8338 Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop 2017-07-05 18:27:33 +01:00
NeetBhagat
440b941730 Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 2017-07-05 18:47:13 +05:30
Seth Alves
70a7b302fc Merge pull request #10860 from jherico/deadlock_guards 
Don't use blocking connections on the main thread
 2017-07-03 09:05:56 -07:00
humbletim
9053531bda fix missing viewPosition + offset 2017-07-03 12:03:46 -04:00
humbletim
026e05f80c Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-07-03 11:55:59 -04: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
577969481d head puck working 2017-06-30 23:43:12 +01:00
Ryan Downe Karpf
ddce264dd9 Merge pull request #10819 from Menithal/21387 
WL21387 - Avatar Bookmarks now save Attachment Data and scale PR#2
 2017-06-30 14:57:04 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
NeetBhagat
5ff0bc409b solve the bug : Avatar scale value should be 3.0 ,if user has set scale value > 3.0 previously . 2017-06-30 15:40:38 +05:30
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Menithal
232382e6d0 21387: Fixed issue with av scaling via script 2017-06-26 19:52:11 +03:00
Menithal
359642eb0e Refining and allowing for Avatar Scale to be saved as well 2017-06-25 23:55:47 +03:00
humbletim
f6262ad54d Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-06-23 16:37:10 -04:00
David Rowe
9d0407cbdf Merge branch 'master' into 21396 2017-06-23 16:52:04 +12:00
Andrew Meadows
62e862fef0 Merge pull request #10733 from Menithal/21384 
21384: Added Support to Disabling flight from client side
 2017-06-22 13:38:01 -07:00
David Kelly
5da01f0074 updated comments 2017-06-22 07:09:24 -07: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
David Kelly
94a33fea94 new switches to override avatarURL 2017-06-21 16:03:05 -07:00
Anthony J. Thibault
29e3af820b Fix for avatars with no eyes. 
The calculation of the centerEyeCalibration matrix (and several others) were incorrect.
 2017-06-20 10:14:34 -07:00
Anthony J. Thibault
21c0e45d87 recenter rotation while driving. 
This should reduce foot sliding in HMD mode.
 2017-06-20 09:43:38 -07:00
Matti Lahtinen
82df64d5e7 flyingAllowed to zoneAllowsFlying 2017-06-19 21:44:43 +03:00
Matti Lahtinen
600a39c9b2 Fixed Zone overriding Client. 2017-06-18 13:14:01 +03:00
humbletim
fc33e95e2d Merge branch 'master' into 21180-C++ 2017-06-16 16:16:42 -04:00
Zach Fox
47e5fb56d3 Show MyAvatar's head in the SpectatorCamera view! 2017-06-15 11:31:20 -07:00
David Rowe
16bebdd409 Rename identifiers 2017-06-15 09:20:55 +12:00
David Rowe
55e0082792 Code review 2017-06-15 09:10:08 +12:00
Menithal
112f186304 Added minor Comments 2017-06-14 22:24:18 +03:00
Menithal
a1c2f71f30 Added couple of state getters 
This allow scripts to check if avatar is flying or if the avatar is in
air (but not flying). Both of these allows one to distinguish if the
avatar is flying or falling or just jumping with Velocity
 2017-06-14 20:19:04 +03:00
Menithal
66d43b80e2 Added getters for State if in Air or Flying 2017-06-14 19:53:08 +03:00
Menithal
c92e22fd20 21384: Added Menu Option 2017-06-14 19:05:00 +03:00
Menithal
53fe5736d8 21384: Initial Disable Flying 2017-06-14 18:24:45 +03:00
David Rowe
be2bcb1c13 Turn with head roll in HMD when walking or flying 2017-06-14 12:20:46 +12:00
Andrew Meadows
321e307c9f Merge pull request #10609 from 1P-Cusack/21317 
WL21317 helper functions for getting into avatar coordinate space
 2017-06-12 11:18:29 -07:00
Chris Howe
08d93173f0 Minor code feedback changes, moving test scripts to developer/tests. 2017-06-09 11:07:56 -04:00
Seth Alves
3b47142592 fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-08 10:28:38 -07:00
howard-stearns
9cf027a68c pr feedback 2017-06-07 16:44:13 -07:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
Seth Alves
69520ff3db pull from upstream, code review 2017-06-07 10:28:02 -07:00
Chris Howe
8166fec0e0 Minor changes based on code review feedback 
See https://worklist.net/21317,
https://github.com/highfidelity/hifi/pull/10609 and
https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197
 2017-06-06 12:11:57 -04:00
Howard Stearns
3de243b093 Include the radius of the sphere at the avatar's feet. 2017-06-05 18:48:11 -07:00
Seth Alves
7a276f027f fix orientation used for 3d audio 2017-06-05 15:53:01 -07:00
humbletim
7cab0363a9 standalone 21180 branch with just the C++ changes 2017-06-05 15:57:54 -04:00
Seth Alves
27669d44a7 in deriveBodyFromHMDSensor, avoid using invalid head pose 2017-06-05 08:58:40 -07:00
Howard Stearns
ca526e0776 git rid of a lambda 2017-06-05 07:11:25 -07:00
Howard Stearns
05f41fb4f8 cleanup 2017-06-04 08:13:12 -07:00
Howard Stearns
a0ea306aed cleanup, and include missing allowBackface parameter 2017-06-04 07:55:23 -07:00
Howard Stearns
fd01258c76 cleanup 2017-06-03 16:02:58 -07:00
Howard Stearns
02c46080f7 we don't need to force, but we do need some extra room for confined spaces 2017-06-03 15:43:14 -07:00
Howard Stearns
c48b729527 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-02 18:05:20 -07:00
Seth Alves
3359a0a794 work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation 2017-06-02 15:29:20 -07: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
howard-stearns
6b2e4c5abc zaru stuff 2017-06-01 17:08:22 -07:00
Seth Alves
7d21ab88b0 add some saftey checks. cleanups 2017-06-01 16:14:59 -07:00
Seth Alves
552b69bb1c cleanups 2017-06-01 13:47:19 -07:00
howard-stearns
1068a4a9bd remove the optimization for upperId == lowerId. Doesn't work in zaru 
tunnels.
 2017-06-01 13:21:24 -07:00
Seth Alves
eb94c48c5b merge from upstream 2017-06-01 10:10:11 -07:00
Sam Cake
3c9b14ee94 Oene more fix 2017-05-31 23:26:20 -07:00
Sam Cake
03fdc1396c Fixing the warnings 2017-05-31 23:20:10 -07:00
howard-stearns
1e1dd3a633 checkpoint with working detector 2017-05-31 17:10:37 -07:00
Seth Alves
e37387f45c sync 2017-05-31 14:01:09 -07:00
Chris Howe
6edc6b2756 WL21317 
New MyAvatar functions to support converting from avatar joint space to
world space and vice versa. Added some tests to support these functions.
 2017-05-31 15:05:43 -04:00
howard-stearns
07ea2e271b hook into location changes 2017-05-30 14:59:19 -07:00
Seth Alves
ffe844a8e7 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-30 13:42:20 -07:00
howard-stearns
92aeadd70f rotation of local capsule offset 2017-05-26 16:34:08 -07:00
howard-stearns
f694691efb add fixme comments and make isUp/isDown ordinary methods. 2017-05-26 16:15:18 -07:00
howard-stearns
4be31f1b18 thread safety 2017-05-26 15:31:59 -07:00
howard-stearns
7cee438298 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-05-26 11:36:04 -07:00
howard-stearns
905b5261d1 If collisions are enabled, turn them off in safeLanding, and 
restore.
 2017-05-25 16:32:44 -07:00
Seth Alves
af5ba3a90a ask display-plugins if they are head-controllers 2017-05-25 15:14:10 -07:00
howard-stearns
ac8cb63419 clean and DRY 2017-05-25 14:34:24 -07:00
Dante Ruiz
108c444cc7 clean up code 2017-05-25 21:59:06 +01:00
howard-stearns
9d73d0c931 works with nested enclosing entities 2017-05-25 12:09:22 -07:00
Seth Alves
3823ece153 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-25 10:57:46 -07:00
Seth Alves
bdbc6ddcc1 change some code to look at head-controller position rather than hmd position 2017-05-25 10:50:41 -07:00
howard-stearns
74c163d047 snapshot of safeLanding. Works as long as entities don't intersect. 2017-05-25 10:25:29 -07:00
Dante Ruiz
8cb9bfcc81 fixed merge conflict 2017-05-24 19:35:41 +01:00
Dante Ruiz
ac3c9655ec added arms 2017-05-24 01:28:08 +01:00
Dante Ruiz
0cbdeaa1e8 Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks 2017-05-23 18:26:58 +01:00
Dante Ruiz
54d63f5155 Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter 2017-05-23 18:19:38 +01:00
Anthony J. Thibault
06c26f029a Merge branch 'master' into feature/faster-ik-iterations 2017-05-23 09:10:17 -07:00
Dante Ruiz
d98e7d5bc6 adding left and right arm 2017-05-23 00:26:12 +01:00
Andrew Meadows
7b879a7964 Model has a Rig rather than a RigPointer 2017-05-19 13:24:16 -07:00
Anthony J. Thibault
e99001d86c debug draw ik chains, bug fix for flex coef on tips 
And opened up hip constraints.
 2017-05-18 16:29:55 -07:00
Dante Ruiz
984f9e1ba5 Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter 2017-05-18 21:23:06 +01:00
Andrew Meadows
09433a93ba Merge pull request #10477 from AndrewMeadows/correct-avatar-mass 
More correct avatar mass
 2017-05-17 16:22:06 -07:00
Dante Ruiz
a18940142e Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter 2017-05-17 16:23:50 +01:00
Brad Hefta-Gaub
764bfe94f5 Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270 
Feature/snap turn smoothing 21270
 2017-05-16 21:05:38 -07:00
Andrew Meadows
d065b569d3 support for variable avatar mass by size 2017-05-16 16:03:51 -07:00
Dante Ruiz
724f849d88 Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter 2017-05-16 00:15:18 +01:00
Dante Ruiz
975b1ab077 moved low velocity filter in the input system 2017-05-16 00:15:06 +01:00
Vladyslav Stelmakhovskyi
cc10fc81b7 Fix crash in sit script 2017-05-13 20:57:04 +02:00
Anthony J. Thibault
93b8dc550c Merge branch 'master' into feature/ik-solver-init-config 2017-05-10 09:03:21 -07:00
trent
a3545661dc Merged hifi/master into this PR and resolved merge conflicts. 2017-05-09 15:09:53 -04:00
Anthony J. Thibault
712fcbe27a Removed cruft/debug code & comments 2017-05-08 15:06:30 -07:00