Merge pull request #16383 from dooglifeSF/Fix_strafe_pops

Fix glitches when strafing left <-> right.
This commit is contained in:
Anthony Thibault 2019-10-23 08:30:51 -07:00 committed by GitHub
commit 552480a2eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4736,32 +4736,6 @@
},
{
"children": [
{
"children": [
],
"data": {
"endFrame": 30,
"loopFlag": true,
"startFrame": 1,
"timeScale": 1,
"url": "qrc:///avatar/animations/side_step_short_left.fbx"
},
"id": "strafeLeftShortStep_c",
"type": "clip"
},
{
"children": [
],
"data": {
"endFrame": 20,
"loopFlag": true,
"startFrame": 1,
"timeScale": 1,
"url": "qrc:///avatar/animations/side_step_left.fbx"
},
"id": "strafeLeftStep_c",
"type": "clip"
},
{
"children": [
],
@ -4819,8 +4793,6 @@
"alpha": 0,
"alphaVar": "moveLateralAlpha",
"characteristicSpeeds": [
0.1,
0.5,
1,
2.55,
3.35,
@ -4834,34 +4806,6 @@
},
{
"children": [
{
"children": [
],
"data": {
"endFrame": 30,
"loopFlag": true,
"mirrorFlag": true,
"startFrame": 1,
"timeScale": 1,
"url": "qrc:///avatar/animations/side_step_short_left.fbx"
},
"id": "strafeRightShortStep_c",
"type": "clip"
},
{
"children": [
],
"data": {
"endFrame": 20,
"loopFlag": true,
"mirrorFlag": true,
"startFrame": 1,
"timeScale": 1,
"url": "qrc:///avatar/animations/side_step_left.fbx"
},
"id": "strafeRightStep_c",
"type": "clip"
},
{
"children": [
],
@ -4923,8 +4867,6 @@
"alpha": 0,
"alphaVar": "moveLateralAlpha",
"characteristicSpeeds": [
0.1,
0.5,
1,
2.55,
3.4,
@ -5617,7 +5559,7 @@
},
{
"state": "STRAFELEFT",
"var": "isInputLeft"
"var": "isMovingLeft"
},
{
"state": "turnRight",
@ -5681,7 +5623,7 @@
},
{
"state": "STRAFERIGHT",
"var": "isInputRight"
"var": "isMovingRight"
},
{
"state": "turnRight",