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.

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

Replace WithReloadingSpriteTurret with conditions #14845

Merged
merged 2 commits into from Mar 8, 2018

Conversation

Projects
None yet
3 participants
@reaperrr
Copy link
Contributor

reaperrr commented Feb 23, 2018

WithReloadingSpriteTurret would be bound to run into conflicts with any WithTurret*Animation traits sooner or later due to overriding the turret sequence constantly via Tick.
Using (stacked) conditions instead avoids that.

Split from #14036.

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

reaperrr commented Mar 4, 2018

Rebased to fix AppVeyor build failure.

@GraionDilach
Copy link
Contributor

GraionDilach left a comment

👍

reaperrr added some commits Sep 16, 2017

Replace WithReloadingSpriteTurret with conditions
WithReloadingSpriteTurret was bound to run into conflicts with any WithTurret*Animation traits due to overriding the turret sequence constantly via ITick.
Using (stacked) conditions instead avoids that.

@reaperrr reaperrr force-pushed the reaperrr:remove-ReloadingTurret branch from 5f47eb7 to e82206c Mar 8, 2018

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

reaperrr commented Mar 8, 2018

This has a +1 from a known reviewer and I tested this extensively myself, so I'll go ahead an merge it now. If any issues were overlooked, I'll fix them in a follow-up.

@reaperrr reaperrr merged commit 92584c3 into OpenRA:bleed Mar 8, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@reaperrr

This comment has been minimized.

@reaperrr reaperrr deleted the reaperrr:remove-ReloadingTurret branch Mar 9, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.