Merge in latest changes from HammerAddons #93
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This allows converting 0/1 values to proper true/false.
This allows us to ensure all entities get these common keyvalues (rendermode, model, etc). Strip these from individual entities to greatly reduce the size of the dump.
Also switch to use Matrix class for the orientation
NodeEnt.pos needs to be treated as immutable, we can't edit inplace.
Chaos doesn't currently implement these
|
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. |
|
Superceded by #130 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.