search

StrataSource / FGD

The FGD + Hammer resource files for games built on Strata Source.
20 stars 15 forks source link

Merge in latest changes from HammerAddons #93

Closed vrad-exe closed 2 years ago

vrad-exe commented 2 years ago

That was a lot of merge conflicts, but it's done. I made sure the FGD is able to build successfully, and also went through and cleaned up stuff from other games which isn't relevant to Chaos. This closes #92.

Gocnak commented 2 years ago

Ok hold on, are like half of these already in the codebase? You could maybe try rebasing instead in another test branch, it should knock out a lot of the duplicate commits and therefore merge conflicts. A merge isn't what we want to do here.

Brae's approach ( #24 ) was to cherry pick, which is another approach as well, just depends on the commits you actually want to pull in.

braem commented 2 years ago

Superceded by https://github.com/ChaosInitiative/Chaos-FGD/pull/130