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

Merge Hijacker into Thief #15875

Merged
merged 1 commit into from Dec 7, 2018

Conversation

Projects
None yet
4 participants
@Smittytron
Copy link
Contributor

Smittytron commented Dec 2, 2018

As discussed on IRC and forums, this merges the abilities of the hijacker into the thief.

There is still a hijacker.shp in mods/ra/bits, and I am unsure if that needs to be (or can be) renamed.

@Smittytron Smittytron force-pushed the Smittytron:thief branch from dd51296 to 3bd9cb8 Dec 2, 2018

@pchote pchote added this to the Next Release milestone Dec 3, 2018

@abcdefg30
Copy link
Member

abcdefg30 left a comment

What is the hijacker shp for? If it is just the icon we can remove it, I guess. (Seems like the hijacker sequence definition used the thf shp anyway?)

Show resolved Hide resolved mods/ra/rules/disable-player-experience.yaml Outdated

@Smittytron Smittytron force-pushed the Smittytron:thief branch from 3bd9cb8 to 782e213 Dec 5, 2018

@Smittytron

This comment has been minimized.

Copy link
Contributor

Smittytron commented Dec 5, 2018

Looks like it was just the icon. Removed it.

@pchote

pchote approved these changes Dec 5, 2018

@pchote pchote added the PR: Needs +2 label Dec 5, 2018

@MustaphaTR
Copy link
Member

MustaphaTR left a comment

Looks good to me. 👍

@MustaphaTR MustaphaTR merged commit 72923b9 into OpenRA:bleed Dec 7, 2018

2 checks passed

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

This comment has been minimized.

Copy link
Member

MustaphaTR commented Dec 7, 2018

@Smittytron Smittytron deleted the Smittytron:thief branch Dec 9, 2018

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