Repository navigation
Merge 1.18 into 1.19 - #6136
Open
kwvanderlinde wants to merge 24 commits into
Open
Merge 1.18 into 1.19#6136kwvanderlinde wants to merge 24 commits into
kwvanderlinde wants to merge 24 commits into
Conversation
Even though most of the casework requires the fixed up HTML content, the most commonly _used_ case (chat) does not require this expensive work to be done.
Previously, this would use whatever happened to be the last detected mouse press was, which is not necessarily meaningful. This applies equally to PointerTool and StampTool
…e being passed back to the Swing thread
…low-macros-on-1.18.6 1.18 - Only treat macro results as HTML when in an HTML context.
…rt-to-1.18 1.18 - Backport token drag fix from 1.19
…ort-to-1.18 1.18 - backport native apple arm build from 1.19
…crement-not-syncing 1.18 - Read and write bar increments from and to the DTO
It always calls `ZoneRenderer#enforceView()` so that the previous scale and center point can be set. The method now makes the GM view size optional, with `null` indicating that the player view should not be fit to the GM view.
…-view-npe 1.18 - Fix EnforceZoneViewMsg handling to always allow restoring view
kwvanderlinde
marked this pull request as draft
October 29, 2026 15:36
…rt-to-1.18 1.18 - Backport typing notification fix to 1.18
kwvanderlinde
force-pushed
the
merge-1.18-into-1.19
branch
from
November 2, 2026 14:58
3d35831 to
2f026c4
Compare
kwvanderlinde
marked this pull request as ready for review
November 2, 2026 15:06
This file contains hidden or 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
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.
Brings forward the following post-1.18.6 fixes to 1.19:
Had to resolve one conflict for the change in
ClientMessageHandler.This change is