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

Adds parachute animation to E1,E2,E3,E4,E6,SHOK #15106

Merged
merged 1 commit into from May 4, 2018

Conversation

Projects
None yet
3 participants
@KOYK
Copy link
Contributor

KOYK commented May 3, 2018

Uses conditions without changing the art file. Also my first pr!

I hope I haven done something wrong here. So triple check

If you want to make a quick test on the units, add this DropItems: E1,E2,E3,E4,SHOK,E6
under the paradrop power

1

2

@KOYK KOYK changed the title Adds parachute animation to E1 and E3 Adds parachute animation to E1,E2,E3,E4,E6,SHOK May 3, 2018

@abcdefg30
Copy link
Member

abcdefg30 left a comment

Looks good to me otherwise. 👍 /
Can you squash the commits, please?

@@ -214,6 +230,13 @@ E6:
Cost: 500
Tooltip:
Name: Engineer
WithInfantryBody:
IdleSequences: idle1,idle2
StandSequences: stand,stand2

This comment has been minimized.

@abcdefg30

abcdefg30 May 3, 2018

Member

Why is IdleSequences and StandSequences defined again? Isn't that inherited from ^Soldier?

This comment has been minimized.

@KOYK

KOYK May 3, 2018

Author Contributor

Yes they do defined but in order to use
WithInfantryBody:
IdleSequences: idle1,idle2
StandSequences: stand,stand2
RequiresCondition: !parachute
I had to add it there as well, Otherwise it won't use it at all.

Atleast that was what I found at that moment, but ill test it again and fix it. Thank you for pointing it out man!

@KOYK

This comment has been minimized.

Copy link
Contributor Author

KOYK commented May 3, 2018

hmm I am doing the oposite of squash, damn

Adds parachute animation to E1,E2,E3,E4,E6,SHOK
Uses conditions without changing the art file.

@reaperrr reaperrr force-pushed the KOYK:bleed branch from bec23b0 to 157a6b7 May 4, 2018

@reaperrr

This comment has been minimized.

Copy link
Contributor

reaperrr commented May 4, 2018

If you plan to make more contributions it would be better to learn how to squash soon, but since it's your first PR I didn't want to hold off merging over this, so I squashed it for you.

@reaperrr reaperrr merged commit 36981e9 into OpenRA:bleed May 4, 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.

Copy link
Contributor

reaperrr commented May 4, 2018

Congrats on your first contribution!

changelog

@KOYK

This comment has been minimized.

Copy link
Contributor Author

KOYK commented May 5, 2018

Thank you and thank you again! I will experiment on my github tda page about squashing pr's. Sorry for the inconvenience.

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.