mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-04 18:54:02 +02:00
sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit
This commit is contained in:
parent
6b3dfd6d56
commit
9cfa4753d9
12 changed files with 71 additions and 16 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -822,6 +822,19 @@
|
|||
},
|
||||
"id": "seatedReactionPositiveCheer",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 64,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_emote_agree_acknowledge.fbx"
|
||||
},
|
||||
"id": "seatedReactionPositiveAcknowledge",
|
||||
"type": "clip"
|
||||
}
|
||||
],
|
||||
"data": {
|
||||
|
@ -867,6 +880,15 @@
|
|||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "seatedReactionPositiveAcknowledge",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
}
|
||||
],
|
||||
"timeScale": 1,
|
||||
|
@ -916,6 +938,19 @@
|
|||
},
|
||||
"id": "seatedReactionNegativeDisagreeDisbelief",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 70,
|
||||
"loopFlag": false,
|
||||
"startFrame": 0,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_emote_disagree_dismiss.fbx"
|
||||
},
|
||||
"id": "seatedReactionNegativeDisagreeDismiss",
|
||||
"type": "clip"
|
||||
}
|
||||
],
|
||||
"data": {
|
||||
|
@ -958,6 +993,17 @@
|
|||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedReactionNegativeDisagreeDismiss",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
}
|
||||
],
|
||||
"timeScale": 1,
|
||||
|
@ -1417,7 +1463,7 @@
|
|||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 22,
|
||||
"endFrame": 21,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
|
@ -1430,9 +1476,9 @@
|
|||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 43,
|
||||
"endFrame": 100,
|
||||
"loopFlag": true,
|
||||
"startFrame": 22,
|
||||
"startFrame": 21,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_emote_point_all.fbx"
|
||||
},
|
||||
|
@ -1443,9 +1489,10 @@
|
|||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 71,
|
||||
"endFrame": 134,
|
||||
"loopFlag": false,
|
||||
"startFrame": 43,
|
||||
"mirrorFlag": false,
|
||||
"startFrame": 100,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_emote_point_all.fbx"
|
||||
},
|
||||
|
@ -1565,6 +1612,10 @@
|
|||
"state": "seatedTalkOverlay",
|
||||
"var": "seatedReactionPositiveCheerOnDone"
|
||||
},
|
||||
{
|
||||
"state": "seatedTalkOverlay",
|
||||
"var": "seatedReactionPositiveAcknowledgeOnDone"
|
||||
},
|
||||
{
|
||||
"state": "seatedReactionNegative",
|
||||
"var": "reactionNegativeTrigger"
|
||||
|
@ -1606,6 +1657,10 @@
|
|||
"state": "seatedTalkOverlay",
|
||||
"var": "seatedReactionNegativeDisagreeDisbeliefOnDone"
|
||||
},
|
||||
{
|
||||
"state": "seatedTalkOverlay",
|
||||
"var": "seatedReactionNegativeDisagreeDismissOnDone"
|
||||
},
|
||||
{
|
||||
"state": "seatedReactionRaiseHand",
|
||||
"var": "reactionRaiseHandEnabled"
|
||||
|
@ -2514,7 +2569,7 @@
|
|||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 58,
|
||||
"endFrame": 64,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
|
@ -2540,7 +2595,7 @@
|
|||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 78,
|
||||
"endFrame": 94,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
|
@ -2553,7 +2608,7 @@
|
|||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 66,
|
||||
"endFrame": 68,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
|
@ -2566,7 +2621,7 @@
|
|||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 85,
|
||||
"endFrame": 84,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
|
@ -3392,7 +3447,7 @@
|
|||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 22,
|
||||
"endFrame": 21,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
|
@ -3405,9 +3460,9 @@
|
|||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 40,
|
||||
"endFrame": 100,
|
||||
"loopFlag": true,
|
||||
"startFrame": 22,
|
||||
"startFrame": 21,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/emote_point01_all.fbx"
|
||||
},
|
||||
|
@ -3418,9 +3473,9 @@
|
|||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 78,
|
||||
"endFrame": 134,
|
||||
"loopFlag": false,
|
||||
"startFrame": 40,
|
||||
"startFrame": 100,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/emote_point01_all.fbx"
|
||||
},
|
||||
|
@ -3489,8 +3544,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "idleTalkOverlay",
|
||||
"interpDuration": 24,
|
||||
"interpTarget": 24,
|
||||
"interpDuration": 20,
|
||||
"interpTarget": 20,
|
||||
"interpType": "evaluateBoth",
|
||||
"transitions": [
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue