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

Made Resupply canceling more robust #16860

Merged
merged 1 commit into from Aug 8, 2019

Conversation

@reaperrr
Copy link
Contributor

commented Jul 28, 2019

The following improvements are made here:

  • merged and streamlined the two IsCanceling checks in Tick
    into one that covers both isCloseEnough cases
  • isCloseEnough now only checks distance to host.CenterPosition
    if host is still valid and otherwise returns false, fixes #16857, fixes #16830
  • called transports are now also cancelled when host becomes
    invalid, not only if the activity is cancelled via order
  • aircraft now always take off if the host becomes invalid
  • ground actors only try to leave if host is still existing

@reaperrr reaperrr added this to the Next Release milestone Jul 28, 2019

@matjaeck

This comment has been minimized.

Copy link
Contributor

commented Aug 6, 2019

Can confirm the fix for #16857.

@abcdefg30

This comment has been minimized.

Copy link
Member

commented Aug 6, 2019

Needs a rebase though.

@pchote pchote added the PR: Needs +2 label Aug 6, 2019

Made Resupply canceling more robust
The following improvements are made here:
- merged and streamlined the two IsCanceling checks in Tick
  into one that covers both isCloseEnough cases
- isCloseEnough now only checks distance to host
  if host is still valid and otherwise returns 'false'
- called transports are now also cancelled when host becomes
  invalid, not only if the activity is cancelled via order
- aircraft now always take off if the host becomes invalid
- ground actors only try to leave if host is still existing

@reaperrr reaperrr removed the PR: Rebase me! label Aug 6, 2019

@reaperrr reaperrr force-pushed the reaperrr:fix-resupply2 branch from a1ce871 to 52ae91f Aug 6, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Aug 6, 2019

Rebased.

@pchote
pchote approved these changes Aug 6, 2019
@matjaeck
Copy link
Contributor

left a comment

Gave it another testrun and didn't notice any regressions.

@teinarss teinarss merged commit ac3b3db into OpenRA:bleed Aug 8, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.