Seth Alves
14d5029f4d
only update cauterization of child entities when something relevant changes
2018-02-02 08:56:11 -08:00
Anthony J. Thibault
b23f98b311
Removal of hips offset shifting from AnimInverseKinematics node
...
With the addition of the hips IK target, the hips offset shifting code is no longer necessary.
This PR should not effect any behavior, but it removes this unused code from the animation system.
2018-01-31 17:56:33 -08:00
Seth Alves
64a46bf5df
merge from upstream
2018-01-31 10:43:41 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
Dante Ruiz
264aa7f4d2
Merge pull request #12191 from druiz17/entity-attachment-bookmark
...
Bookmark avatar entities
2018-01-29 12:55:35 -08:00
Seth Alves
98e0e663e7
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-29 12:36:37 -08:00
Dante Ruiz
a670a0b9a2
Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark
2018-01-29 11:25:26 -08:00
Seth Alves
17ec79f182
add breaks in case statements that used to have returns
2018-01-26 10:36:16 -08:00
Sam Gateau
51dac04374
Introducing the tag in lieu of the vsisiblity mask
2018-01-26 02:59:43 -08:00
Seth Alves
b6f7d2eb89
print warnings if head position contains not-a-number
2018-01-25 15:15:59 -08:00
Dante Ruiz
2cbcc28bd4
only call init animGraph once
2018-01-24 10:44:04 -08:00
Seth Alves
1cbc2e31cf
merge from upstream
2018-01-23 15:21:03 -08:00
Dante Ruiz
071f7d54d9
Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update
2018-01-23 14:44:26 -08:00
Dante Ruiz
6a03557801
don't override sensorToWorldMatrix
2018-01-23 14:44:10 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
Seth Alves
31c007d167
more backwards logic, added withViewVisibilityMask call in ItemKey
2018-01-18 14:15:30 -08:00
Seth Alves
fb974b0b9c
attempt to straighten out use of view-visibility masks
2018-01-18 10:09:23 -08:00
Anthony J. Thibault
c5efcf5d6a
Bug fix for cocked head after playing an input recording.
...
I thought this was the cause of the Manuscript case 11454 but apparently not.
2018-01-18 09:21:15 -08:00
Seth Alves
76ef3d7c7d
pull from upstream
2018-01-18 07:01:50 -08:00
Brad Davis
cbb2d9d854
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 17:51:39 -08:00
Dante Ruiz
eadd3b48bd
bookmark avatar-entities-done
2018-01-17 15:42:07 -08:00
Dante Ruiz
8f22c719b3
Merge pull request #12099 from sethalves/run
...
allow avatar walk-speed to be set from javascript
2018-01-17 13:53:13 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor
...
Remove dangerous "Use Anim Pre and Post Rotations" menu item
2018-01-17 13:41:51 -08:00
Bradley Austin Davis
9f6c2c3cdd
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 11:44:00 -08:00
Dante Ruiz
ebb09f4271
Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark
2018-01-17 11:04:46 -08:00
Dante Ruiz
3abb3d6fcc
trying to add offset
2018-01-17 11:04:32 -08:00
Seth Alves
1e847cf32e
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-17 08:08:13 -08:00
Seth Alves
d3084dc0df
defang
2018-01-17 07:11:27 -08:00
Anthony J. Thibault
51ea2632c0
Remove Avatar UseAnimPreAndPostRotations option.
...
This should always be true and can lead to hard to diagnose bugs if it is ever set to false.
2018-01-16 17:27:19 -08:00
Dante Ruiz
7707e68234
bookmarks add back avatar-entities
2018-01-16 15:37:03 -08:00
Brad Davis
58530c595a
Pre-merge cleanup
2018-01-14 19:48:12 -08:00
Dante Ruiz
5b82c7bc41
fix merge conflict
2018-01-12 11:00:19 -08:00
Brad Davis
7579451c24
Merge remote-tracking branch 'upstream/master' into android
2018-01-11 23:31:45 -08:00
Seth Alves
e7a3d98ae5
don't draw head-descendent entities when in 1st-person camera mode
2018-01-11 19:34:54 -08:00
Dante Ruiz
96a97b5938
added model transform override
2018-01-11 16:41:45 -08:00
Seth Alves
c09f644612
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-11 09:09:11 -08:00
Brad Davis
97593bc4d8
Fixing compiled resource access
2018-01-10 17:18:12 -08:00
Dante Ruiz
c4253f3b3b
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-09 15:31:38 -08:00
Seth Alves
d0ddbc0092
fix warning
2018-01-08 16:52:07 -08:00
Seth Alves
ad389e5072
make avatar walk-speed adjustable from js. add a tablet button to control walking vs running
2018-01-08 15:27:41 -08:00
Seth Alves
1c94c9c11d
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-08 12:27:42 -08:00
Seth Alves
f1c03b2d40
adjust RENDER_HEAD_CUTOFF_DISTANCE so that I don't see my head when I run
2018-01-08 12:27:35 -08:00
Anthony J. Thibault
61edd83987
Improve stability for HMD third person avatars
...
Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person.
The reason the hack existed was to make third person camera less nauseating for users.
However this had a major drawbacks.
It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera.
To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.
2018-01-08 11:26:29 -08:00
John Conklin II
d660bbf6e5
Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit
...
Bug fix for sit script.
2018-01-08 09:59:17 -08:00
Seth Alves
f6fed444b0
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-08 07:49:09 -08:00
Anthony J. Thibault
243dcb88ee
Bug fix for sit script.
2018-01-05 16:20:44 -08:00
Seth Alves
3cd0ec3336
default run speed is faster, advanced movement on by default
2018-01-05 13:20:41 -08:00
Dante Ruiz
6fa3446c57
joints are being relayed to children
2018-01-02 13:54:13 -08:00
humbletim
a146b778f7
support additional .extraInfo for ray intersections
2017-12-21 12:35:13 -05:00
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