Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #16252 from dooglifeSF/emotes_revisions_per_feedback

Browse source 
Emotes revisions per feedback
This commit is contained in:
Anthony Thibault 2019-09-30 15:46:50 -07:00 committed by GitHub
commit 7ee5b8e229
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

@ -2802,7 +2802,7 @@
"children": [ "children": [
], ],
"data": { "data": {
"endFrame": 92, "endFrame": 84,
"loopFlag": false, "loopFlag": false,
"startFrame": 1, "startFrame": 1,
"timeScale": 1, "timeScale": 1,
@ -2815,7 +2815,7 @@
"children": [ "children": [
], ],
"data": { "data": {
"endFrame": 158, "endFrame": 100,
"loopFlag": false, "loopFlag": false,
"startFrame": 1, "startFrame": 1,
"timeScale": 1, "timeScale": 1,
@ -4610,9 +4610,9 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "idle", "id": "idle",
"interpDuration": 10, "interpDuration": 20,
"interpTarget": 10, "interpTarget": 20,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "WALKFWD", "state": "WALKFWD",