Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 12:04:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

animation revisions after checking them in a standup group

Browse source
This commit is contained in:
dooglifeSF 2019-10-02 17:18:36 -07:00
parent 86e67afe34
commit ebd0b06475
11 changed files with 58 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/avatar/animations/sitting_idle02.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/sitting_idle05.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/sitting_idle_once_fidget.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/sitting_idle_once_leanforward.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/sitting_idle_once_lookaround.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/sitting_idle_once_lookfidget.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/sitting_idle_once_lookleftright.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/sitting_idle_once_shakelegs.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/sitting_idle_once_shifting.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/sitting_idle_once_shiftweight.fbx
View file

Binary file not shown.

115
interface/resources/avatar/avatar-animation.json
View file

@ -640,8 +640,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedTalk02", "id": "seatedTalk02",
"interpDuration": 15, "interpDuration": 30,
"interpTarget": 15, "interpTarget": 30,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": true, "resume": true,
@ -651,8 +651,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedTalk03", "id": "seatedTalk03",
"interpDuration": 15, "interpDuration": 30,
"interpTarget": 15, "interpTarget": 30,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": true, "resume": true,
@ -662,8 +662,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedTalk04", "id": "seatedTalk04",
"interpDuration": 15, "interpDuration": 30,
"interpTarget": 15, "interpTarget": 30,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": true, "resume": true,
@ -749,15 +749,15 @@
"data": { "data": {
"currentState": "seatedIdle01", "currentState": "seatedIdle01",
"endFrame": 30, "endFrame": 30,
"randomSwitchTimeMax": 20, "randomSwitchTimeMax": 40,
"randomSwitchTimeMin": 10, "randomSwitchTimeMin": 10,
"startFrame": 10, "startFrame": 10,
"states": [ "states": [
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedIdle01", "id": "seatedIdle01",
"interpDuration": 20, "interpDuration": 30,
"interpTarget": 20, "interpTarget": 30,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": true, "resume": true,
@ -767,8 +767,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedIdle02", "id": "seatedIdle02",
"interpDuration": 20, "interpDuration": 30,
"interpTarget": 20, "interpTarget": 30,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": true, "resume": true,
@ -778,8 +778,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedIdle03", "id": "seatedIdle03",
"interpDuration": 20, "interpDuration": 30,
"interpTarget": 20, "interpTarget": 30,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": true, "resume": true,
@ -789,8 +789,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedIdle04", "id": "seatedIdle04",
"interpDuration": 20, "interpDuration": 30,
"interpTarget": 20, "interpTarget": 30,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": true, "resume": true,
@ -800,8 +800,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedIdle05", "id": "seatedIdle05",
"interpDuration": 20, "interpDuration": 30,
"interpTarget": 20, "interpTarget": 30,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": true, "resume": true,
@ -810,7 +810,8 @@
} }
], ],
"timeScale": 1, "timeScale": 1,
"triggerRandomSwitch": "seatedIdleSwitch" "triggerRandomSwitch": "seatedIdleSwitch",
"triggerTimeMax": 10
}, },
"id": "masterSeatedIdle", "id": "masterSeatedIdle",
"type": "randomSwitchStateMachine" "type": "randomSwitchStateMachine"
@ -928,8 +929,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedFidgetShifting", "id": "seatedFidgetShifting",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
@ -939,8 +940,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedFidgetLookFidget", "id": "seatedFidgetLookFidget",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
@ -950,8 +951,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedFidgetShiftWeight", "id": "seatedFidgetShiftWeight",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
@ -961,8 +962,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedFidgeting", "id": "seatedFidgeting",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
@ -972,8 +973,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedFidgetLookAround", "id": "seatedFidgetLookAround",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
@ -983,8 +984,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedFidgetLookLeftRight", "id": "seatedFidgetLookLeftRight",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
@ -994,8 +995,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedFidgetLeanForward", "id": "seatedFidgetLeanForward",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
@ -1005,8 +1006,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedFidgetShakeLegs", "id": "seatedFidgetShakeLegs",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
@ -1085,8 +1086,8 @@
], ],
"transitionVar": "timeToSeatedFidget", "transitionVar": "timeToSeatedFidget",
"triggerRandomSwitch": "", "triggerRandomSwitch": "",
"triggerTimeMax": 20, "triggerTimeMax": 45,
"triggerTimeMin": 2 "triggerTimeMin": 10
}, },
"id": "seatedIdle", "id": "seatedIdle",
"type": "randomSwitchStateMachine" "type": "randomSwitchStateMachine"
@ -1873,9 +1874,9 @@
"type": "randomSwitchStateMachine" "type": "randomSwitchStateMachine"
}, },
{ {
"children": [ "children": [
{ {
"children": [ "children": [
{ {
"children": [ "children": [
{ {
@ -1982,7 +1983,7 @@
"blendType": "addAbsolute" "blendType": "addAbsolute"
}, },
"id": "seatedReactionPointBase", "id": "seatedReactionPointBase",
"type": "blendLinear" "type": "blendLinear"
}, },
{ {
"children": [ "children": [
@ -2477,8 +2478,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "talk", "id": "talk",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
@ -2488,8 +2489,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "talk02", "id": "talk02",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
@ -2499,8 +2500,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "talk03", "id": "talk03",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
@ -2510,8 +2511,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "talk04", "id": "talk04",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
@ -2521,8 +2522,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "talk_armsdown", "id": "talk_armsdown",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
@ -2532,8 +2533,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "talk_lefthand", "id": "talk_lefthand",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
@ -2543,8 +2544,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "talk_righthand", "id": "talk_righthand",
"interpDuration": 15, "interpDuration": 1,
"interpTarget": 15, "interpTarget": 1,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
@ -3102,8 +3103,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "fidget", "id": "fidget",
"interpDuration": 15, "interpDuration": 20,
"interpTarget": 15, "interpTarget": 20,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"priority": -1, "priority": -1,
"resume": false, "resume": false,
@ -4326,8 +4327,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "idleTalkOverlay", "id": "idleTalkOverlay",
"interpDuration": 20, "interpDuration": 25,
"interpTarget": 20, "interpTarget": 25,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {