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

D2k extended upgradetooltips #12547

Merged
merged 4 commits into from Jan 8, 2017
Merged

Conversation

ltem
Copy link
Contributor

@ltem ltem commented Jan 5, 2017

PR for #12069

Quite simple changes to the d2k yaml-files.

I added also a small fix for the combat tank tooltip:

Before Now
openra-2017-01-05t221338150z openra-2017-01-05t214147078z

If unwanted it will be deleted.

@@ -23,6 +23,8 @@ concretea:
Building:
Footprint: xx xx
Dimensions: 2,2
Tooltip:
Name: Concret Slab
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing an 'e' here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed it by changing the file and using git rebase -i HEAD~3 pick -> fixup command.
Is there a better way?

@ltem ltem force-pushed the d2k-extended-upgradetooltips branch from 0abfa85 to 7b674cd Compare January 5, 2017 22:43
@ltem
Copy link
Contributor Author

ltem commented Jan 6, 2017

Don't merge - Additional changes possible
(IX Research Centre -> IX Research Center to have it consistently in US English)

@ltem ltem force-pushed the d2k-extended-upgradetooltips branch from 7b674cd to f6e865d Compare January 6, 2017 19:57
@ltem
Copy link
Contributor Author

ltem commented Jan 6, 2017

uaaah sorry I will try to fix this :S
EDIT: I don't know how but I added several commits from other contributes to this PR (~1300 line changes) but now it is back to normal

@ltem ltem force-pushed the d2k-extended-upgradetooltips branch from f6e865d to 2189882 Compare January 6, 2017 20:00
Copy link
Contributor

@reaperrr reaperrr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Contributor

@GraionDilach GraionDilach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 after the nit addressed.

@@ -259,7 +259,7 @@ upgrade.heavy:
BuildLimit: 1
BuildDuration: 380
BuildDurationModifier: 40
Description: Unlocks advanced technology and heavy weapons
Description: Unlocks additional construction options \n(Repair Pad, IX Research Centre) \n\nUnlocks additional heavy units \n(Siege Tank, Missile Tank, MCV)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still Centre.

@ltem ltem force-pushed the d2k-extended-upgradetooltips branch from 2189882 to b1a1464 Compare January 8, 2017 15:05
@ltem
Copy link
Contributor Author

ltem commented Jan 8, 2017

nit fixed

@reaperrr reaperrr merged commit e4f6fad into OpenRA:bleed Jan 8, 2017
@reaperrr
Copy link
Contributor

reaperrr commented Jan 8, 2017

Thanks!

changelog

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

Successfully merging this pull request may close these issues.

None yet

5 participants