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 - Add Harkonnen 9b #14434

Merged
merged 2 commits into from Dec 30, 2017

Conversation

Projects
None yet
5 participants
@MustaphaTR
Member

MustaphaTR commented Nov 27, 2017

Depends on #14433. Player starts with no MCV/ConYard in this mission and should build one. You need Heavy Factory Upgrade to build an MCV.

I didn't make seperate Smuggler vs Atreides and Smuggler vs Corrino sides, because that would require 8 different smuggler players.

Also fixes a small issue on Har6a and b.

Closes #14392.

@reaperrr reaperrr referenced this pull request Nov 27, 2017

Closed

Get the remaining Harkonnen missions into the playtest #14392

5 of 5 tasks complete

@penev92 penev92 referenced this pull request Nov 27, 2017

Open

Add Dune 2000 campaign #9287

@pchote pchote added this to the Next release milestone Dec 9, 2017

@pchote

This comment has been minimized.

Show comment
Hide comment
@pchote

pchote Dec 18, 2017

Member

#14433 has been merged.

Member

pchote commented Dec 18, 2017

#14433 has been merged.

@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Dec 18, 2017

Member

Rebased.

Member

MustaphaTR commented Dec 18, 2017

Rebased.

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Dec 21, 2017

Contributor

Needs rebase.

Contributor

reaperrr commented Dec 21, 2017

Needs rebase.

@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Dec 22, 2017

Member

Rebased.

Member

MustaphaTR commented Dec 22, 2017

Rebased.

@ltem ltem added PR: Rebase me! and removed PR: Rebase me! labels Dec 22, 2017

@ltem

This comment has been minimized.

Show comment
Hide comment
@ltem

ltem Dec 22, 2017

Contributor

Needs a rebase.

Contributor

ltem commented Dec 22, 2017

Needs a rebase.

@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Dec 22, 2017

Member

Rebased.

Member

MustaphaTR commented Dec 22, 2017

Rebased.

@ltem

This comment has been minimized.

Show comment
Hide comment
@ltem

ltem Dec 23, 2017

Contributor

Except the comment above I didn't find any issues so 👍 from me after fixing it.

Contributor

ltem commented Dec 23, 2017

Except the comment above I didn't find any issues so 👍 from me after fixing it.

@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Dec 24, 2017

Member

Updated. Also removed some stuff related to #14459 from 9a and 9b.

Member

MustaphaTR commented Dec 24, 2017

Updated. Also removed some stuff related to #14459 from 9a and 9b.

@ltem

This comment has been minimized.

Show comment
Hide comment
@ltem

ltem Dec 30, 2017

Contributor

No issues found after the small update. Needs a rebase. Afterwards 👍 from me.

Contributor

ltem commented Dec 30, 2017

No issues found after the small update. Needs a rebase. Afterwards 👍 from me.

@ltem ltem added the PR: Rebase me! label Dec 30, 2017

@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Dec 30, 2017

Contributor

Same here 👍

Contributor

reaperrr commented Dec 30, 2017

Same here 👍

@reaperrr reaperrr merged commit 1aa57cd into OpenRA:bleed Dec 30, 2017

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.

Show comment
Hide comment
@reaperrr

reaperrr Dec 30, 2017

Contributor

I've decided to rebase this myself so we could get it merged now.

changelog

Contributor

reaperrr commented Dec 30, 2017

I've decided to rebase this myself so we could get it merged now.

changelog

@MustaphaTR MustaphaTR deleted the MustaphaTR:d2k-harkonnen-9b branch Dec 31, 2017

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