Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix WithInfantryBody wrongly overwriting attack animations #18893

Merged
merged 1 commit into from
Dec 6, 2020
Merged

Fix WithInfantryBody wrongly overwriting attack animations #18893

merged 1 commit into from
Dec 6, 2020

Conversation

abcdefg30
Copy link
Member

Closes #17743.

The PlayThen with PlayStandAnimation already takes care of changing the animation again, so we can ignore Tick while attacking.

OpenRA/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs

Lines 144 to 145 in 1a63cc4

state = AnimationState.Attacking;
DefaultAnimation.PlayThen(NormalizeInfantrySequence(self, sequence), () => PlayStandAnimation(self));

@abcdefg30 abcdefg30 added this to the Next Release milestone Dec 5, 2020
@reaperrr reaperrr merged commit 2b363e4 into OpenRA:bleed Dec 6, 2020
@reaperrr
Copy link
Contributor

reaperrr commented Dec 6, 2020

https://github.com/OpenRA/OpenRA/wiki/Changelog-(bleed)/_compare/7f8a16d688eb032bc2aed67b3f6f7ab11c660335...b6ebe6860441a4eec30e1817548b3764764c5395

@abcdefg30 abcdefg30 deleted the animateAttack branch December 7, 2020 09:16
This was referenced Dec 7, 2020
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pchote pchote pchote approved these changes

@reaperrr reaperrr reaperrr approved these changes

Assignees
No one assigned
Labels
PR: Needs +2
Projects
None yet
Milestone
Release 20210321
Development

Successfully merging this pull request may close these issues.

Infantry sometimes omit their first muzzle flash
3 participants
@abcdefg30 @reaperrr @pchote