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
