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

Fix Railgun crash and minor projectile optimizations #16536

Merged
merged 2 commits into from May 19, 2019

Conversation

@reaperrr
Copy link
Contributor

commented May 12, 2019

Fixes #16477 and does some minor perf/style/clean-up optimizations on several other projectiles.

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented May 12, 2019

From IRC:

[01:10] <+pchote> reaperrr: can you put the sync attributes on their own line to reduce rebase conflicts with my stylecop pr?

@reaperrr reaperrr force-pushed the reaperrr:projectile-perf branch from e337edf to 561ac75 May 14, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented May 14, 2019

Updated.

[01:10] <+pchote> reaperrr: can you put the sync attributes on their own line to reduce rebase conflicts with my stylecop pr?

To be honest, as far as I can tell in most places that would either have been counterproductive (in lines that auto-resolve should be able to handle), or wouldn't help (lines that would still conflict for different reasons, like inserted empty lines or removed [Sync] attribute etc.).

If you think there are more places that would really not conflict anymore if I updated them, please point them out.

@pchote

This comment has been minimized.

Copy link
Member

commented May 14, 2019

I was thinking more that I could then drop these files completely from #16532 and make that PR depend on this one.

@reaperrr reaperrr force-pushed the reaperrr:projectile-perf branch from 561ac75 to 8a152c2 May 14, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented May 14, 2019

OK, updated.

@pchote
pchote approved these changes May 16, 2019

@pchote pchote added the PR: Needs +2 label May 16, 2019

@reaperrr reaperrr merged commit a2775a5 into OpenRA:bleed May 19, 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
3 participants
You can’t perform that action at this time.