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

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.

@AngryBirdz AngryBirdz force-pushed the AngryBirdz:top-o-the-world branch from bf87759 to a3cb075 Feb 4, 2019

@pchote

This comment has been minimized.

Copy link
Member

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 AngryBirdz force-pushed the AngryBirdz:top-o-the-world branch from a3cb075 to d388aca Feb 4, 2019

@AngryBirdz

This comment has been minimized.

Copy link
Contributor Author

commented Feb 5, 2019

Fixed

@AngryBirdz AngryBirdz force-pushed the AngryBirdz:top-o-the-world branch from d388aca to 9692760 Feb 7, 2019

@reaperrr reaperrr added this to the Next + 1 milestone Mar 7, 2019

@pchote

This comment has been minimized.

Copy link
Member

commented Mar 9, 2019

Can we get some testing and reviewing here?

@abcdefg30
Copy link
Member

left a comment

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
Counterstrike Soviet mission Top o' The World ported
I've just finished porting this mission. Tell me if you spot something wrong ;)

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

@AngryBirdz AngryBirdz force-pushed the AngryBirdz:top-o-the-world branch from 9692760 to 7504e0b Mar 17, 2019

@obrakmann
Copy link
Contributor

left a comment

Mission looks good, 👍


Tick = function()

-- Timer Setup

This comment has been minimized.

Copy link
@obrakmann

obrakmann Mar 28, 2019

Contributor

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

This comment has been minimized.

Copy link
@pchote

pchote Mar 28, 2019

Member

Do you want to update this in your PR?

This comment has been minimized.

Copy link
@obrakmann

obrakmann Mar 28, 2019

Contributor

I could rebase it now and do it, yes.

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

2 checks passed

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

This comment has been minimized.

Copy link
Contributor

commented Mar 28, 2019

@obrakmann obrakmann referenced this pull request Mar 28, 2019
7 of 8 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.