search

blackhandcommando / openrabhc

This is BlackHand-Community OpenRa-Red Alert project for balancing the game into a different direction.
http:www.blackhandcommando.de
2 stars 2 forks source link

Merge changes from offical ra into rabhc #3

Closed dedmen closed 7 years ago

dedmen commented 7 years ago

Since rabhc split from ra to go it's own route we also need to integrate atleast some of the fixes done on the offical ra mod. See ra history here: https://github.com/OpenRA/OpenRA/commits/bleed/mods/ra

Especially

blackhandcommando commented 7 years ago

I think at this point we need to make a decision for future adaption of official builds.

There is no problem to merge the changes between playtest/stable version, but it will be a regular job to check for (important) changes. Im not sure if we should pick up all/some merges or wait till the next playtest/stable version and merge our changes into it.

Someone got an opinion on that one?

dedmen commented 7 years ago

Waiting to the next playtest if ofcause easier. But we would still need to compare all the files and merge their changes into ours. I'd say it would be easier to work of these alread done commits as they show us exactly what line has changed where. We basically already have the diff's and don't need to make them ourselves at the next playtest.

dedmen commented 7 years ago

So the new Playtest is now released. https://github.com/OpenRA/OpenRA/wiki/Changelog#red-alert Here is a list of stuff that was changed. That we may merge into rabhc.

dedmen commented 7 years ago

So as I've heard we will do a full merge between newest playtest and our changes? I can do that if you want. according to https://github.com/OpenRA/OpenRA/wiki/Changelog#red-alert that's only 5 things to be merged

https://github.com/OpenRA/OpenRA/commits/master/mods/ra everything since 31 Mar.

dedmen commented 7 years ago

This is solved with #10