Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:57:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd

Browse source
This commit is contained in:
RebeccaStankus 2019-08-20 09:01:18 -07:00
commit e48e733343
15 changed files with 319 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assignment-client/src/avatars/AvatarMixerSlave.cpp
View file

@ -157,11 +157,6 @@ qint64 AvatarMixerSlave::addChangedTraitsToBulkPacket(AvatarMixerClientData* lis
++simpleReceivedIt; ++simpleReceivedIt;
} }
if (bytesWritten > 0 && sendingAvatar->isCertifyFailed()) {
// Resend identity packet if certification failed:
sendingAvatar->setNeedsIdentityUpdate();
}
// enumerate the received instanced trait versions // enumerate the received instanced trait versions
auto instancedReceivedIt = lastReceivedVersions.instancedCBegin(); auto instancedReceivedIt = lastReceivedVersions.instancedCBegin();
while (instancedReceivedIt != lastReceivedVersions.instancedCEnd()) { while (instancedReceivedIt != lastReceivedVersions.instancedCEnd()) {

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

@ -632,8 +632,8 @@
], ],
"data": { "data": {
"currentState": "seatedTalk02", "currentState": "seatedTalk02",
"randomSwitchTimeMax": 10, "randomSwitchTimeMax": 12,
"randomSwitchTimeMin": 1, "randomSwitchTimeMin": 7,
"states": [ "states": [
{ {
"id": "seatedTalk02", "id": "seatedTalk02",
@ -698,8 +698,8 @@
], ],
"data": { "data": {
"currentState": "seatedIdle01", "currentState": "seatedIdle01",
"randomSwitchTimeMax": 10, "randomSwitchTimeMax": 20,
"randomSwitchTimeMin": 1, "randomSwitchTimeMin": 10,
"states": [ "states": [
{ {
"id": "seatedIdle01", "id": "seatedIdle01",
@ -779,8 +779,8 @@
"currentState": "seatedReactionPositiveHeadNod", "currentState": "seatedReactionPositiveHeadNod",
"endFrame": 30, "endFrame": 30,
"loopFlag": false, "loopFlag": false,
"randomSwitchTimeMax": 10, "randomSwitchTimeMax": 12,
"randomSwitchTimeMin": 1, "randomSwitchTimeMin": 7,
"startFrame": 0, "startFrame": 0,
"states": [ "states": [
{ {
@ -856,18 +856,22 @@
"startFrame": 0, "startFrame": 0,
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionNegativeDisagreeHeadshake", "id": "seatedReactionNegativeDisagreeHeadshake",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionNegativeDisagreeDropHead", "id": "seatedReactionNegativeDisagreeDropHead",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -957,9 +961,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionRaiseHandOutro", "id": "seatedReactionRaiseHandOutro",
"interpDuration": 1, "interpDuration": 18,
"interpTarget": 1, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 0, "priority": 0,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -1038,9 +1044,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionApplaudLoop", "id": "seatedReactionApplaudLoop",
"interpDuration": 5, "interpDuration": 18,
"interpTarget": 5, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 0, "priority": 0,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -1051,9 +1059,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionApplaudOutro", "id": "seatedReactionApplaudOutro",
"interpDuration": 1, "interpDuration": 18,
"interpTarget": 1, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 0, "priority": 0,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -1132,9 +1142,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionPointLoop", "id": "seatedReactionPointLoop",
"interpDuration": 5, "interpDuration": 18,
"interpTarget": 5, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 0, "priority": 0,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -1145,9 +1157,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionPointOutro", "id": "seatedReactionPointOutro",
"interpDuration": 1, "interpDuration": 18,
"interpTarget": 1, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 0, "priority": 0,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -1197,10 +1211,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionPositive", "id": "seatedReactionPositive",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "seatedTalkOverlay", "state": "seatedTalkOverlay",
@ -1233,10 +1248,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionNegative", "id": "seatedReactionNegative",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "seatedReactionPositive", "state": "seatedReactionPositive",
@ -1265,10 +1281,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionRaiseHand", "id": "seatedReactionRaiseHand",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "seatedReactionNegative", "state": "seatedReactionNegative",
@ -1293,10 +1310,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionApplaud", "id": "seatedReactionApplaud",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "seatedReactionNegative", "state": "seatedReactionNegative",
@ -1321,10 +1339,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "seatedReactionPoint", "id": "seatedReactionPoint",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "seatedReactionNegative", "state": "seatedReactionNegative",
@ -1457,63 +1476,77 @@
"randomSwitchTimeMin": 7, "randomSwitchTimeMin": 7,
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "talk", "id": "talk",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 20, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "talk02", "id": "talk02",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 20, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "talk03", "id": "talk03",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 20, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "talk04", "id": "talk04",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 20, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "talk_armsdown", "id": "talk_armsdown",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 20, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "talk_lefthand", "id": "talk_lefthand",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 20, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "talk_righthand", "id": "talk_righthand",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 20, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": true, "resume": true,
"transitions": [ "transitions": [
@ -1588,36 +1621,44 @@
"randomSwitchTimeMin": 10, "randomSwitchTimeMin": 10,
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "masterIdle1", "id": "masterIdle1",
"interpDuration": 20, "interpDuration": 30,
"interpTarget": 21, "interpTarget": 30,
"interpType": "evaluateBoth",
"priority": 0.25, "priority": 0.25,
"resume": true, "resume": true,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "masterIdle2", "id": "masterIdle2",
"interpDuration": 20, "interpDuration": 30,
"interpTarget": 21, "interpTarget": 30,
"interpType": "evaluateBoth",
"priority": 0.25, "priority": 0.25,
"resume": true, "resume": true,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "masterIdle3", "id": "masterIdle3",
"interpDuration": 20, "interpDuration": 30,
"interpTarget": 21, "interpTarget": 30,
"interpType": "evaluateBoth",
"priority": 0.25, "priority": 0.25,
"resume": true, "resume": true,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "masterIdle4", "id": "masterIdle4",
"interpDuration": 20, "interpDuration": 30,
"interpTarget": 21, "interpTarget": 30,
"interpType": "evaluateBoth",
"priority": 0.25, "priority": 0.25,
"resume": true, "resume": true,
"transitions": [ "transitions": [
@ -1742,72 +1783,88 @@
"currentState": "idle_once_slownod", "currentState": "idle_once_slownod",
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "idle_once_slownod", "id": "idle_once_slownod",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 21, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.2, "priority": 0.2,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "idle_once_headtilt", "id": "idle_once_headtilt",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 21, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.2, "priority": 0.2,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "idle_once_shiftheelpivot", "id": "idle_once_shiftheelpivot",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 21, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.2, "priority": 0.2,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "idleWS_all", "id": "idleWS_all",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 21, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.2, "priority": 0.2,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "idle_once_lookaround", "id": "idle_once_lookaround",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 21, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.2, "priority": 0.2,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "idle_once_neckstretch", "id": "idle_once_neckstretch",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 21, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.2, "priority": 0.2,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "idle_once_lookleftright", "id": "idle_once_lookleftright",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 21, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.2, "priority": 0.2,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "idle_once_fidget", "id": "idle_once_fidget",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 21, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": 0.2, "priority": 0.2,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -1827,7 +1884,8 @@
"endFrame": 80, "endFrame": 80,
"loopFlag": false, "loopFlag": false,
"startFrame": 1, "startFrame": 1,
"timeScale": 1, "startFrameVar": "",
"timeScale": 0.65,
"url": "qrc:///avatar/animations/idle_LFF_all.fbx" "url": "qrc:///avatar/animations/idle_LFF_all.fbx"
}, },
"id": "transitionToAltIdle1", "id": "transitionToAltIdle1",
@ -1840,7 +1898,7 @@
"endFrame": 80, "endFrame": 80,
"loopFlag": false, "loopFlag": false,
"startFrame": 1, "startFrame": 1,
"timeScale": 1, "timeScale": 0.65,
"url": "qrc:///avatar/animations/idle_RFF_all.fbx" "url": "qrc:///avatar/animations/idle_RFF_all.fbx"
}, },
"id": "transitionToAltIdle2", "id": "transitionToAltIdle2",
@ -1850,7 +1908,7 @@
"children": [ "children": [
], ],
"data": { "data": {
"endFrame": 389, "endFrame": 388,
"loopFlag": true, "loopFlag": true,
"startFrame": 80, "startFrame": 80,
"timeScale": 1, "timeScale": 1,
@ -1863,7 +1921,7 @@
"children": [ "children": [
], ],
"data": { "data": {
"endFrame": 390, "endFrame": 388,
"loopFlag": true, "loopFlag": true,
"startFrame": 80, "startFrame": 80,
"timeScale": 1, "timeScale": 1,
@ -1878,7 +1936,7 @@
"data": { "data": {
"endFrame": 472, "endFrame": 472,
"loopFlag": false, "loopFlag": false,
"startFrame": 389, "startFrame": 388,
"timeScale": 1, "timeScale": 1,
"url": "qrc:///avatar/animations/idle_LFF_all.fbx" "url": "qrc:///avatar/animations/idle_LFF_all.fbx"
}, },
@ -1891,7 +1949,7 @@
"data": { "data": {
"endFrame": 453, "endFrame": 453,
"loopFlag": false, "loopFlag": false,
"startFrame": 390, "startFrame": 388,
"timeScale": 1, "timeScale": 1,
"url": "qrc:///avatar/animations/idle_RFF_all.fbx" "url": "qrc:///avatar/animations/idle_RFF_all.fbx"
}, },
@ -1903,9 +1961,11 @@
"currentState": "transitionToAltIdle1", "currentState": "transitionToAltIdle1",
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "transitionToAltIdle1", "id": "transitionToAltIdle1",
"interpDuration": 10, "interpDuration": 20,
"interpTarget": 11, "interpTarget": 20,
"interpType": "evaluateBoth",
"priority": 0.5, "priority": 0.5,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -1916,9 +1976,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "transitionToAltIdle2", "id": "transitionToAltIdle2",
"interpDuration": 10, "interpDuration": 20,
"interpTarget": 11, "interpTarget": 20,
"interpType": "evaluateBoth",
"priority": 0.5, "priority": 0.5,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -1929,9 +1991,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "altIdle1", "id": "altIdle1",
"interpDuration": 10, "interpDuration": 1,
"interpTarget": 11, "interpTarget": 1,
"interpType": "evaluateBoth",
"priority": -1, "priority": -1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -1942,9 +2006,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "altIdle2", "id": "altIdle2",
"interpDuration": 10, "interpDuration": 1,
"interpTarget": 11, "interpTarget": 1,
"interpType": "evaluateBoth",
"priority": -1, "priority": -1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -1955,18 +2021,22 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "alt1ToMasterIdle", "id": "alt1ToMasterIdle",
"interpDuration": 10, "interpDuration": 24,
"interpTarget": 11, "interpTarget": 24,
"interpType": "evaluateBoth",
"priority": -1, "priority": -1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "alt2ToMasterIdle", "id": "alt2ToMasterIdle",
"interpDuration": 10, "interpDuration": 24,
"interpTarget": 11, "interpTarget": 24,
"interpType": "evaluateBoth",
"priority": -1, "priority": -1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -1985,18 +2055,22 @@
"currentState": "movement", "currentState": "movement",
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "movement", "id": "movement",
"interpDuration": 15, "interpDuration": 30,
"interpTarget": 17, "interpTarget": 30,
"interpType": "evaluateBoth",
"priority": 0.6, "priority": 0.6,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "alternateIdle", "id": "alternateIdle",
"interpDuration": 15, "interpDuration": 30,
"interpTarget": 17, "interpTarget": 30,
"interpType": "evaluateBoth",
"priority": 0.4, "priority": 0.4,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -2012,9 +2086,11 @@
"currentState": "masterIdle", "currentState": "masterIdle",
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "masterIdle", "id": "masterIdle",
"interpDuration": 20, "interpDuration": 30,
"interpTarget": 21, "interpTarget": 30,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -2025,9 +2101,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "fidget", "id": "fidget",
"interpDuration": 20, "interpDuration": 15,
"interpTarget": 21, "interpTarget": 15,
"interpType": "evaluateBoth",
"priority": -1, "priority": -1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -2164,45 +2242,55 @@
"randomSwitchTimeMin": 1, "randomSwitchTimeMin": 1,
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "positiveAcknowledge", "id": "positiveAcknowledge",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "positiveHeadNod", "id": "positiveHeadNod",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "positiveHeadNodYes", "id": "positiveHeadNodYes",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "positiveLongHeadNod", "id": "positiveLongHeadNod",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "positiveThoughtfulHeadNod", "id": "positiveThoughtfulHeadNod",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 0.33, "priority": 0.33,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -2262,27 +2350,33 @@
"randomSwitchTimeMin": 1, "randomSwitchTimeMin": 1,
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "negativeAnnoyedHeadshake", "id": "negativeAnnoyedHeadshake",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "negativeThoughtfulHeadshake", "id": "negativeThoughtfulHeadshake",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "negativeDropHead", "id": "negativeDropHead",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -2584,27 +2678,33 @@
"randomSwitchTimeMin": 1, "randomSwitchTimeMin": 1,
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "raiseHand01", "id": "raiseHand01",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "raiseHand03", "id": "raiseHand03",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "raiseHand04", "id": "raiseHand04",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -2909,27 +3009,33 @@
"randomSwitchTimeMin": 1, "randomSwitchTimeMin": 1,
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "applaudClap01", "id": "applaudClap01",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "applaudClap02", "id": "applaudClap02",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "applaudClap03", "id": "applaudClap03",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 1, "priority": 1,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -3016,9 +3122,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "reactionPointOutro", "id": "reactionPointOutro",
"interpDuration": 1, "interpDuration": 18,
"interpTarget": 1, "interpTarget": 18,
"interpType": "evaluateBoth",
"priority": 0, "priority": 0,
"resume": false, "resume": false,
"transitions": [ "transitions": [
@ -3068,10 +3176,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "reactionPositive", "id": "reactionPositive",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "idleTalkOverlay", "state": "idleTalkOverlay",
@ -3112,10 +3221,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "reactionNegative", "id": "reactionNegative",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "reactionPositive", "state": "reactionPositive",
@ -3148,10 +3258,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "reactionRaiseHand", "id": "reactionRaiseHand",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "reactionNegative", "state": "reactionNegative",
@ -3176,10 +3287,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "reactionApplaud", "id": "reactionApplaud",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "reactionNegative", "state": "reactionNegative",
@ -3204,10 +3316,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "reactionPoint", "id": "reactionPoint",
"interpDuration": 6, "interpDuration": 18,
"interpTarget": 6, "interpTarget": 18,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "reactionNegative", "state": "reactionNegative",
@ -3945,10 +4058,11 @@
], ],
"states": [ "states": [
{ {
"easingType": "easeInOutQuad",
"id": "seated", "id": "seated",
"interpDuration": 8, "interpDuration": 18,
"interpTarget": 20, "interpTarget": 20,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "idle", "state": "idle",
@ -4009,10 +4123,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "idle", "id": "idle",
"interpDuration": 8, "interpDuration": 30,
"interpTarget": 20, "interpTarget": 30,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "WALKFWD", "state": "WALKFWD",
@ -4140,10 +4255,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "idleSettle", "id": "idleSettle",
"interpDuration": 8, "interpDuration": 12,
"interpTarget": 15, "interpTarget": 12,
"interpType": "snapshotPrev", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "idle", "state": "idle",
@ -4464,9 +4580,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "turnRight", "id": "turnRight",
"interpDuration": 8, "interpDuration": 15,
"interpTarget": 8, "interpTarget": 15,
"interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "idle", "state": "idle",
@ -4527,9 +4645,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "turnLeft", "id": "turnLeft",
"interpDuration": 8, "interpDuration": 15,
"interpTarget": 8, "interpTarget": 15,
"interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "idle", "state": "idle",
@ -4718,9 +4838,11 @@
] ]
}, },
{ {
"easingType": "easeInOutQuad",
"id": "fly", "id": "fly",
"interpDuration": 6, "interpDuration": 24,
"interpTarget": 6, "interpTarget": 24,
"interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
"state": "idleSettle", "state": "idleSettle",

3
interface/src/avatar/MyAvatar.h
View file

@ -1866,6 +1866,9 @@ public:
// also clears internal reaction triggers // also clears internal reaction triggers
void updateRigControllerParameters(Rig::ControllerParameters& params); void updateRigControllerParameters(Rig::ControllerParameters& params);
// Don't substitute verify-fail:
virtual const QUrl& getSkeletonModelURL() const override { return _skeletonModelURL; }
public slots: public slots:
/**jsdoc /**jsdoc

7
interface/src/commerce/Wallet.cpp
View file

@ -830,9 +830,14 @@ void Wallet::handleChallengeOwnershipPacket(QSharedPointer<ReceivedMessage> pack
} }
void Wallet::sendChallengeOwnershipResponses() { void Wallet::sendChallengeOwnershipResponses() {
if (_pendingChallenges.size() == 0 || getSalt().length() == 0) { if (_pendingChallenges.size() == 0) {
return; return;
} }
if (getSalt().length() == 0) {
qCDebug(commerce) << "Not responding to ownership challenge due to missing Wallet salt";
return;
}
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
EC_KEY* ec = readKeys(keyFilePath()); EC_KEY* ec = readKeys(keyFilePath());

9
launchers/darwin/src/Interface.m
View file

@ -33,10 +33,11 @@
return 0; return 0;
} }
NSFileHandle * fh = [standardOut fileHandleForReading]; NSFileHandle* fh = [standardOut fileHandleForReading];
NSData * data = [fh readDataToEndOfFile]; NSData* data = [fh readDataToEndOfFile];
NSString * output = [NSString stringWithUTF8String:[data bytes]];
if (output == nil) { NSString* output = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
if (output == nil || [output length] == 0) {
NSDictionary * userInfo = @{ NSDictionary * userInfo = @{
NSLocalizedDescriptionKey: NSLocalizedString(@"Couldn't start interface", nil) NSLocalizedDescriptionKey: NSLocalizedString(@"Couldn't start interface", nil)
}; };

2
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -1511,7 +1511,7 @@ void Avatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
} }
indicateLoadingStatus(LoadingStatus::LoadModel); indicateLoadingStatus(LoadingStatus::LoadModel);
_skeletonModel->setURL(_skeletonModelURL); _skeletonModel->setURL(getSkeletonModelURL());
} }
void Avatar::setModelURLFinished(bool success) { void Avatar::setModelURLFinished(bool success) {

18
libraries/avatars/src/AvatarData.cpp
View file

@ -1988,7 +1988,11 @@ void AvatarData::processAvatarIdentity(QDataStream& packetStream, bool& identity
if (flagValue != _verificationFailed) { if (flagValue != _verificationFailed) {
_verificationFailed = flagValue; _verificationFailed = flagValue;
identityChanged = true; identityChanged = true;
} setSkeletonModelURL(_skeletonModelURL);
if (_verificationFailed) {
qCDebug(avatars) << "Avatar" << getSessionDisplayName() << "marked as VERIFY-FAILED";
}
};
if (identity.attachmentData != _attachmentData) { if (identity.attachmentData != _attachmentData) {
setAttachmentData(identity.attachmentData); setAttachmentData(identity.attachmentData);
@ -2016,6 +2020,18 @@ QUrl AvatarData::getWireSafeSkeletonModelURL() const {
return QUrl(); return QUrl();
} }
} }
static const QString VERIFY_FAIL_MODEL { "/meshes/verifyFailed.fst" };
const QUrl& AvatarData::getSkeletonModelURL() const {
if (_verificationFailed) {
static QUrl VERIFY_FAIL_MODEL_URL = PathUtils::resourcesUrl(VERIFY_FAIL_MODEL);
return VERIFY_FAIL_MODEL_URL;
} else {
return _skeletonModelURL;
}
}
QByteArray AvatarData::packSkeletonData() const { QByteArray AvatarData::packSkeletonData() const {
// Send an avatar trait packet with the skeleton data before the mesh is loaded // Send an avatar trait packet with the skeleton data before the mesh is loaded
int avatarDataSize = 0; int avatarDataSize = 0;

2
libraries/avatars/src/AvatarData.h
View file

@ -1205,7 +1205,7 @@ public:
QByteArray identityByteArray(bool setIsReplicated = false) const; QByteArray identityByteArray(bool setIsReplicated = false) const;
QUrl getWireSafeSkeletonModelURL() const; QUrl getWireSafeSkeletonModelURL() const;
const QUrl& getSkeletonModelURL() const { return _skeletonModelURL; } virtual const QUrl& getSkeletonModelURL() const;
const QString& getDisplayName() const { return _displayName; } const QString& getDisplayName() const { return _displayName; }
const QString& getSessionDisplayName() const { return _sessionDisplayName; } const QString& getSessionDisplayName() const { return _sessionDisplayName; }

4
libraries/avatars/src/AvatarHashMap.cpp
View file

@ -330,10 +330,6 @@ void AvatarHashMap::processAvatarIdentityPacket(QSharedPointer<ReceivedMessage>
bool displayNameChanged = false; bool displayNameChanged = false;
// In this case, the "sendingNode" is the Avatar Mixer. // In this case, the "sendingNode" is the Avatar Mixer.
avatar->processAvatarIdentity(avatarIdentityStream, identityChanged, displayNameChanged); avatar->processAvatarIdentity(avatarIdentityStream, identityChanged, displayNameChanged);
if (avatar->isCertifyFailed() && identityUUID != EMPTY) {
qCDebug(avatars) << "Avatar" << avatar->getSessionDisplayName() << "marked as VERIFY-FAILED";
avatar->setSkeletonModelURL(PathUtils::resourcesUrl(VERIFY_FAIL_MODEL));
}
_replicas.processAvatarIdentity(identityUUID, message->getMessage(), identityChanged, displayNameChanged); _replicas.processAvatarIdentity(identityUUID, message->getMessage(), identityChanged, displayNameChanged);
} }
} }

2
tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
View file

@ -239,7 +239,7 @@
<?js typedefs.forEach(function(e) { <?js typedefs.forEach(function(e) {
if (e.signature) { if (e.signature) {
?> ?>
<?js= self.partial('members.tmpl', e) ?> <?js= self.partial('method.tmpl', e) ?>
<?js <?js
} }
else { else {

7
tools/jsdoc/hifi-jsdoc-template/tmpl/method.tmpl
View file

@ -13,7 +13,10 @@ var self = this;
<?js returns.forEach(function(r) { ?> <?js returns.forEach(function(r) { ?>
<?js= self.partial('returns.tmpl', r) ?> <?js= self.partial('returns.tmpl', r) ?>
<?js }); <?js });
} ?></span> } ?></span>
<?js if (data.kind === 'typedef' && data.type && data.type.names) { ?>
<br />Type: <?js= self.partial('type.tmpl', data.type.names) ?>
<?js } ?>
</th> </th>
</tr> </tr>
</thead> </thead>
@ -63,7 +66,7 @@ var self = this;
<?js= self.partial('augments.tmpl', data) ?> <?js= self.partial('augments.tmpl', data) ?>
<?js } ?> <?js } ?>
<?js if (kind === 'event' && data.type && data.type.names) {?> <?js if (data.kind === 'event' && data.type && data.type.names) {?>
<h5>Type:</h5> <h5>Type:</h5>
<ul> <ul>
<li> <li>