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

Prevent units in tunnels/underground from attacking #12924

Merged
merged 1 commit into from Apr 29, 2017

Conversation

Projects
None yet
6 participants
@reaperrr
Contributor

reaperrr commented Mar 6, 2017

Fixes #12917.

@reaperrr reaperrr added this to the Tiberian Sun Public Alpha milestone Mar 6, 2017

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Mar 6, 2017

Contributor

Together with #12921, this is probably all I can contribute towards solving the newer TS public alpha blockers (#12911 and later), except reviewing PRs adressing them, of course.

Contributor

reaperrr commented Mar 6, 2017

Together with #12921, this is probably all I can contribute towards solving the newer TS public alpha blockers (#12911 and later), except reviewing PRs adressing them, of course.

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Mar 19, 2017

Contributor

Updated.

Contributor

reaperrr commented Mar 19, 2017

Updated.

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Mar 19, 2017

Contributor

Updated.

Contributor

reaperrr commented Mar 19, 2017

Updated.

@pchote

Looks good overall. See below for couple of minor requests, one major one that might not work, and some rambling:

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Apr 18, 2017

Contributor

Rebased and updated.

I kept the improvements to RejectsOrders, but the actual fix is now something much simpler, Attack*.CanAttack now simply returns false while inside a tunnel layer.

Contributor

reaperrr commented Apr 18, 2017

Rebased and updated.

I kept the improvements to RejectsOrders, but the actual fix is now something much simpler, Attack*.CanAttack now simply returns false while inside a tunnel layer.

@pchote

This comment has been minimized.

Show comment
Hide comment
@pchote

pchote Apr 18, 2017

Member

This also needs to apply for subterranean units.

Member

pchote commented Apr 18, 2017

This also needs to apply for subterranean units.

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Apr 18, 2017

Contributor

Updated, also fixed the style nits I previously forgot to fix.

Contributor

reaperrr commented Apr 18, 2017

Updated, also fixed the style nits I previously forgot to fix.

@reaperrr reaperrr changed the title from Prevent turreted units in tunnels from attacking to Prevent units in tunnels/underground from attacking Apr 18, 2017

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Apr 22, 2017

Contributor

Updated.

Contributor

reaperrr commented Apr 22, 2017

Updated.

@pchote

pchote approved these changes Apr 22, 2017

@pchote pchote added the PR: Needs +2 label Apr 22, 2017

@reaperrr reaperrr referenced this pull request Apr 27, 2017

Merged

Upgrade RejectsOrders #13202

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Apr 27, 2017

Contributor

Updated, split RejectsOrders changes to #13202 as I suspect they might be putting off reviewers from approving this PR.

Contributor

reaperrr commented Apr 27, 2017

Updated, split RejectsOrders changes to #13202 as I suspect they might be putting off reviewers from approving this PR.

@atlimit8 atlimit8 merged commit 4917c6e into OpenRA:bleed Apr 29, 2017

2 checks passed

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

This comment has been minimized.

Show comment
Hide comment
@atlimit8
Member

atlimit8 commented Apr 29, 2017

@reaperrr reaperrr deleted the reaperrr:fix-tunnel-atk branch Jul 23, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment