Skip to content

Merge release-1.16 into develop#5321

Merged
cwisniew merged 13 commits intodevelopfrom
release-1.16
Mar 27, 2025
Merged

Merge release-1.16 into develop#5321
cwisniew merged 13 commits intodevelopfrom
release-1.16

Conversation

@kwvanderlinde
Copy link
Collaborator

@kwvanderlinde kwvanderlinde commented Mar 27, 2025

Brings the 1.16 fixes into develop


This change is Reviewable

kwvanderlinde and others added 13 commits February 27, 2025 09:59
After loading, null it out so we don't keep serializing it and it won't be the target of a reference in the future.
Add back the AbstractTemplate.zoneId field so XStream can reference it
Every other part of token dragging measures against the anchor, and this discrepency meant the FoW checks were not
checking the correct position.
This lets rendering still be done smoothly, but validation is done "cell by cell" even when the preference is disabled.
StampTool doesn't have the same issue as PointerTool since it doesn't validation drags, but we might as well keep the
structure as similar as possible.
…-PointerTool

1.16 - Fix bad FoW check in PointerTool
The ratio (and therefore second dimension) depend on the size, so should be set after the grid's size is known.
…dimensions

Fix hex grid dimensions when reading from GridDto
…tractDrawingLikeTool

This fixes tooltips for drawing, expose and topology tools which are instance-based. This is because the `Tool` class
sets the tooltip in the constructor using `getTooltip()`, which returns `null` for instance-based classes since their
fields have not been initialized yet. This is a bad pattern, but we got away with when keys were all hardcoded in the
methods themselves.
1.16 - Make tooltips show again for drawing tools, fog of war tools, and topology tools
1.16 - fix map dragging for drawing tools and expose tools
@cwisniew cwisniew added this pull request to the merge queue Mar 27, 2025
Merged via the queue into develop with commit 6fcb101 Mar 27, 2025
18 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants