Andrew Meadows
61b8d005b5
scripts can edit AvatarEntities again
2019-01-09 17:27:14 -08:00
Andrew Meadows
6c81e8845b
cleanup
2019-01-09 17:27:14 -08:00
Andrew Meadows
fe2ee68b79
add EntityItemProperties::copyFromJSONString()
2019-01-09 17:27:14 -08:00
Andrew Meadows
ec384d7dbb
more correct reload AvatarEntityData from settings
2019-01-09 17:27:14 -08:00
Andrew Meadows
0ed936520d
MyAvatar saving to settings works again
2019-01-09 17:27:14 -08:00
Andrew Meadows
e37b5b52f0
correctly load AvatarEntities from settings redux
2019-01-09 17:27:14 -08:00
Andrew Meadows
026c6301a6
correctly load AvatarEntities from settings
2019-01-09 17:27:14 -08:00
Andrew Meadows
01fc442695
save AvatarEntities settings as strings
2019-01-09 17:27:14 -08:00
luiscuenca
95fca826a5
Add fit AABox for avatar and implement multisphere on shapeManager
2019-01-09 17:49:19 -07:00
Anthony Thibault
5d606981de
Added HMD Avatar Alignment Type
...
Adds a new API to set this type, and an option to the Avatar App.
* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head. The new default behavior.
This prevents the body from lifting off of the ground while wearing a large headed avatar. But can cause an offset between the users eyes and the avatars eyes.
2019-01-08 18:35:28 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption
...
Add menu checkbox to toggle collisions with other avatars
2019-01-07 08:58:09 -08:00
luiscuenca
d630fe9dbd
Add menu checkbox to toggle collisions with other avatars
2019-01-04 16:38:48 -07:00
Anthony Thibault
7e68f539d3
Only use the camera position for lookAt in first person.
2019-01-03 15:27:44 -08:00
Anthony Thibault
fa137f0586
Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation
2019-01-03 13:19:11 -08:00
Seth Alves
78aff6e95c
grab js api; send grab information through trait system
2019-01-03 08:17:52 -08:00
David Rowe
14d39d1747
Make mouselook yaw and pitch directly proportional to mouse movement
2019-01-03 15:53:37 +13:00
Anthony Thibault
006bd8f939
Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation
2019-01-02 16:58:10 -08:00
Anthony Thibault
71991c2e2f
Added max angles and isTalking into the lookAtCostFunction
2019-01-02 11:05:01 -08:00
Anthony Thibault
d87bc3e898
Update eye look at interest calculation
...
This now takes distance, your facing toward them, and their facing toward you into the interest calculation.
Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar.
Previously these two separate elements where merged together in a single loop.
2018-12-31 13:37:22 -08:00
SamGondelman
b5a2642b6a
updated entityscriptinginterface API and related functions
...
(cherry picked from commit 6aac596698
2018-12-22 00:55:10 -05:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities"
2018-12-20 16:53:33 -08:00
Shannon Romano
b6d1607acd
Merge pull request #14547 from SamGondelman/NOverlays5
...
Case 20200: Update EntityScriptingInterface to not find local entities
2018-12-20 19:10:22 +00:00
Jeff Clinton
16e3914cd7
Merge pull request #14598 from amantley/ripOutCruft
...
Fix for Camera-perspective-is-off-in-first-person-view, master branch
2018-12-18 17:15:58 -08:00
Wayne Chen
28fd1380df
adding target scale and default avatar to login state
2018-12-17 13:37:28 -08:00
Angus Antley
77fa4e7d13
took out the unnecessary hfm.jointindex code
2018-12-16 17:29:16 -08:00
SamGondelman
6aac596698
updated entityscriptinginterface API and related functions
2018-12-07 15:25:21 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays
2018-12-06 11:29:06 -08:00
Jeff Clinton
b9156d68e5
Merge pull request #14508 from amantley/restingHandsBug
...
removed the code that turns off inactive hands in MyAvatar.cpp
2018-12-06 09:42:34 -08:00
amantley
88a9a96346
removed the code that turns off inactive hands in MyAvatar.cpp
2018-11-30 10:08:05 -08:00
Clement
181f2b4263
Fix Agent crash on shutdown
2018-11-28 18:40:52 -08:00
SamGondelman
079d1dcbd6
convert clientOnly to entityHost and add local entities
2018-11-14 11:25:37 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
...
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -08:00
Jeff Clinton
2afc8c505d
Merge pull request #14344 from ElderOrb/FB19348
...
FB19348 - Interface doesn't save changes to avatar animation text field
2018-11-13 14:29:25 -08:00
Brad Hefta-Gaub
b5e432bcb1
Merge pull request #14265 from amantley/needToSquat
...
Bug fix for Users unable to Squat
2018-11-13 12:01:06 -08:00
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
Jeff Clinton
ab8ba2daad
Merge pull request #14230 from amantley/shoulderSpaceFix
...
Hand Azimuth improvement
2018-11-12 16:00:26 -08:00
amantley
f2f4a55c19
removed cruft
2018-11-12 15:07:14 -08:00
Jeff Clinton
12b833d121
Merge pull request #14167 from ElderOrb/FB18859
...
Make material entities to be presented in avatarapp
2018-11-09 15:32:27 -08:00
SamGondelman
1d1510e18e
Merge remote-tracking branch 'upstream/master' into police
2018-11-09 13:32:41 -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
Alexander Ivash
3bc274dd10
FB19348 - Interface doesn't save changes to avatar animation text field
2018-11-04 23:11:59 +05:30
sabrina-shanman
cbca77b12f
Rename HFMGeometry to HFMModel and adjust related variables
2018-11-01 17:17:48 -07:00
sabrina-shanman
becee7f010
Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-10-30 17:28:42 -07:00
amantley
7fe53d4399
removed extra const float value
2018-10-24 16:32:18 -07:00
amantley
370801bd85
removed _spine2position variable and added handling for when there is no spine2 joint. In that case the head will do the recentering rotation and the shoulders will not move with the hand azimuth
2018-10-24 16:23:05 -07:00
Luis Cuenca
fac9188dfb
Merge pull request #14187 from luiscuenca/transitAddAnimation
...
Add animations to Avatar Transit
2018-10-24 10:51:21 -07:00
amantley
5063d0b527
changed handAzimuth to non const function
2018-10-23 16:51:56 -07:00
amantley
56deb500bb
Merge remote-tracking branch 'upstream/master' into shoulderSpaceFix
2018-10-23 16:36:52 -07:00
amantley
36466a4a9f
Merge remote-tracking branch 'upstream/master' into needToSquat
2018-10-23 16:07:23 -07:00
amantley
e9dae8ebeb
added force stand option for avatar lean behavior, you can now squat to your hearts content
2018-10-23 16:07:18 -07: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
Stephen Birarda
b789fa96f8
Merge pull request #14192 from Atlante45/fix/traits-race
...
Prevent race on internal client traits members
2018-10-23 14:53:11 -07:00
amantley
2df9d6c5e9
addressed missing changes for luis
2018-10-23 13:37:56 -07:00
amantley
9bc92cb2a3
removed leftover triggers
2018-10-23 12:29:04 -07:00
amantley
39a16703e4
updated wording for the radio buttons for avatar leaning model
2018-10-23 10:52:14 -07:00
amantley
8cb09c37ee
changed the ui to the settings/controls
2018-10-22 21:26:30 -07:00
SamGondelman
09ea32dcc0
fix fading and highlighting issues
2018-10-22 14:12:43 -07:00
amantley
eb3db9a571
added default to case statement
2018-10-20 16:13:41 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation
2018-10-20 15:30:23 -07:00
luiscuenca
f8d67d124f
Hold flickering fixed and refactor
2018-10-20 15:22:25 -07:00
amantley
e693275b10
Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix
2018-10-20 13:42:23 -07:00
amantley
5efb889de5
removed unused variables
2018-10-20 13:42:17 -07:00
amantley
dfdc6aee7e
Merge branch 'master' into squattyPottyFix
2018-10-20 13:39:55 -07:00
amantley
a427ddb235
removed extraneous print statements
2018-10-20 09:16:05 -07:00
amantley
070a517423
changed the recenterModel variables to userRecenterModel
2018-10-19 18:07:03 -07:00
amantley
a43985ef64
combo box for recenter model is added
2018-10-19 16:03:53 -07:00
Anthony Thibault
6cc7c861d1
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest
...
Disable user hand controllers if they are too far away or not moving.
2018-10-19 14:02:32 -07:00
amantley
0837f790eb
combo box changes
2018-10-19 07:46:16 -07:00
luiscuenca
bb5c042f16
Blend network animation
2018-10-18 17:51:20 -07:00
amantley
b9a2f19d30
made all the suggested corrections except the dropdown qml.
2018-10-18 16:39:50 -07:00
amantley
12b03b0e07
tinkering with lerping the spine2 position in avatar space
2018-10-18 10:52:13 -07:00
amantley
8f4fafe4d0
put some smoothing on the spine2 rotation in myskeletonmodel.cpp
2018-10-18 08:44:01 -07:00
amantley
83ec346cc5
changed the hand azimuth computation to be in spine2 space. this stops you from having a reversed direction when you sit down with hmd lean off and the hands are behind the origin in the z direction.
2018-10-17 16:42:29 -07:00
amantley
cd7af8b605
changed the name of sumuserheightsensorspace to averageuserheightSensorSpace
2018-10-17 08:51:40 -07:00
amantley
baeccebfb9
changed the transition times to make the sit longer and the stand shorter
2018-10-16 17:45:55 -07:00
Anthony Thibault
27c495406e
Disable user hand controllers if they are too far away or not moving.
2018-10-16 17:24:47 -07:00
amantley
1764531822
removed hand azimuth changes, that fixed azimuth when hands go behind origin of MyAvatar, these changes will be in a separate pr
2018-10-16 16:31:55 -07:00
amantley
cf7dc49499
removed a commment and changed the sanity check to be a const instead of a magic number
2018-10-16 16:04:31 -07:00
amantley
952b112271
changed the transition times to make them shorter sit == 3sec stand == 1sec, also added failsafe for when the average height is above 5ft. this can recover from a missed transition to standing.
2018-10-16 15:10:26 -07:00
luiscuenca
7da5fa9ea7
Transit animations won't play, they just get sent over the network
2018-10-16 11:33:58 -07:00
amantley
7d7fe8c089
removed some cruft
2018-10-15 18:12:27 -07:00
amantley
49b869c5e3
got rid of velocity count, now use 'away' to trigger when to start computing the sit stand state
2018-10-15 18:02:50 -07:00
amantley
9ec999e15e
added condition for start up in oculus that gets the correct starting height
2018-10-15 16:43:03 -07:00
amantley
ae3ae9ce9a
put in condition for away mode so that when you take the hmd off and put it back on the initial guess to your state is made again.
2018-10-15 09:52:34 -07:00
amantley
8e272d6dd2
added the correction code for when you are misslabeled as sitting while you are standing. It will now handle a sit down correctly. Also made the first approximation of state based on the average user height. This should use the user input of their height associated with their account
2018-10-15 08:43:25 -07:00
amantley
90c9e578c8
when you unlock the transitions you now start in stand state
2018-10-12 16:47:53 -07:00
amantley
ee830cdcb0
cleaned white space
2018-10-12 16:05:31 -07:00
amantley
7dd156ccdd
made the threshold for the spine angle larger to make auto transitions more robust
2018-10-12 15:00:15 -07:00
amantley
67afc86222
cleanup
2018-10-11 18:39:44 -07:00
Clement
1bcbda7ad6
Prevent race on internal client traits members
2018-10-11 16:16:24 -07:00
amantley
f73d974ad7
added a lock state so you can lock sit or stand state, also made the
...
hand azimuth relative to the spine2 location in avatar space. This stops
the arms from behaving badly when the hands are in front of the chest
but behind the root position of the avatar
2018-10-11 15:14:33 -07:00
amantley
5faf26abd1
turned off shoulder rotation when we don't have hmd lean recentering on. this temporarily fixes the behavior of the shoulders in this mode. todo: use the spine2 position to determine azimuth of hands, then they will work in all conditions
2018-10-11 10:38:59 -07:00
amantley
c4187f0d60
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-10-08 17:07:55 -07:00
unknown
3c25e6d5a8
Increase the linear velocity step when the avatar is small to avoid freezing
2018-10-08 14:40:54 -07:00
Alexander Ivash
19c3f1516f
relax 'isWearable' conditions to treat entities like 'ghost.json' as wearables
2018-10-09 00:17:19 +03:00
amantley
3517905435
added getter and setter for sitstandstatechange bool
2018-10-05 16:22:30 -07:00
amantley
96872f8412
moved all the state update for sit and stand to myavatar::update() also
...
made it so that sit horizontal reset is handled in non-cg recentering.
to do: revisit what should be sent for desired body in prephysics update
call
2018-10-05 14:55:43 -07:00
Andrew Meadows
c3478dc018
remove expired avatarEntities from their avatars
2018-10-05 13:48:35 -07:00
amantley
ad46b71966
before moving the step state counting to myavatar::update()
2018-10-05 13:04:14 -07:00
amantley
cbe638bfdb
added flag for vertical recentering that is state change, snap, versus
...
the usual .5 second recentering
2018-10-04 18:17:27 -07:00
amantley
635300c6d5
changed pre physics to use cg for desired body when in cg mode
2018-10-04 18:05:05 -07:00
amantley
82f8c67436
put the mode in sensor space for cg
2018-10-04 15:37:01 -07:00
amantley
acce675efc
added snap for recentering with sit stand state change. using average height with tipping point for thresholds
2018-10-04 14:53:51 -07:00
amantley
809ca0e512
vive hmd input is implemented. not using mode
2018-10-03 18:05:30 -07:00
amantley
8a0fbc3fe9
changed the height to use the mode . to do fix sensor space bug.
2018-10-02 17:47:56 -07:00
David Rowe
f7fd76b316
Merge branch 'master' into M18586
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-10-02 16:49:16 +13:00
amantley
f0676d796c
added constants and tipping point for running average. this should be replaced by the mode
2018-10-01 17:57:00 -07:00
John Conklin II
8ad5ca5a67
Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix
...
Fix avatar warp into floor when navigating to a saved bookmark
2018-10-01 16:36:31 -07:00
Brad Hefta-Gaub
6290b56383
Merge pull request #14079 from luiscuenca/simpleAvatarTransit
...
Simple avatar transit
2018-10-01 16:24:46 -07:00
amantley
90feeffa9d
cleaning up. putting squat fix in vertical recenter
2018-10-01 14:21:00 -07:00
amantley
1a0e2c6ea1
clean up for pr
2018-10-01 08:30:51 -07:00
amantley
9e40045927
added criteria to stop false positive for sit down
2018-09-30 17:13:34 -07:00
amantley
bdd6befef9
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-09-29 15:39:36 -07:00
amantley
884ad66a14
added sensor space detection of height of the user in MyAvatar.cpp 1.2 * average sensor space height changes to standing. .833 sensorspace height changes to sitting. there is also a manual override in the avatar app settings now
2018-09-28 17:18:24 -07:00
David Rowe
1c4bde3e84
Fix build warnings
2018-09-28 18:38:38 +12:00
David Rowe
545c2591e3
Merge branch 'master' into M18586
2018-09-28 16:19:44 +12:00
David Rowe
f2c13f193c
Don't jump in HMD mode unless option is set
2018-09-28 16:05:20 +12:00
luiscuenca
195df9e0ec
compute feet position offset in situ
2018-09-27 17:18:43 -07:00
amantley
42cb8a7ef0
avatar app changes
2018-09-27 16:59:54 -07:00
amantley
52355e53f1
adding the menu item to the avatar app for the sit state.
2018-09-27 16:44:55 -07:00
luiscuenca
bbe836ee88
Remove smooth teleport and set/get API methods
2018-09-27 10:38:45 -07:00
David Rowe
6ae206677d
Add Settings > Controls option for displaying play area
2018-09-27 14:55:53 +12: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
4f9de1be1c
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-09-26 08:38:30 -07:00
luiscuenca
754653b093
Fix warnings
2018-09-25 17:31:18 -07:00
luiscuenca
82b08f1a93
Wait until skeleton is loaded to locate the avatar
2018-09-25 16:21:05 -07:00
amantley
ad6bbc7ff6
latest squatty changes
2018-09-25 11:22:44 -07:00
luiscuenca
0676f25e31
Save transit preferences
2018-09-25 07:42:28 -07:00
luiscuenca
80daf35e77
Animation and particles clean up
2018-09-25 07:17:26 -07:00
luiscuenca
3e2ee119f0
API to configure animation and particle effect
2018-09-25 06:03:29 -07:00
luiscuenca
012cd207b3
No data sent during basic transit
2018-09-24 11:39:10 -07:00
luiscuenca
82b14b6e9b
Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport
2018-09-22 05:47:05 -07:00
luiscuenca
01f87a0645
lerp myavatar
2018-09-22 05:34:17 -07:00
Seth Alves
86e502637e
Make Settings thread safe
2018-09-21 15:46:35 -07:00
amantley
42e248ef84
maded more changes to support sitting state to do: add option for stuck pose reset
2018-09-18 17:37:44 -07:00
amantley
96da9b7e54
cleaned up code for squatty fix
2018-09-18 10:31:19 -07:00
amantley
14fb7e1d44
removed redundant code
2018-09-17 17:53:08 -07:00
amantley
ff0d938d37
initial changes to stop the squatty potty from happening when users are sitting down in vr mode
2018-09-17 16:53:15 -07:00
luiscuenca
ff319ebd95
Bypass position updates from mixer
2018-09-17 09:47:22 -07:00
luiscuenca
c5669ef1f5
better property names
2018-09-13 15:22:18 -07:00
luiscuenca
ceccc6d6ec
make getCollisionCapsule thread safe
2018-09-13 14:49:35 -07:00
luiscuenca
b517808bc2
Fix smaller size avatar capsule and land on detailed mesh
2018-09-12 21:24:19 -07:00
luiscuenca
fedea6e84d
Comply with review comments
2018-09-11 12:23:25 -07:00
luiscuenca
a9f676354b
Only invisible pointers and scale fix
2018-09-10 08:54:53 -07:00
luiscuenca
d09391faa5
Fix invisible error
2018-09-07 12:17:40 -07:00
luiscuenca
02065518cb
Merge branch 'master' of https://github.com/highfidelity/hifi into stt_teleport_wip
2018-09-07 11:57:48 -07:00
amantley
90a51e6181
added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area
2018-09-06 13:12:48 -07:00
amantley
6fb335429d
starting to re-implement the walking state detection for smoothwalking
2018-09-05 17:55:27 -07:00
luiscuenca
abb632afda
Update capsule when scale/load and teleport without safe landing
2018-09-05 16:51:34 -07:00
amantley
73e628bb8d
merge with master fixes
2018-09-05 14:42:49 -07:00
Anthony Thibault
b21fa1037f
Code review feedback and bug fixes for calibraiton matrices
2018-09-04 11:55:52 -07:00
Anthony Thibault
3a034fdf66
HMD mode bug fix for avatars with no eyes
...
Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing.
Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes.
This is more accurate for characters that don't quite have human proportions.
2018-09-04 10:13:57 -07:00
Anthony Thibault
78d7c321b8
Merge pull request #13796 from amantley/noNeckFix
...
Avatar without Neck Joint bug 14620
2018-08-30 14:52:44 -07:00
John Conklin II
8fa4a2855e
Merge pull request #13641 from amantley/rotateFilterChange
...
Hand Azimuth Controls Shoulder Rotation
2018-08-30 13:59:00 -07:00
Stephen Birarda
aaf5f593c5
send MyAvatar avatar entity updates through entity tree
2018-08-29 16:30:24 -07:00
Angus Antley
f7d0cdda02
added a check for whether the head to shoulder azimuth is greater than 100 degrees. If so unflip the chest azimuth
2018-08-29 20:44:21 +01:00
Angus Antley
ee33f5dc97
normalize the hip hand vector in getSpine2RotationRigSpace, made computeHandAzimuth a const function that returns a vec2
2018-08-29 01:57:49 +01:00
amantley
3c792a04c1
fixed roll rotation added to azimuth in MySkeletonModel.cpp
2018-08-28 11:25:42 -07:00
amantley
89b508251e
added some comment to explain rig to avatar transform
2018-08-27 17:57:50 -07:00
amantley
055f03878e
made changes to add roll to the spine2 rotation. also only the shoulders control the rotation recenter now
2018-08-27 14:44:27 -07:00
amantley
8406fb2359
Merge remote-tracking branch 'upstream/master' into steppingReboot
2018-08-24 16:48:26 -07:00
amantley
dd8a00983c
Merge remote-tracking branch 'upstream/master' into rotateFilterChange
2018-08-24 16:29:20 -07:00
amantley
2bec867863
added the sanity check to see if the shoulders have flipped
2018-08-24 16:29:08 -07:00
amantley
a60ab863a3
demo version of the head and hands determining the rotate function
2018-08-24 11:06:36 -07:00
Angus Antley
25610c7587
got the hands turning the shoulders, needs error checking
2018-08-24 11:04:36 +01:00
Angus Antley
44a6c7df5f
added hook to myskeleton model to update spine2, need to get the rotation from myavatar then we have spine rot
2018-08-24 07:17:17 +01:00
amantley
0e0561bb24
latest rotate code
2018-08-23 17:59:18 -07:00
John Conklin II
1320a34a18
Merge pull request #13841 from luiscuenca/noAttachmentsToJSON
...
Don't include old attachment data on new avatar recordings
2018-08-23 10:51:33 -07:00
Angus Antley
30ef544c6d
starting the c++ version of shoulder rotation
2018-08-23 15:57:14 +01:00
Wayne Chen
9518b8cdaf
rearrangement
2018-08-22 15:46:02 -07:00
Wayne Chen
c32cc1ead2
adding implementation
2018-08-22 15:42:15 -07:00
luiscuenca
b3d127c953
Fix flickering
2018-08-22 14:31:34 -07:00
amantley
9dfaf32b72
fixed the step animation but it still needs work
2018-08-22 14:12:19 -07:00
amantley
2dd812935f
Merge remote-tracking branch 'upstream/master' into rotateFilterChange
2018-08-22 12:57:16 -07:00
amantley
1e3ca6f902
added quicker follow code and added head to rotate calculation
2018-08-22 12:57:06 -07:00
amantley
456b8bf2a9
tweaked the animvars callback to update the spine2 position
2018-08-22 09:36:52 -07:00
luiscuenca
5f4903f884
Record entities
2018-08-22 08:53:51 -07:00
amantley
1fabc77244
latest update to stop lurching, and allow leaning, and stop perma leans
2018-08-21 12:34:05 -07:00
Stephen Birarda
1723f3d3d8
don't use entity tree to clear all avatar entities
2018-08-21 12:21:29 -07:00
Stephen Birarda
a177e49877
Revert "send attachment clears through setAvatarEntityData"
...
This reverts commit 25876bca63
2018-08-21 12:18:11 -07:00
Stephen Birarda
25876bca63
send attachment clears through setAvatarEntityData
2018-08-21 10:32:05 -07:00
Stephen Birarda
e33f349d53
fix flagging for avatar entity update/delete
2018-08-21 10:32:05 -07:00
Stephen Birarda
ea7c0e923a
make client traits handler a unique ptr in AvatarData
2018-08-21 10:31:15 -07:00
Stephen Birarda
a0df68f32f
move skeleton model URL emit to AvatarData
2018-08-21 10:31:14 -07:00
Stephen Birarda
a80d19a44a
remove skeleton from identity, handle in clients
2018-08-21 10:31:14 -07:00
Stephen Birarda
ac835650b7
add skeleton trait sending to Agent, queuing in AvatarMixer
2018-08-21 10:31:14 -07:00
Stephen Birarda
486557e28a
initial trait packet sending on skeleton URL change
2018-08-21 10:31:14 -07:00
amantley
2dcdd60750
added new AvatarConstants and more frequent horizontal recentering to deal with lurching walk in large tracked volumes
2018-08-20 17:32:52 -07:00
amantley
baa17395f0
Merge remote-tracking branch 'upstream/master' into rotateFilterChange
2018-08-20 16:47:21 -07:00
amantley
94026fb4dd
added activate(rotation) to prephysics update
2018-08-20 16:47:14 -07:00
amantley
471bb28545
Merge remote-tracking branch 'upstream/master' into steppingReboot
2018-08-20 09:50:45 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
...
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
Seth Alves
527b27da96
pseudo-joints for far-grab positions
2018-08-14 08:55:20 -07:00
Seth Alves
0a5c96ecc1
Merge pull request #13792 from luiscuenca/attachmentsAPImgr
...
Attachments API returns avatar entities
2018-08-13 14:21:13 -07:00
amantley
c2612af7a8
changed the spine stretch limit, will check the scale implications next
2018-08-10 17:10:33 -07:00
luiscuenca
dd93055d89
Convert and load attachments when rig is ready
2018-08-10 16:15:30 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges
...
New Default Strafe Animations Plus Animation Tuning Support
2018-08-10 15:03:30 -07:00
amantley
f26d6b8c3d
cleaned up code and changed the forward offset for the default eyes when there is no neck bone
2018-08-09 12:15:35 -07:00
luiscuenca
9ca0ee05dc
Fix wanings
2018-08-09 12:13:03 -07:00
amantley
a3f2fd1f23
removed some print statements and added the code to use the head parent when the neck is missing, this allows for cauterization
2018-08-09 11:33:27 -07:00
luiscuenca
8c121a531d
Turn attachments into avatar entities
2018-08-09 10:35:15 -07:00
amantley
c774dd7f5b
debugging to solve the no-neck crazy scale problem
2018-08-08 17:52:22 -07:00
r3tk0n
32165dff40
Fixed rotations in MyAvatar::goToFeetLocation()
2018-08-07 14:31:48 -07:00
amantley
1353406254
more whitespace
2018-08-07 12:56:28 -07:00
amantley
84619e7adc
cleaned up to match coding standards
2018-08-07 10:40:11 -07:00
MuteTab
b590ff793a
New function for changing location in domains such that the AVatar's leg-length is taken into account.
2018-08-06 20:26:44 -07:00
amantley
1ad6b041cd
updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed
2018-08-06 18:36:32 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy
2018-08-06 09:51:14 -07:00
amantley
08889b627a
Merge remote-tracking branch 'upstream/master' into animationBlendChanges
2018-08-06 09:16:53 -07:00
Dante Ruiz
f30b552e19
fix-flying
2018-08-03 15:50:11 -07:00
amantley
bd88d5f15b
merging with ik leg fix code in master
2018-08-02 09:48:04 -07:00
amantley
6b2c67e5bd
more doug support
2018-08-01 18:22:51 -07:00
SamGondelman
8a9c27ed92
Merge remote-tracking branch 'upstream/master' into destroy
2018-08-01 16:07:48 -07:00
amantley
02dd2f4f28
added velocity scaling for forward and back
2018-07-31 18:26:44 -07:00
John Conklin II
16940cc9b7
Merge pull request #13716 from r3tk0n/17170-flying-crash
...
Remove deprecated flying setting from MyAvatar.cpp saveData()
2018-07-31 09:48:01 -07:00
John Conklin II
bd2ab38bfe
Merge pull request #13701 from ElderOrb/FB16702
...
FB16702 - Avatar App does not save Animation JSON Override URL
2018-07-30 14:51:32 -07:00
r3tk0n
63de16bac5
Remove deprecated flying setting from MyAvatar.cpp saveData()
2018-07-30 11:40:15 -07:00
John Conklin II
021e09d083
Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash
...
fix a crash when grabbing a non-dynamic entity with an overlay child
2018-07-27 12:49:14 -07:00
John Conklin II
d4cbbfe4c1
Merge pull request #13692 from amantley/leanBackSittingFix
...
Fix For Unnatural Hips Behaviour When Sitting In HMD
2018-07-27 12:30:31 -07:00
Seth Alves
91d509f5a4
fix a crash when grabbing a non-dynamic entity with an overlay child
2018-07-27 10:35:26 -07:00
Alexander Ivash
29f7cab7df
FB16702 - Avatar App does not save Animation JSON Override URL
...
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
2018-07-27 02:08:44 +03:00
r3tk0n
f3d0d9b4a0
Clean up garbage comments.
2018-07-26 15:37:42 -07:00
r3tk0n
f8c611b1d0
Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp
2018-07-26 15:35:12 -07:00
amantley
12cb212dc7
used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards
2018-07-26 12:05:17 -07:00
amantley
37540c79b3
removed print statement and added const upper leg fraction
2018-07-25 10:51:19 -07:00
amantley
c5599623f7
added a reset when the hips go below 1/3 of the default avatar height of the hips also reset the vertical this prevents real life sitting
2018-07-25 10:29:29 -07:00
John Conklin II
2ac9463830
Merge pull request #13653 from ElderOrb/fake-wearables-fix
...
FB16870: Avatar Wearables showing incorrect number
2018-07-23 15:55:11 -07:00
Alexander Ivash
33c858774b
fix coding standard compliance
2018-07-23 21:01:43 +03:00
r3tk0n
bc91affa70
Bring this PR inline with RC70.1 PR.
2018-07-20 15:13:44 -07:00
Alexander Ivash
849c91d8f6
remove not necessary EntityTreeRenderer from removeAvatarEntities's condition
2018-07-20 19:32:58 +03:00
Alexander Ivash
fb8640de47
FB16870: Avatar Wearables showing incorrect number
2018-07-20 02:51:17 +03:00
MuteTab
dfcf47e8ee
Removed useless comment.
2018-07-19 14:44:32 -07:00
MuteTab
8d65e14193
Remove one change, turned out to be unnecessary.
2018-07-19 14:43:46 -07:00
MuteTab
3080539b63
Make getFlyingEnabled() always true when in desktop.
2018-07-19 14:40:20 -07:00
amantley
5ec7ab3a7d
removed the other way of computing the average lookat which used a ring buffer
2018-07-18 17:20:47 -07:00
amantley
a8c4f4e650
removed extra whitespace
2018-07-18 17:10:09 -07:00
amantley
7cc724a27b
added properties to allow the toggling of the debug draw the look at vector, and the reset moving average look at on step detection
2018-07-18 17:08:04 -07:00
amantley
ef2d3c9f16
Merge remote-tracking branch 'upstream/master' into rotateFilterChange
...
synching with master
2018-07-18 09:00:18 -07:00
Qliemillar
080d664341
Merge pull request #13619 from luiscuenca/handTouchDisabler
...
Allow creators to disable hand touch from javascript
2018-07-18 08:16:37 -06:00
amantley
33f9acde67
latest
2018-07-17 17:42:11 -07:00
luiscuenca
e3594fe1b7
mutex added
2018-07-17 17:23:03 -07:00
luiscuenca
fcb7614f7e
Format and fixes
2018-07-17 16:34:30 -07:00
luiscuenca
82a3b73de8
Added disable hand touch for entityID
2018-07-17 07:06:48 -07:00
luiscuenca
84dac94379
Allow creator to disable hand touch
2018-07-16 17:03:50 -07:00
amantley
abb2c7ef14
Added reset of the _headControllerFacingMovingAverage in MyAvatar.cpp prePhysicsUpdate(). This stops some of the flipping back and forth that has been happening with rotational recenter.
2018-07-16 11:29:49 -07:00
Anthony Thibault
1d33f51ca4
Merge pull request #13528 from amantley/integratedStepping
...
Step Detection From Head and Hands Tracking
2018-07-10 09:59:22 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949
...
AvatarApp
2018-07-09 15:20:18 -07:00
amantley
cb421fd5b0
fixed build errors for mac and linux
2018-07-09 15:09:45 -07:00
amantley
55ae08c071
Merge remote-tracking branch 'upstream/master' into integratedStepping
2018-07-09 13:55:59 -07:00
amantley
b2d77ef51a
bracket spacing
2018-07-09 13:54:18 -07:00
amantley
7ed8f17b57
tweaked posterior threshold and head velocity threshold
2018-07-09 13:49:21 -07:00
amantley
a3417cace9
implemented code review changes. 1. checking for divide by zero before glm::normalize. 2. clearing the ring buffer on reset. 3. renaming _standingHeightMode to _currentStandingHeight
2018-07-09 11:58:02 -07:00
amantley
defd6f88e6
started changes suggested by code review, ie mode computation
2018-07-06 18:17:13 -07:00
Alexander Ivash
aaa2e3f6a8
fix issue with duplicated wearables on switching between bookmarks / cancelling 'adjust wearables'
2018-07-06 21:00:56 +03:00
Alexander Ivash
dbcc654af1
remove comments
2018-07-06 21:00:55 +03:00
Alexander Ivash
3ac44376b2
bind Settings page to a backend
2018-07-06 21:00:53 +03:00
Alexander Ivash
b6769f9678
avatar selection & wearables adjustments work-on-progress
2018-07-06 21:00:52 +03:00
Dante Ruiz
533164e1e4
some more fixes
2018-07-06 08:55:20 -07:00
SamGondelman
7954865141
trying to fix dependency shutdown
2018-07-05 14:34:37 -07:00
amantley
0ebc7fc29e
fixed the mode computation so that it can keep track of all long term height frequencies. This makes it unnecessary to reset the mode, because it will revert back to the highest frequency
2018-07-05 13:41:06 -07:00
amantley
6460c9e861
fixed case for 0.0 as the filter length
2018-07-03 17:11:19 -07:00
amantley
4995b57712
removed print statements and fixed rotation threshold update code
2018-07-03 14:31:36 -07:00
amantley
59dfe80940
Merge remote-tracking branch 'upstream/master' into integratedStepping
2018-07-03 11:47:09 -07:00
amantley
9e5763ea5c
adding the recentering back into the non hmd lean code
2018-07-03 11:46:59 -07:00
amantley
3424f412aa
Merge pull request #13437 from amantley/lurchfix
...
Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)
2018-07-03 19:38:01 +01:00
amantley
f216316b55
removed some comments and whitespace
2018-07-02 18:19:31 -07:00
amantley
47110d080f
removed clang induced changes to MyAvatar.cpp
2018-07-02 17:06:16 -07:00
amantley
7f5f762208
fixing merge conflict
2018-07-02 15:54:21 -07:00
amantley
096d0d2827
reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update
2018-07-02 15:43:57 -07:00
amantley
44d9edec3c
added the properties for filter length and rotation threshold to MyAvatar class This will help us test the right combo for head based turning
2018-06-29 14:42:23 -07:00
amantley
c9c222a253
added the failsafe code to the stepping
2018-06-29 11:33:42 -07:00
amantley
15a17ae32a
finished the step detection, need to finish the failsafe
2018-06-28 18:36:13 -07:00
amantley
3e6d54e83c
added all the parts for the step conditional to do: failsafe
2018-06-28 11:56:46 -07:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay
...
Implement MS16257: Remove 'clear overlay when moving' setting and code
2018-06-28 09:31:04 -07:00
Angus Antley
2307c8e24a
more work on the mode threshold
2018-06-28 15:40:42 +01:00
amantley
621ca7d2b4
more work on the mode function
2018-06-27 18:46:24 -07:00
amantley
61a935dbb5
added the first pass at mode computation
2018-06-27 18:02:11 -07:00
John Conklin II
0cb8b4dfa1
Merge pull request #13471 from danteruiz/disable-flying-by-default
...
Disable flying by default
2018-06-27 16:04:16 -07:00
amantley
7b49ae4950
added the within threshold of height function and to do: the mode computation
2018-06-27 14:23:24 -07:00
Zach Fox
cfc8c0fb09
Implement MS16257: Remove 'clear overlay when moving' setting and code
2018-06-27 14:07:04 -07:00
amantley
3893b7e339
added the head angular velocity check
2018-06-27 10:37:54 -07:00
amantley
8cf59783d1
removed white space
2018-06-27 09:20:46 -07:00
amantley
be6fadbc2d
Merge remote-tracking branch 'upstream/master' into integratedStepping
2018-06-27 09:16:43 -07:00
Dante Ruiz
3cf36bed55
making small adjustments
2018-06-26 14:57:15 -07:00
Dante Ruiz
1fec900ba6
disable flying by default
2018-06-26 13:31:59 -07:00
David Rowe
af3861def8
Code review
2018-06-25 16:33:05 +12:00
David Rowe
40fb627504
Merge branch 'master' into 21892
2018-06-25 16:04:44 +12:00
amantley
3027f8242c
added the conditional for leaving the base of support to pre physics update in MyAvatar.cpp
2018-06-21 17:23:03 -07:00
amantley
e4ca6c6303
added the fixes for the lurch that happens when driving or flying
2018-06-21 11:22:26 -07:00
amantley
8fc04776f9
starting to implement the step detection code in MyAvatar.cpp
2018-06-21 10:59:07 -07:00
SamGondelman
8014f61243
loading priorities for avatars and attachments
2018-06-20 12:29:28 -07:00
David Rowe
be4b929301
Fix cauterization when reparent entity to a different joint
2018-06-16 16:31:06 +12:00
David Rowe
4dd6ba1d18
Fix Mac crash
2018-06-16 16:29:45 +12:00
David Rowe
249f72758e
Fix entity detaching from head joint not becoming visible
2018-06-15 16:36:16 +12:00
John Conklin II
0ba97fa83b
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags
...
Scripted Blendshapes and Procedural Face Movement Flags
2018-06-13 10:32:59 -07:00
Anthony J. Thibault
042f902d2e
Merge branch 'master' into scriptedBlendshapesFaceFlags
2018-06-11 17:13:30 -07:00
Anthony J. Thibault
f773aef053
Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68
2018-06-11 11:06:21 -07:00
Anthony J. Thibault
b8379045a8
Fix MyAvatar::isReadyForPhysics() in serverless domains.
2018-06-11 09:53:34 -07:00
Anthony Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode
...
Center of Gravity Leaning
2018-06-08 17:53:55 -07:00
amantley
913d78841d
Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes
...
synching with upstream master
2018-06-07 16:20:11 -07:00
