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

Counterstrike Soviet mission Top o' The World ported #16167

Merged
merged 1 commit into from Mar 28, 2019

Conversation

AngryBirdz
Copy link
Contributor

@AngryBirdz AngryBirdz commented Feb 4, 2019

I've just finished porting this mission. Tell me if you spot something wrong ;)

Updated: I've fixed the rebase issues.

@pchote
Copy link
Member

pchote commented Feb 4, 2019

Looks like some rebase issues have crept into the commits here. You'll need to edit the files to remove the <<<<<<< HEAD through >>>>>>> top-o-the-world lines, and pick the right version of the code in between.

@AngryBirdz
Copy link
Contributor Author

Fixed

@pchote
Copy link
Member

pchote commented Mar 9, 2019

Can we get some testing and reviewing here?

Copy link
Member

@abcdefg30 abcdefg30 left a comment

Choose a reason for hiding this comment

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

Looks good to me otherwise.

mods/ra/maps/top-o-the-world/rules.yaml Outdated Show resolved Hide resolved
mods/ra/maps/top-o-the-world/scu36ea.lua Outdated Show resolved Hide resolved
mods/ra/maps/top-o-the-world/scu36ea.lua Outdated Show resolved Hide resolved
mods/ra/maps/top-o-the-world/scu36ea.lua Outdated Show resolved Hide resolved
mods/ra/maps/top-o-the-world/scu36ea.lua Outdated Show resolved Hide resolved
mods/ra/maps/top-o-the-world/scu36ea.lua Outdated Show resolved Hide resolved
I've just finished porting this mission. Tell me if you spot something wrong ;)

Update: Fixed a few things in the lua and rules.
Copy link
Contributor

@obrakmann obrakmann left a comment

Choose a reason for hiding this comment

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

Mission looks good, 👍


Tick = function()

-- Timer Setup
Copy link
Contributor

Choose a reason for hiding this comment

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

This would have been the perfect use case for my time limit PR. Oh well.

Copy link
Member

Choose a reason for hiding this comment

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

Do you want to update this in your PR?

Copy link
Contributor

Choose a reason for hiding this comment

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

I could rebase it now and do it, yes.

@obrakmann obrakmann merged commit 19977bb into OpenRA:bleed Mar 28, 2019
@obrakmann
Copy link
Contributor

Changelog

@obrakmann obrakmann mentioned this pull request Mar 28, 2019
8 tasks
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

6 participants