Anthony Thibault
93b03a588f
Merge pull request #15445 from amantley/AnimRandomSwitchSquash
...
AnimRandomSwitch class for random idle implementation
2019-04-26 10:06:37 -07:00
Angus Antley
395a4cc9c4
added final animations and json to the resource
2019-04-25 19:14:31 -07:00
Angus Antley
27ed468946
made changes requested
2019-04-25 14:42:41 -07:00
Angus Antley
76164ecee8
corrected the case where you have a random switch state trigger and a random transition trigger in the same random state machine
2019-04-25 13:57:58 -07:00
David Rowe
8e69e0b049
Regularize deprecation notices
2019-04-25 20:55:30 +12:00
Angus Antley
ea173b8d61
more time for talk ease in and updated json random choice times
2019-04-24 21:29:55 -07:00
Angus Antley
93b49a86db
fixed build error
2019-04-24 15:50:00 -07:00
Angus Antley
45f4cb2018
added animation files and updated ease in function in rig
2019-04-24 14:56:38 -07:00
Angus Antley
5aee2f35f0
updated the ease in function
2019-04-24 08:27:36 -07:00
amantley
7f3101eefb
working on the ease in function for the talk idle
2019-04-23 18:13:15 -07:00
Angus Antley
bac5cf9bbb
fixed the debug state info updating
2019-04-22 14:35:04 -07:00
Angus Antley
6d9e4188eb
added AnimRandomSwitch class and got it integrated with a new avatar-animation.json that includes random idles and random fidgets and random talk
2019-04-22 14:14:17 -07:00
Clement
0f2dbd7b6a
Fix mac warnings
2019-04-19 20:14:15 -07:00
amantley
035c8a687d
fixed merge conflict
2019-04-17 10:16:39 -07:00
Shannon Romano
f2069a2cd7
Merge pull request #15344 from amantley/bugTwoBoneOverFlow
...
Fixed out of range error in AnimTwoBoneIK
2019-04-17 09:51:09 -07:00
Anthony J. Thibault
02d5769991
Better head vs camera checks for avatar head cauterization
...
* cameraInsideHead() check now uses detailed avatar collision when possible.
* head is now more constantly hidden in first person camera mode
* getEyeModelPositions() uses a better estimate when avatar eye joints are missing.
* moved findPointKDopDisplacement from Rig.cpp into AnimUtil.cpp
* added isPlayingOverrideAnimation() method to Rig class
2019-04-09 12:57:03 -07:00
John Conklin II
c902e8392c
Merge pull request #15343 from luiscuenca/fixSimJoints
...
Fix error extracting SIM joints on Flow
2019-04-05 18:28:05 -07:00
luiscuenca
39b58a44ee
Fix error on sim joints for new flow app
2019-04-05 16:38:38 -07:00
Angus Antley
09e2da4c93
fixed out of range error in the two bone IK computation
2019-04-05 16:31:18 -07:00
David Rowe
28dfac64ba
Merge branch 'master' into M21460
...
# Conflicts:
# libraries/image/src/image/Image.h
2019-04-05 17:50:46 +13:00
Anthony Thibault
65507cfe11
Merge pull request #15180 from luiscuenca/flowCppFixes
...
Fix Flow touch and scale issues
2019-03-28 11:11:08 -07:00
Anthony Thibault
b0d5a82c80
Merge pull request #15169 from hyperlogic/bug-fix/rig-assert-fix
...
Rig.cpp: Fix for index out of range assert in debug builds
2019-03-28 11:10:32 -07:00
Angus Antley
d71c6c28de
added the new hand anims to the resource, and added hand reset to initAnimGraph
2019-03-27 12:00:50 -07:00
Angus Antley
02d9331603
This changes the avatar-animation json so that we have override
...
animations for the right and left hand, similar to how we have whole
body override animations.
2019-03-26 23:27:54 -07:00
David Rowe
9a1bb27034
AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc
2019-03-26 13:58:43 +13:00
David Rowe
cf4370ed3a
Merge branch 'master' into M21222
2019-03-26 09:44:48 +13:00
David Rowe
b78ae80ae6
Address review comments and add further examples
2019-03-26 09:40:47 +13:00
amantley
bc696d6db6
fixed memory leak caused by bone length scale computation
2019-03-14 13:49:13 -07:00
luiscuenca
c14b135f2b
Fix flow touch and scale issues
2019-03-13 15:42:04 -07:00
David Rowe
ea84847950
Update AnimStateDictionary JSDoc per feedback
2019-03-13 16:20:38 +13:00
David Rowe
7445d73857
Merge branch 'master' into M21222
...
# Conflicts:
# libraries/avatars/src/AvatarData.h
2019-03-13 16:14:14 +13:00
Anthony Thibault
fff0d1a80e
Rig.cpp: Fix for index out of range assert in debug builds
2019-03-12 17:43:23 -07:00
Anthony Thibault
c36d752b6b
Merge pull request #15141 from luiscuenca/flowAPIExtra
...
add getFlowData method to MyAvatar
2019-03-08 17:45:11 -08:00
luiscuenca
80150565f6
Fix bug on group settings
2019-03-08 16:30:28 -07:00
David Rowe
24c7c8be19
Update JSDoc per merge from master
2019-03-09 12:03:59 +13:00
luiscuenca
4858f64810
get the colliding joints
2019-03-08 14:36:47 -07:00
luiscuenca
f363d95ca2
clear group settings on init
2019-03-08 13:02:47 -07:00
luiscuenca
cb6f573b35
Merge branch 'master' into flowAPIExtra
2019-03-08 12:43:02 -07:00
David Rowe
4779a6b156
Merge branch 'master' into M21222
2019-03-09 07:57:53 +13:00
David Rowe
5068075645
Fill in MyAvatar animation JSDoc
2019-03-09 07:42:55 +13:00
luiscuenca
e8da6b5a0c
add getFlowData
2019-03-08 10:36:58 -07:00
Thijs Wenker
d985d1bff0
use Rig instead of Avatar for height calculations
2019-03-08 03:36:56 +01:00
Anthony Thibault
dcd1258439
Merge pull request #15119 from hyperlogic/feature/improve-anim-pose-negative-scale
...
Improve AnimPose support for negative scale
2019-03-07 17:05:46 -08:00
Anthony Thibault
0cf8f3e5c3
Code review feed back remove NEW_VERSION ifdef
2019-03-07 14:11:01 -08:00
amantley
474a97d0fc
now update the ikOverlayAlpha every frame
2019-03-06 15:15:30 -08:00
Anthony Thibault
5fcfa265d2
Remove alternate versions of AnimPose(mat4) constructor
2019-03-06 14:02:58 -08:00
Anthony Thibault
0dbc83049b
Make AnimPose from mat4 work better for matrices with negative determinants.
...
Took part of this code from glm::decompose() which references
https://opensource.apple.com/source/WebCore/WebCore-514/platform/graphics/transforms/TransformationMatrix.cpp
2019-03-06 13:28:14 -08:00
amantley
e72cc8b16e
put the ik optimized part of the conditional inside a android build define statement
2019-03-06 12:09:53 -08:00
amantley
442da66583
debugging tiny hulk problems
2019-03-05 17:44:36 -08:00
amantley
e955c02e07
Merge pull request #15046 from amantley/bugRootHips
...
Bug Fix for the Hips not translating correctly when Hips and Root have the same location
2019-03-04 14:05:33 -05:00
