Merge 1.11 branch #4163
Merged
Merge 1.11 branch #4163
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
A crash could occur if a file (usually a map, tileset or world) got reloaded while no editor was currently open.
When there is more than one custom property selected when closing the last document, a crash would occur due to a null pointer dereference while updating the actions on the Properties view tool bar.
Fixing two crashes that have been observed in crash reports sent to Sentry.
Ship the data needed by xkbcommon. (cherry picked from commit fe1eadf)
An update to GameMaker has broken compatibility in several ways: * It now requires a "type tag field" at the start of applicable JSON records. * The name is expected to follow the "type tag field" as a "%Name" field, in addition to the regular "name" field. * The JSON fields are now required to be ordered alphabetically (case-insentively). Other minor differences include: * The "tags" field is left out when there are no tags. * There is no longer a space included after JSON field names. * Some new fields were added. Also, the plugin now uses SaveFile again rather than QFile, because it seems that recent GameMaker versions will reload fine when using safe writing of files. Updated the manual to no longer say "GameMaker Studio 2.3". Closes mapeditor#4132 (cherry picked from commit cc77ce6)
I hadn't expected to do another patch release so soon, but now that I do, it should be a good idea to include the updated GameMaker export.
Conflicts: NEWS.md docs/manual/export-yy.rst src/tiled/propertieswidget.cpp
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.
No description provided.