Merge pull request #15728 from hyperlogic/bug-fix/adjust-run-fwd-animations

Adjust run and jog anims to better align head with 1p camera
This commit is contained in:
Andrew Meadows 2019-06-10 17:37:33 -07:00 committed by GitHub
commit 250a4490d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View file

@ -1463,7 +1463,7 @@
"data": { "data": {
"alpha": 0.0, "alpha": 0.0,
"desiredSpeed": 1.4, "desiredSpeed": 1.4,
"characteristicSpeeds": [0.5, 1.8, 2.3, 3.2, 4.5], "characteristicSpeeds": [0.5, 1.8, 2.3, 3.0, 5.0],
"alphaVar": "moveForwardAlpha", "alphaVar": "moveForwardAlpha",
"desiredSpeedVar": "moveForwardSpeed" "desiredSpeedVar": "moveForwardSpeed"
}, },
@ -1509,8 +1509,8 @@
"type": "clip", "type": "clip",
"data": { "data": {
"url": "qrc:///avatar/animations/jog_fwd.fbx", "url": "qrc:///avatar/animations/jog_fwd.fbx",
"startFrame": 0.0, "startFrame": 1.0,
"endFrame": 25.0, "endFrame": 22.0,
"timeScale": 1.0, "timeScale": 1.0,
"loopFlag": true "loopFlag": true
}, },
@ -1522,7 +1522,7 @@
"data": { "data": {
"url": "qrc:///avatar/animations/run_fwd.fbx", "url": "qrc:///avatar/animations/run_fwd.fbx",
"startFrame": 1.0, "startFrame": 1.0,
"endFrame": 22.0, "endFrame": 23.0,
"timeScale": 1.0, "timeScale": 1.0,
"loopFlag": true "loopFlag": true
}, },
@ -2099,4 +2099,4 @@
} }
] ]
} }
} }