diff --git a/interface/resources/avatar/animations/sitting_idle02.fbx b/interface/resources/avatar/animations/sitting_idle02.fbx index 8cf3d22fc6..8dd2d46dca 100644 Binary files a/interface/resources/avatar/animations/sitting_idle02.fbx and b/interface/resources/avatar/animations/sitting_idle02.fbx differ diff --git a/interface/resources/avatar/animations/sitting_idle05.fbx b/interface/resources/avatar/animations/sitting_idle05.fbx index a2a66e1405..1b89d26f15 100644 Binary files a/interface/resources/avatar/animations/sitting_idle05.fbx and b/interface/resources/avatar/animations/sitting_idle05.fbx differ diff --git a/interface/resources/avatar/animations/sitting_idle_once_fidget.fbx b/interface/resources/avatar/animations/sitting_idle_once_fidget.fbx index 0340b03261..a7e5dce013 100644 Binary files a/interface/resources/avatar/animations/sitting_idle_once_fidget.fbx and b/interface/resources/avatar/animations/sitting_idle_once_fidget.fbx differ diff --git a/interface/resources/avatar/animations/sitting_idle_once_leanforward.fbx b/interface/resources/avatar/animations/sitting_idle_once_leanforward.fbx index 850d3c02c0..75a4603335 100644 Binary files a/interface/resources/avatar/animations/sitting_idle_once_leanforward.fbx and b/interface/resources/avatar/animations/sitting_idle_once_leanforward.fbx differ diff --git a/interface/resources/avatar/animations/sitting_idle_once_lookaround.fbx b/interface/resources/avatar/animations/sitting_idle_once_lookaround.fbx index 853811ba5a..d991316a17 100644 Binary files a/interface/resources/avatar/animations/sitting_idle_once_lookaround.fbx and b/interface/resources/avatar/animations/sitting_idle_once_lookaround.fbx differ diff --git a/interface/resources/avatar/animations/sitting_idle_once_lookfidget.fbx b/interface/resources/avatar/animations/sitting_idle_once_lookfidget.fbx index f6ead8fc0a..b3ab378c26 100644 Binary files a/interface/resources/avatar/animations/sitting_idle_once_lookfidget.fbx and b/interface/resources/avatar/animations/sitting_idle_once_lookfidget.fbx differ diff --git a/interface/resources/avatar/animations/sitting_idle_once_lookleftright.fbx b/interface/resources/avatar/animations/sitting_idle_once_lookleftright.fbx index 6f61dd1c63..57f06e13e2 100644 Binary files a/interface/resources/avatar/animations/sitting_idle_once_lookleftright.fbx and b/interface/resources/avatar/animations/sitting_idle_once_lookleftright.fbx differ diff --git a/interface/resources/avatar/animations/sitting_idle_once_shakelegs.fbx b/interface/resources/avatar/animations/sitting_idle_once_shakelegs.fbx index df654bb48b..a020e20044 100644 Binary files a/interface/resources/avatar/animations/sitting_idle_once_shakelegs.fbx and b/interface/resources/avatar/animations/sitting_idle_once_shakelegs.fbx differ diff --git a/interface/resources/avatar/animations/sitting_idle_once_shifting.fbx b/interface/resources/avatar/animations/sitting_idle_once_shifting.fbx index 3e8481e596..ec5ba9a654 100644 Binary files a/interface/resources/avatar/animations/sitting_idle_once_shifting.fbx and b/interface/resources/avatar/animations/sitting_idle_once_shifting.fbx differ diff --git a/interface/resources/avatar/animations/sitting_idle_once_shiftweight.fbx b/interface/resources/avatar/animations/sitting_idle_once_shiftweight.fbx index 08d1eb494f..90d2bd220b 100644 Binary files a/interface/resources/avatar/animations/sitting_idle_once_shiftweight.fbx and b/interface/resources/avatar/animations/sitting_idle_once_shiftweight.fbx differ diff --git a/interface/resources/avatar/avatar-animation.json b/interface/resources/avatar/avatar-animation.json index 0019abf6ec..2b8b3eb9b3 100644 --- a/interface/resources/avatar/avatar-animation.json +++ b/interface/resources/avatar/avatar-animation.json @@ -640,8 +640,8 @@ { "easingType": "easeInOutQuad", "id": "seatedTalk02", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 30, + "interpTarget": 30, "interpType": "evaluateBoth", "priority": 1, "resume": true, @@ -651,8 +651,8 @@ { "easingType": "easeInOutQuad", "id": "seatedTalk03", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 30, + "interpTarget": 30, "interpType": "evaluateBoth", "priority": 1, "resume": true, @@ -662,8 +662,8 @@ { "easingType": "easeInOutQuad", "id": "seatedTalk04", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 30, + "interpTarget": 30, "interpType": "evaluateBoth", "priority": 1, "resume": true, @@ -749,15 +749,15 @@ "data": { "currentState": "seatedIdle01", "endFrame": 30, - "randomSwitchTimeMax": 20, + "randomSwitchTimeMax": 40, "randomSwitchTimeMin": 10, "startFrame": 10, "states": [ { "easingType": "easeInOutQuad", "id": "seatedIdle01", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 30, + "interpTarget": 30, "interpType": "evaluateBoth", "priority": 1, "resume": true, @@ -767,8 +767,8 @@ { "easingType": "easeInOutQuad", "id": "seatedIdle02", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 30, + "interpTarget": 30, "interpType": "evaluateBoth", "priority": 1, "resume": true, @@ -778,8 +778,8 @@ { "easingType": "easeInOutQuad", "id": "seatedIdle03", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 30, + "interpTarget": 30, "interpType": "evaluateBoth", "priority": 1, "resume": true, @@ -789,8 +789,8 @@ { "easingType": "easeInOutQuad", "id": "seatedIdle04", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 30, + "interpTarget": 30, "interpType": "evaluateBoth", "priority": 1, "resume": true, @@ -800,8 +800,8 @@ { "easingType": "easeInOutQuad", "id": "seatedIdle05", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 30, + "interpTarget": 30, "interpType": "evaluateBoth", "priority": 1, "resume": true, @@ -810,7 +810,8 @@ } ], "timeScale": 1, - "triggerRandomSwitch": "seatedIdleSwitch" + "triggerRandomSwitch": "seatedIdleSwitch", + "triggerTimeMax": 10 }, "id": "masterSeatedIdle", "type": "randomSwitchStateMachine" @@ -928,8 +929,8 @@ { "easingType": "easeInOutQuad", "id": "seatedFidgetShifting", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 1, "resume": false, @@ -939,8 +940,8 @@ { "easingType": "easeInOutQuad", "id": "seatedFidgetLookFidget", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 1, "resume": false, @@ -950,8 +951,8 @@ { "easingType": "easeInOutQuad", "id": "seatedFidgetShiftWeight", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 1, "resume": false, @@ -961,8 +962,8 @@ { "easingType": "easeInOutQuad", "id": "seatedFidgeting", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 1, "resume": false, @@ -972,8 +973,8 @@ { "easingType": "easeInOutQuad", "id": "seatedFidgetLookAround", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 1, "resume": false, @@ -983,8 +984,8 @@ { "easingType": "easeInOutQuad", "id": "seatedFidgetLookLeftRight", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 1, "resume": false, @@ -994,8 +995,8 @@ { "easingType": "easeInOutQuad", "id": "seatedFidgetLeanForward", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 1, "resume": false, @@ -1005,8 +1006,8 @@ { "easingType": "easeInOutQuad", "id": "seatedFidgetShakeLegs", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 1, "resume": false, @@ -1085,8 +1086,8 @@ ], "transitionVar": "timeToSeatedFidget", "triggerRandomSwitch": "", - "triggerTimeMax": 20, - "triggerTimeMin": 2 + "triggerTimeMax": 45, + "triggerTimeMin": 10 }, "id": "seatedIdle", "type": "randomSwitchStateMachine" @@ -1873,9 +1874,9 @@ "type": "randomSwitchStateMachine" }, { - "children": [ + "children": [ { - "children": [ + "children": [ { "children": [ { @@ -1982,7 +1983,7 @@ "blendType": "addAbsolute" }, "id": "seatedReactionPointBase", - "type": "blendLinear" + "type": "blendLinear" }, { "children": [ @@ -2477,8 +2478,8 @@ { "easingType": "easeInOutQuad", "id": "talk", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2488,8 +2489,8 @@ { "easingType": "easeInOutQuad", "id": "talk02", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2499,8 +2500,8 @@ { "easingType": "easeInOutQuad", "id": "talk03", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2510,8 +2511,8 @@ { "easingType": "easeInOutQuad", "id": "talk04", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2521,8 +2522,8 @@ { "easingType": "easeInOutQuad", "id": "talk_armsdown", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2532,8 +2533,8 @@ { "easingType": "easeInOutQuad", "id": "talk_lefthand", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2543,8 +2544,8 @@ { "easingType": "easeInOutQuad", "id": "talk_righthand", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 1, + "interpTarget": 1, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -3102,8 +3103,8 @@ { "easingType": "easeInOutQuad", "id": "fidget", - "interpDuration": 15, - "interpTarget": 15, + "interpDuration": 20, + "interpTarget": 20, "interpType": "evaluateBoth", "priority": -1, "resume": false, @@ -4326,8 +4327,8 @@ { "easingType": "easeInOutQuad", "id": "idleTalkOverlay", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 25, + "interpTarget": 25, "interpType": "evaluateBoth", "transitions": [ {