Merge 1.18 changes into develop #5782
Merged
Conversation
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
…ch update method in ZoneViewModel
Fix detection of marker tokens
_Fix applies to both PointerTool and StampTool_ When releasing the mouse, we grab the current drag state before it gets cleared, so that we know whether the user was dragging the map. This is in lieu of a more comprehensive change to `PointerTool` and `StampTool` that would isolate different user actions to ensure this kind of thing can't happen.
…-menu-when-dragging-map Do not show token popup menu while dragging map
This is more wasteful, but is identical to 1.17 behaviour and avoids the possibility of stale selection data in case the zone has not been rerendered after a selection chnage.
`TokenRenderer` applies the token opacity, so callers do not need to pass it in. They should only pass additional opacity, such as that used to indicate a dragged token.
…acity Remove redundant application of token opacity
…ace-condition 1.18 - Fix getSelected() stale results
All the modifications of `MacroButtonProperties` still have to be gated behind a null check since campaign properties do not have `MacroButtonProperties`.
…-editor 1.18 - Fix macro editor for campaign properties
The associated `HtmlDocument` constructor no longer has `isJavaBridgeInjected` or `isBaseUrlInjected` parameters since these have to be `false`.
This make `cachelib` be consistently applied to HTML5 content again.
1.18 - Fix HTML5 cachelib=false
1.18 - Fix "Visible over FoW" setting for stamps
1.18 - Remove LibGDX renderer and other minor fixes
cwisniew
approved these changes
Sep 16, 2025
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.
This change is