Commit graph

113 commits

Author SHA1 Message Date
Anthony Thibault
2b74e2a7fa
Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes
Avatar sitting bug fixes
2019-08-20 11:09:25 -07:00
Anthony J. Thibault
381f7c6bc4 Avatar sitting bug fixes
* Added seatedToIdle transition, to make transition quicker to better match the capsule physics.
* Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms.
* Created "isNotSeated" anim var for exiting the seated state.
* MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called.
* MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation.
  Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing.
* Disable leg IK in HMD mode while seated.
2019-08-16 10:57:03 -07:00
dooglifeSF
2f3f6be693 Tuning pass on anim-graph, using the new blend modes and engine features. 2019-08-14 15:18:19 -07:00
Anthony J. Thibault
733d7455f4 new seated talking anim 2019-08-09 08:52:38 -07:00
Anthony J. Thibault
b4869508a0 updated clap 2019-08-08 14:47:31 -07:00
Anthony J. Thibault
ef81ccafed Hooked up seated clap 2019-08-08 13:02:19 -07:00
Anthony J. Thibault
317c2f5219 sitting raise hand 2019-08-08 09:37:03 -07:00
Anthony J. Thibault
e5e012a83e agree, point and disagree sitting emotes 2019-08-07 14:15:29 -07:00
Anthony J. Thibault
147753309f Updated clap02 with new version that is not as slow. 2019-08-06 17:57:27 -07:00
Anthony J. Thibault
3f6b488f27 Added intro-loop-outro phases for raiseHand, applaud and point 2019-08-06 17:39:30 -07:00
Anthony J. Thibault
649ef6c721 Added sitting idle variation and removed rejected emote variations. 2019-08-05 09:42:01 -07:00
Anthony J. Thibault
31762a0c80 Bug fixes in seated reactions 2019-08-02 10:17:59 -07:00
Anthony J. Thibault
c8e4536bba Hooked up variations of seated while talking and stubs for reactions while seated. 2019-08-02 10:11:38 -07:00
Anthony J. Thibault
f843c01b35 added missing seated idle pose 2019-08-01 13:09:02 -07:00
Anthony J. Thibault
a2e37b7275 talking/reactions while seated, work in progress check in 2019-08-01 13:05:15 -07:00
Anthony J. Thibault
ee4bb233b9 Bug fix for head nod not going back to idle. 2019-07-30 12:56:43 -07:00
Anthony J. Thibault
4f5d0d1c0f Updated a negative reaction animation. 2019-07-29 16:49:16 -07:00
Anthony J. Thibault
6f3bb749e2 Added new applaud, point and raisehand reactions. 2019-07-29 16:17:50 -07:00
Anthony J. Thibault
e205d90df6 Hooked up random positive & negative emote animations. 2019-07-29 15:01:10 -07:00
Anthony J. Thibault
6e6440232c Updated avatar-animation.json from animedit tool 2019-07-29 10:49:34 -07:00
luiscuenca
015d1951fc
Add sitting clip node 2019-07-24 10:44:33 -07:00
luiscuenca
e7e864121f
Merge branch 'master' into avatarSitAPI 2019-07-23 14:22:42 -07:00
luiscuenca
9cec979552
Add sit API to MyAvatar 2019-07-23 14:20:54 -07:00
Anthony J. Thibault
687588cde7 Hooked up first-pass reaction animations. 2019-07-23 09:47:37 -07:00
dooglifeSF
413a089402 add teleport.fbx back to avatar/animations
compiled and tested in local sandbox but need to test with Jamil in HMD to see that teleport plays correctly for remote viewer
2019-07-15 13:24:21 -07:00
dooglifeSF
7856ab611f rig shoulder rotation order fixed, animations batch converted and polished, json updated with new ranges for side steps, tabs converted to spaces 2019-06-27 11:37:05 -07:00
dooglifeSF
3d92875eb5 add spine twist during transitions in/out of alt idle to help when talking is overlayed 2019-06-21 10:39:53 -07:00
dooglifeSF
e25913f136 fix finger collapse in talks and idles - caused by finger joints bending more than 90 degrees in Y 2019-06-20 16:05:18 -07:00
dooglifeSF
3eef23fe98 change base idle more frequently, add more motion to idle02, improve head movements in talks, add head movement to talk_armsdown 2019-06-19 16:19:42 -07:00
dooglifeSF
255777c82d bring latest changes to idles, locomotion and animation json into hifi from hifi-animation 2019-06-19 09:49:42 -07:00
dooglifeSF
1c1807a80c Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-17 10:44:11 -07:00
dooglifeSF
51b5f6093a locomotion and idles bug fixes, json updated with correct values, AnimStats.cpp on screen debug text timeout pushed to 20 seconds 2019-06-17 08:58:15 -07:00
Anthony J. Thibault
7ce5f7ac0b Adjust run and jog anims to better align head with 1p camera
Added adjust forward run and jog animations to better align with first person camera.
In some instances, such as looking down, you could sometimes see your body lead your camera.

https://highfidelity.atlassian.net/browse/BUGZ-240
2019-06-10 16:27:03 -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
baca58360e updated json and talk_righthand anim 2019-04-25 09:50:12 -07: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
eb0506ee12 updated json 2019-04-24 14:58:30 -07:00
Angus Antley
45f4cb2018 added animation files and updated ease in function in rig 2019-04-24 14:56:38 -07:00
amantley
7f3101eefb working on the ease in function for the talk idle 2019-04-23 18:13:15 -07:00
amantley
70d8200bdc added on done for movement7 to json 2019-04-23 10:40:37 -07:00
Angus Antley
1291ee5ebc added new animations to the resource 2019-04-23 07:43:31 -07:00
amantley
ba9b539bd2 removed hand fbx files that will be used in the future for default hand overrides 2019-04-16 14:12:32 -07:00
Angus Antley
55b42946a4 cleaned up ugly brace style in json 2019-03-28 19:07:01 -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
amantley
8e9618d740 added a lower run animation to stop hovering when running 2019-03-05 11:44:53 -08:00
Angus Antley
382a03929e changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint 2019-02-15 07:06:43 -08:00
amantley
07a4f49c58 adding the armik nodes into the json 2019-02-05 17:21:39 -08:00
amantley
34d32eeda8 removed the extra ikoverlay in the avatar-animation.json 2019-02-04 10:17:22 -08:00