diff --git a/assignment-client/src/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp index d874100ca2..46ca51219d 100644 --- a/assignment-client/src/avatars/AvatarMixerSlave.cpp +++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp @@ -157,11 +157,6 @@ qint64 AvatarMixerSlave::addChangedTraitsToBulkPacket(AvatarMixerClientData* lis ++simpleReceivedIt; } - if (bytesWritten > 0 && sendingAvatar->isCertifyFailed()) { - // Resend identity packet if certification failed: - sendingAvatar->setNeedsIdentityUpdate(); - } - // enumerate the received instanced trait versions auto instancedReceivedIt = lastReceivedVersions.instancedCBegin(); while (instancedReceivedIt != lastReceivedVersions.instancedCEnd()) { diff --git a/interface/resources/avatar/animations/emote_agree_thisorthat.fbx b/interface/resources/avatar/animations/emote_agree_thisorthat.fbx deleted file mode 100644 index 582c197142..0000000000 Binary files a/interface/resources/avatar/animations/emote_agree_thisorthat.fbx and /dev/null differ diff --git a/interface/resources/avatar/animations/emote_disagree_no.fbx b/interface/resources/avatar/animations/emote_disagree_no.fbx deleted file mode 100644 index c5aac91f19..0000000000 Binary files a/interface/resources/avatar/animations/emote_disagree_no.fbx and /dev/null differ diff --git a/interface/resources/avatar/animations/idle_LFF_all.fbx b/interface/resources/avatar/animations/idle_LFF_all.fbx index 0344a270a7..66b82914ba 100644 Binary files a/interface/resources/avatar/animations/idle_LFF_all.fbx and b/interface/resources/avatar/animations/idle_LFF_all.fbx differ diff --git a/interface/resources/avatar/animations/idle_RFF_all.fbx b/interface/resources/avatar/animations/idle_RFF_all.fbx index 8aec6a33c0..80277ec9a6 100644 Binary files a/interface/resources/avatar/animations/idle_RFF_all.fbx and b/interface/resources/avatar/animations/idle_RFF_all.fbx differ diff --git a/interface/resources/avatar/avatar-animation.json b/interface/resources/avatar/avatar-animation.json index b23e1c74d9..f455389009 100644 --- a/interface/resources/avatar/avatar-animation.json +++ b/interface/resources/avatar/avatar-animation.json @@ -632,8 +632,8 @@ ], "data": { "currentState": "seatedTalk02", - "randomSwitchTimeMax": 10, - "randomSwitchTimeMin": 1, + "randomSwitchTimeMax": 12, + "randomSwitchTimeMin": 7, "states": [ { "id": "seatedTalk02", @@ -698,8 +698,8 @@ ], "data": { "currentState": "seatedIdle01", - "randomSwitchTimeMax": 10, - "randomSwitchTimeMin": 1, + "randomSwitchTimeMax": 20, + "randomSwitchTimeMin": 10, "states": [ { "id": "seatedIdle01", @@ -779,8 +779,8 @@ "currentState": "seatedReactionPositiveHeadNod", "endFrame": 30, "loopFlag": false, - "randomSwitchTimeMax": 10, - "randomSwitchTimeMin": 1, + "randomSwitchTimeMax": 12, + "randomSwitchTimeMin": 7, "startFrame": 0, "states": [ { @@ -856,18 +856,22 @@ "startFrame": 0, "states": [ { + "easingType": "easeInOutQuad", "id": "seatedReactionNegativeDisagreeHeadshake", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "seatedReactionNegativeDisagreeDropHead", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ @@ -957,9 +961,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "seatedReactionRaiseHandOutro", - "interpDuration": 1, - "interpTarget": 1, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 0, "resume": false, "transitions": [ @@ -1038,9 +1044,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "seatedReactionApplaudLoop", - "interpDuration": 5, - "interpTarget": 5, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 0, "resume": false, "transitions": [ @@ -1051,9 +1059,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "seatedReactionApplaudOutro", - "interpDuration": 1, - "interpTarget": 1, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 0, "resume": false, "transitions": [ @@ -1132,9 +1142,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "seatedReactionPointLoop", - "interpDuration": 5, - "interpTarget": 5, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 0, "resume": false, "transitions": [ @@ -1145,9 +1157,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "seatedReactionPointOutro", - "interpDuration": 1, - "interpTarget": 1, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 0, "resume": false, "transitions": [ @@ -1197,10 +1211,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "seatedReactionPositive", - "interpDuration": 6, - "interpTarget": 6, - "interpType": "snapshotPrev", + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "transitions": [ { "state": "seatedTalkOverlay", @@ -1233,10 +1248,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "seatedReactionNegative", - "interpDuration": 6, - "interpTarget": 6, - "interpType": "snapshotPrev", + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "transitions": [ { "state": "seatedReactionPositive", @@ -1265,10 +1281,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "seatedReactionRaiseHand", - "interpDuration": 6, - "interpTarget": 6, - "interpType": "snapshotPrev", + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "transitions": [ { "state": "seatedReactionNegative", @@ -1293,10 +1310,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "seatedReactionApplaud", - "interpDuration": 6, - "interpTarget": 6, - "interpType": "snapshotPrev", + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "transitions": [ { "state": "seatedReactionNegative", @@ -1321,10 +1339,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "seatedReactionPoint", - "interpDuration": 6, - "interpTarget": 6, - "interpType": "snapshotPrev", + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "transitions": [ { "state": "seatedReactionNegative", @@ -1457,63 +1476,77 @@ "randomSwitchTimeMin": 7, "states": [ { + "easingType": "easeInOutQuad", "id": "talk", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.33, "resume": true, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "talk02", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.33, "resume": true, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "talk03", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.33, "resume": true, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "talk04", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.33, "resume": true, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "talk_armsdown", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.33, "resume": true, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "talk_lefthand", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.33, "resume": true, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "talk_righthand", - "interpDuration": 20, - "interpTarget": 20, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.33, "resume": true, "transitions": [ @@ -1588,36 +1621,44 @@ "randomSwitchTimeMin": 10, "states": [ { + "easingType": "easeInOutQuad", "id": "masterIdle1", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 30, + "interpTarget": 30, + "interpType": "evaluateBoth", "priority": 0.25, "resume": true, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "masterIdle2", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 30, + "interpTarget": 30, + "interpType": "evaluateBoth", "priority": 0.25, "resume": true, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "masterIdle3", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 30, + "interpTarget": 30, + "interpType": "evaluateBoth", "priority": 0.25, "resume": true, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "masterIdle4", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 30, + "interpTarget": 30, + "interpType": "evaluateBoth", "priority": 0.25, "resume": true, "transitions": [ @@ -1742,72 +1783,88 @@ "currentState": "idle_once_slownod", "states": [ { + "easingType": "easeInOutQuad", "id": "idle_once_slownod", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.2, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "idle_once_headtilt", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.2, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "idle_once_shiftheelpivot", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.2, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "idleWS_all", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.2, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "idle_once_lookaround", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.2, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "idle_once_neckstretch", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.2, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "idle_once_lookleftright", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.2, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "idle_once_fidget", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": 0.2, "resume": false, "transitions": [ @@ -1827,7 +1884,8 @@ "endFrame": 80, "loopFlag": false, "startFrame": 1, - "timeScale": 1, + "startFrameVar": "", + "timeScale": 0.65, "url": "qrc:///avatar/animations/idle_LFF_all.fbx" }, "id": "transitionToAltIdle1", @@ -1840,7 +1898,7 @@ "endFrame": 80, "loopFlag": false, "startFrame": 1, - "timeScale": 1, + "timeScale": 0.65, "url": "qrc:///avatar/animations/idle_RFF_all.fbx" }, "id": "transitionToAltIdle2", @@ -1850,7 +1908,7 @@ "children": [ ], "data": { - "endFrame": 389, + "endFrame": 388, "loopFlag": true, "startFrame": 80, "timeScale": 1, @@ -1863,7 +1921,7 @@ "children": [ ], "data": { - "endFrame": 390, + "endFrame": 388, "loopFlag": true, "startFrame": 80, "timeScale": 1, @@ -1878,7 +1936,7 @@ "data": { "endFrame": 472, "loopFlag": false, - "startFrame": 389, + "startFrame": 388, "timeScale": 1, "url": "qrc:///avatar/animations/idle_LFF_all.fbx" }, @@ -1891,7 +1949,7 @@ "data": { "endFrame": 453, "loopFlag": false, - "startFrame": 390, + "startFrame": 388, "timeScale": 1, "url": "qrc:///avatar/animations/idle_RFF_all.fbx" }, @@ -1903,9 +1961,11 @@ "currentState": "transitionToAltIdle1", "states": [ { + "easingType": "easeInOutQuad", "id": "transitionToAltIdle1", - "interpDuration": 10, - "interpTarget": 11, + "interpDuration": 20, + "interpTarget": 20, + "interpType": "evaluateBoth", "priority": 0.5, "resume": false, "transitions": [ @@ -1916,9 +1976,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "transitionToAltIdle2", - "interpDuration": 10, - "interpTarget": 11, + "interpDuration": 20, + "interpTarget": 20, + "interpType": "evaluateBoth", "priority": 0.5, "resume": false, "transitions": [ @@ -1929,9 +1991,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "altIdle1", - "interpDuration": 10, - "interpTarget": 11, + "interpDuration": 1, + "interpTarget": 1, + "interpType": "evaluateBoth", "priority": -1, "resume": false, "transitions": [ @@ -1942,9 +2006,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "altIdle2", - "interpDuration": 10, - "interpTarget": 11, + "interpDuration": 1, + "interpTarget": 1, + "interpType": "evaluateBoth", "priority": -1, "resume": false, "transitions": [ @@ -1955,18 +2021,22 @@ ] }, { + "easingType": "easeInOutQuad", "id": "alt1ToMasterIdle", - "interpDuration": 10, - "interpTarget": 11, + "interpDuration": 24, + "interpTarget": 24, + "interpType": "evaluateBoth", "priority": -1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "alt2ToMasterIdle", - "interpDuration": 10, - "interpTarget": 11, + "interpDuration": 24, + "interpTarget": 24, + "interpType": "evaluateBoth", "priority": -1, "resume": false, "transitions": [ @@ -1985,18 +2055,22 @@ "currentState": "movement", "states": [ { + "easingType": "easeInOutQuad", "id": "movement", - "interpDuration": 15, - "interpTarget": 17, + "interpDuration": 30, + "interpTarget": 30, + "interpType": "evaluateBoth", "priority": 0.6, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "alternateIdle", - "interpDuration": 15, - "interpTarget": 17, + "interpDuration": 30, + "interpTarget": 30, + "interpType": "evaluateBoth", "priority": 0.4, "resume": false, "transitions": [ @@ -2012,9 +2086,11 @@ "currentState": "masterIdle", "states": [ { + "easingType": "easeInOutQuad", "id": "masterIdle", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 30, + "interpTarget": 30, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ @@ -2025,9 +2101,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "fidget", - "interpDuration": 20, - "interpTarget": 21, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "priority": -1, "resume": false, "transitions": [ @@ -2164,45 +2242,55 @@ "randomSwitchTimeMin": 1, "states": [ { + "easingType": "easeInOutQuad", "id": "positiveAcknowledge", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "positiveHeadNod", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "positiveHeadNodYes", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "positiveLongHeadNod", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "positiveThoughtfulHeadNod", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 0.33, "resume": false, "transitions": [ @@ -2262,27 +2350,33 @@ "randomSwitchTimeMin": 1, "states": [ { + "easingType": "easeInOutQuad", "id": "negativeAnnoyedHeadshake", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "negativeThoughtfulHeadshake", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "negativeDropHead", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ @@ -2584,27 +2678,33 @@ "randomSwitchTimeMin": 1, "states": [ { + "easingType": "easeInOutQuad", "id": "raiseHand01", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "raiseHand03", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "raiseHand04", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ @@ -2909,27 +3009,33 @@ "randomSwitchTimeMin": 1, "states": [ { + "easingType": "easeInOutQuad", "id": "applaudClap01", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "applaudClap02", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ ] }, { + "easingType": "easeInOutQuad", "id": "applaudClap03", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 1, "resume": false, "transitions": [ @@ -3016,9 +3122,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "reactionPointOutro", - "interpDuration": 1, - "interpTarget": 1, + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "priority": 0, "resume": false, "transitions": [ @@ -3068,10 +3176,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "reactionPositive", - "interpDuration": 6, - "interpTarget": 6, - "interpType": "snapshotPrev", + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "transitions": [ { "state": "idleTalkOverlay", @@ -3112,10 +3221,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "reactionNegative", - "interpDuration": 6, - "interpTarget": 6, - "interpType": "snapshotPrev", + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "transitions": [ { "state": "reactionPositive", @@ -3148,10 +3258,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "reactionRaiseHand", - "interpDuration": 6, - "interpTarget": 6, - "interpType": "snapshotPrev", + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "transitions": [ { "state": "reactionNegative", @@ -3176,10 +3287,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "reactionApplaud", - "interpDuration": 6, - "interpTarget": 6, - "interpType": "snapshotPrev", + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "transitions": [ { "state": "reactionNegative", @@ -3204,10 +3316,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "reactionPoint", - "interpDuration": 6, - "interpTarget": 6, - "interpType": "snapshotPrev", + "interpDuration": 18, + "interpTarget": 18, + "interpType": "evaluateBoth", "transitions": [ { "state": "reactionNegative", @@ -3945,10 +4058,11 @@ ], "states": [ { + "easingType": "easeInOutQuad", "id": "seated", - "interpDuration": 8, + "interpDuration": 18, "interpTarget": 20, - "interpType": "snapshotPrev", + "interpType": "evaluateBoth", "transitions": [ { "state": "idle", @@ -4009,10 +4123,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "idle", - "interpDuration": 8, - "interpTarget": 20, - "interpType": "snapshotPrev", + "interpDuration": 30, + "interpTarget": 30, + "interpType": "evaluateBoth", "transitions": [ { "state": "WALKFWD", @@ -4140,10 +4255,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "idleSettle", - "interpDuration": 8, - "interpTarget": 15, - "interpType": "snapshotPrev", + "interpDuration": 12, + "interpTarget": 12, + "interpType": "evaluateBoth", "transitions": [ { "state": "idle", @@ -4464,9 +4580,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "turnRight", - "interpDuration": 8, - "interpTarget": 8, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "transitions": [ { "state": "idle", @@ -4527,9 +4645,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "turnLeft", - "interpDuration": 8, - "interpTarget": 8, + "interpDuration": 15, + "interpTarget": 15, + "interpType": "evaluateBoth", "transitions": [ { "state": "idle", @@ -4718,9 +4838,11 @@ ] }, { + "easingType": "easeInOutQuad", "id": "fly", - "interpDuration": 6, - "interpTarget": 6, + "interpDuration": 24, + "interpTarget": 24, + "interpType": "evaluateBoth", "transitions": [ { "state": "idleSettle", diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index ad45df892b..bb6f036533 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -1866,6 +1866,9 @@ public: // also clears internal reaction triggers void updateRigControllerParameters(Rig::ControllerParameters& params); + // Don't substitute verify-fail: + virtual const QUrl& getSkeletonModelURL() const override { return _skeletonModelURL; } + public slots: /**jsdoc diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp index 5af7a357b0..c449874117 100644 --- a/interface/src/commerce/Wallet.cpp +++ b/interface/src/commerce/Wallet.cpp @@ -830,9 +830,14 @@ void Wallet::handleChallengeOwnershipPacket(QSharedPointer pack } void Wallet::sendChallengeOwnershipResponses() { - if (_pendingChallenges.size() == 0 || getSalt().length() == 0) { + if (_pendingChallenges.size() == 0) { return; } + if (getSalt().length() == 0) { + qCDebug(commerce) << "Not responding to ownership challenge due to missing Wallet salt"; + return; + } + auto nodeList = DependencyManager::get(); EC_KEY* ec = readKeys(keyFilePath()); diff --git a/launchers/darwin/src/Interface.m b/launchers/darwin/src/Interface.m index d02b66b581..8dc5d00806 100644 --- a/launchers/darwin/src/Interface.m +++ b/launchers/darwin/src/Interface.m @@ -33,10 +33,11 @@ return 0; } - NSFileHandle * fh = [standardOut fileHandleForReading]; - NSData * data = [fh readDataToEndOfFile]; - NSString * output = [NSString stringWithUTF8String:[data bytes]]; - if (output == nil) { + NSFileHandle* fh = [standardOut fileHandleForReading]; + NSData* data = [fh readDataToEndOfFile]; + + NSString* output = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; + if (output == nil || [output length] == 0) { NSDictionary * userInfo = @{ NSLocalizedDescriptionKey: NSLocalizedString(@"Couldn't start interface", nil) }; diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp index a7e4a0ae9f..9d88dd47ea 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp +++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp @@ -1511,7 +1511,7 @@ void Avatar::setSkeletonModelURL(const QUrl& skeletonModelURL) { } indicateLoadingStatus(LoadingStatus::LoadModel); - _skeletonModel->setURL(_skeletonModelURL); + _skeletonModel->setURL(getSkeletonModelURL()); } void Avatar::setModelURLFinished(bool success) { diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 7d5f38db40..c03f9430be 100755 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -1988,7 +1988,11 @@ void AvatarData::processAvatarIdentity(QDataStream& packetStream, bool& identity if (flagValue != _verificationFailed) { _verificationFailed = flagValue; identityChanged = true; - } + setSkeletonModelURL(_skeletonModelURL); + if (_verificationFailed) { + qCDebug(avatars) << "Avatar" << getSessionDisplayName() << "marked as VERIFY-FAILED"; + } + }; if (identity.attachmentData != _attachmentData) { setAttachmentData(identity.attachmentData); @@ -2016,6 +2020,18 @@ QUrl AvatarData::getWireSafeSkeletonModelURL() const { 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 { // Send an avatar trait packet with the skeleton data before the mesh is loaded int avatarDataSize = 0; diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 20c5b1900d..59a2e2a53e 100755 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -1205,7 +1205,7 @@ public: QByteArray identityByteArray(bool setIsReplicated = false) const; QUrl getWireSafeSkeletonModelURL() const; - const QUrl& getSkeletonModelURL() const { return _skeletonModelURL; } + virtual const QUrl& getSkeletonModelURL() const; const QString& getDisplayName() const { return _displayName; } const QString& getSessionDisplayName() const { return _sessionDisplayName; } diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index 0c7054424f..d0b315b524 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -330,10 +330,6 @@ void AvatarHashMap::processAvatarIdentityPacket(QSharedPointer bool displayNameChanged = false; // In this case, the "sendingNode" is the Avatar Mixer. 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); } } diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl index 3796bab632..451ed4d01a 100644 --- a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl +++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl @@ -239,7 +239,7 @@ - + + } ?> + +
Type: + @@ -63,7 +66,7 @@ var self = this; - +
Type: