Fix variables tab in level editor #1289
Merged
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
Fixes variables tab to only show conflicts between the current file and its dependencies/dependants, and only apply fixes by modifying the current file instead of attempting to change every other file that conflicts with it. This also hopefully fixes the resolve conflicts button breaking levels, since the resolving conflicts logic is simpler and makes sense now.
…x some dependencies for tilecode suggestions.
1. The same tilename can be in the dependency with a different code, so this allows that tile to be cleared from the dependency anyway. 2. Two dependencies can have different tiles with the same code. This is not necessarily a conflict, as they may not depend on each other. When selecting one of these tiles, a new code will be assigned to avoid conflicts.
gmjosack
approved these changes
Dec 17, 2024
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.
Fixes variables tab to only show conflicts between the current file and its dependencies/dependants, and only apply fixes by modifying the current file instead of attempting to change every other file that conflicts with it.
This also hopefully fixes the resolve conflicts button breaking levels, since the resolving conflicts logic is simpler and makes sense now.
Some other changes are also included which help avoid conflicts being introduced in the first place, or fix related logic.