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

Fixes issue #2216 [Feature Request] #68

Closed
wants to merge 1,000 commits into from
Closed

Fixes issue #2216 [Feature Request] #68

wants to merge 1,000 commits into from

Conversation

baxtor
Copy link

@baxtor baxtor commented May 25, 2013

"InstallShield setup.z extractor fails for Dune 2000"
Reverse engineered pascal code from "STIX", adjusted only a few line of code.
The blast implementation of OpenRA works perfectly with it.
Filename hashing should be removed 'cause of duplicate filenames in nested folders.

EDIT: please only merge "InstallShieldPackage.cs" I'm new to git. Maybe i'll create a concrete branch
for fixes.

pchote and others added 30 commits April 27, 2013 03:05
Give the mechanic a wrench cursor icon instead of red-cross
Start moving towards saner RA widget logic
New Colorpicker with graphical mixer
Undock harvesters when refinery is destroyed
used for both Volkov and Stavros
Removed duplicate e8.shp and documented the Dune II SHP converter
Unsafe code requires the `unsafe' command line option to be specified
the not yet merged asset browser slipped through, sorry
to check if we can still compile with MonoDevelop/Visual Studio
…ionUtils infil trait. Create cameras in missions to let enemy units attack properly
infantry was complained as being too fast. Agreed.
They are a bit fast, and the game is a bit fast.
building >1 production buildings is bogus as it has no benefit
generic names that describe the build order not fake personality
Right now they're too easily bogged down by infantry. 

Bazookas remain a strong counter for tanks.
Very OP and make the game too static/ stalemated.
To avoid the possibility of it being OP, reducing Hark. combat tank to 440, which divides into 11 tank shots.
reaperrr and others added 14 commits May 20, 2013 02:14
- westwood never bothered converting the wood crate to RA's palette. I did.
- shadows added to both wood crate and silver crate.
It always annoyed me that the CY had no shadow at all. This adds some at the edges.
…actor fails for Dune 2000"

Reverse engineered pascal code from "STIX", adjusted only a few line of code. 
The blast implementation of OpenRA works perfectly with it. 
Filename hashing should be removed 'cause of duplicate filenames in nested folders.
@Mailaender
Copy link
Contributor

Needs a git rebase see http://learn.github.com/p/rebasing.html and please send it towards https://github.com/OpenRA/OpenRA (bleed branch).

@baxtor
Copy link
Author

baxtor commented May 25, 2013

Hi Matthias,

thanx for the info. To me it's a little bit messy with the tutorial video. I'd rebased my bleed branch and only want to push changes to that file to your top repo. Any quick guidelines to commit quickly without long book readings ?

Greetings
Andreas

Von meinem iPhone gesendet

Am 25.05.2013 um 12:23 schrieb Matthias Mailänder notifications@github.com:

Needs a git rebase see http://learn.github.com/p/rebasing.html and please send it towards https://github.com/OpenRA/OpenRA


Reply to this email directly or view it on GitHub.

@Mailaender
Copy link
Contributor

We just merged a patch from @pchote which refactors the way the virtual filesystem works so you definitely have to fetch the latest openra/bleed branch and rebase your changes onto it.

git fetch openra assuming you called git@github.com:OpenRA/OpenRA.git that way
git checkout bleed your local bleed repository
git rebase -i openra/bleed gives you a little more control
There will be merge conflicts. Search for <<< and keep what you like / adapt your code.
git rebase --continue
git push+ origin bleed force push to overwrite history (non-fast-forward)

You might want to join #openra on FreeNode IRC for live help.

@baxtor
Copy link
Author

baxtor commented May 25, 2013

I'll check that out. So console is already your best friend, thought that GUI clients can work this out ;).
Thanks for spending your time with me.

Best wishes
Andreas

Von meinem iPhone gesendet

Am 25.05.2013 um 14:41 schrieb Matthias Mailänder notifications@github.com:

We just merged a patch from @pchote which refactors the way the virtual filesystem works so you definitely have to fetch the latest openra/bleed branch and rebase your changes onto it.

git fetch openra assuming you called git@github.com:OpenRA/OpenRA.git that way
git checkout bleed your local bleed repository
git rebase -i openra/bleed gives you a little more control
There will be merge conflicts. Search for <<< and keep what you like / adapt your code.
git rebase --continue
git push+ origin bleed force push to overwrite history (non-fast-forward)

Click https://github.com/OpenRA/OpenRA/pull/new/bleed


Reply to this email directly or view it on GitHub.

baxtor and others added 7 commits May 26, 2013 12:46
# The first commit's message is:

Fixes issue OpenRA#2216 [Feature Request] "InstallShield setup.z extractor fails for Dune 2000"
Reverse engineered pascal code from "STIX", adjusted only a few line of code.
The blast implementation of OpenRA works perfectly with it.
Filename hashing should be removed 'cause of duplicate filenames in nested folders.

# This is the 2nd commit message:

added name to AUTHORS
@baxtor
Copy link
Author

baxtor commented May 26, 2013

@Mailaender Yeah, think i've lost the thread o_O
git said that I'm successfully rebased the bleed. Am I up to date ?

@Mailaender
Copy link
Contributor

Not sure, only @chrisforbes has access to this repository. Try an interactive rebase to clean up and then submit https://github.com/OpenRA/OpenRA/pulls so I can review it.

@Mailaender
Copy link
Contributor

Superseded by OpenRA#3342

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