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 ShakeOnDeath and remove hardcoded screen shaking from bridges #15108

Merged
merged 4 commits into from May 6, 2018

Conversation

Projects
None yet
4 participants
@abcdefg30
Copy link
Member

abcdefg30 commented May 3, 2018

ShakeOnDeath was using the Intensity parameter for the duration all along. Fixed that and introduced a new Duration parameter together with an update rule for this change.

To make use of the new fix, I also removed the screen shaking from Bridge and GroundLevelBridge and made bridge actors use ShakeOnDeath instead. Note that the update rule for this change has a dependency on #15107 or - if this gets merged first - #15107 will need to adjust the rule.

@abcdefg30 abcdefg30 force-pushed the abcdefg30:shakeBridge branch from e03e1e4 to 3b887f2 May 3, 2018

@pchote pchote added this to the Next release milestone May 4, 2018

@abcdefg30 abcdefg30 force-pushed the abcdefg30:shakeBridge branch from 3b887f2 to 011a5b2 May 4, 2018

@reaperrr

This comment has been minimized.

Copy link
Contributor

reaperrr commented May 4, 2018

👍 from me. #15107 was merged, so you can solve the TODO now.

@GraionDilach
Copy link
Contributor

GraionDilach left a comment

👍 so LGTM after the rebase.

@abcdefg30 abcdefg30 force-pushed the abcdefg30:shakeBridge branch from 011a5b2 to 11f9240 May 5, 2018

@abcdefg30

This comment has been minimized.

Copy link
Member Author

abcdefg30 commented May 5, 2018

Rebased & updated.


namespace OpenRA.Mods.Common.UpdateRules.Rules
{
public class ChangeIntensiyToDuration : UpdateRule

This comment has been minimized.

@reaperrr

reaperrr May 5, 2018

Contributor

Intensity (probably copy-paste error)

Filename itself, too!

@@ -578,6 +578,8 @@
<Compile Include="Traits\World\WeatherOverlay.cs" />
<Compile Include="Traits\World\ActorSpawnManager.cs" />
<Compile Include="Traits\ActorSpawner.cs" />
<Compile Include="UpdateRules\Rules\AddShakeToBridge.cs" />
<Compile Include="UpdateRules\Rules\ChangeIntensiyToDuration.cs" />

This comment has been minimized.

@reaperrr

reaperrr May 5, 2018

Contributor

Intensity (probably copy-paste error)

@reaperrr reaperrr force-pushed the abcdefg30:shakeBridge branch from 11f9240 to edebc19 May 6, 2018

@reaperrr reaperrr force-pushed the abcdefg30:shakeBridge branch from edebc19 to 4c06d91 May 6, 2018

@reaperrr

This comment has been minimized.

Copy link
Contributor

reaperrr commented May 6, 2018

The intensity rule was also missing from UpdatePath, but I was bored and decided to fix these myself so we can merge.

@reaperrr reaperrr merged commit c6fee04 into OpenRA:bleed May 6, 2018

2 checks passed

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

@abcdefg30 abcdefg30 deleted the abcdefg30:shakeBridge branch May 6, 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.