search

overbound / SonicTimeTwisted

Source Code for a Sonic Fan Game Made in Game Maker Studio
https://overboundstudio.com/
GNU General Public License v3.0
60 stars 16 forks source link

Fold origin/rebuild into release/1.1 #79

Closed VectorSatyr closed 4 years ago

VectorSatyr commented 4 years ago

This will focus all development efforts into a single code base and prevent fragmentation of changes.

nkrapivin commented 4 years ago

Maybe redo all the rebuild changes manually instead of trying to fix merge conflicts?

nkrapivin commented 4 years ago

https://github.com/nkrapivin/SonicTimeTwisted/commit/c1cdb2b7fc58243586714f2a3c4dbbfb4214deba

I can make a PR.

VectorSatyr commented 4 years ago

@nkrapivin That's okay. Just let me handle things from here.

VectorSatyr commented 4 years ago

Not finished yet. Still resolving conflicts.

VectorSatyr commented 4 years ago

Something went wrong during the commit, so I've reverted it. I will attempt something else.

VectorSatyr commented 4 years ago

@nkrapivin I've decided that your fork of the build will probably work better for this. Have at it.