Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add hexside_length for newer tmx. #313

Merged
merged 7 commits into from
Oct 22, 2024
Merged

Conversation

darkautism
Copy link
Contributor

@darkautism darkautism commented Oct 22, 2024

Some of tmx (new version?) file has this attarbute. And i found other tmx library also has this attribute. We need this!

Copy link
Contributor

@aleokdev aleokdev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! Just one small thing...

src/map.rs Outdated Show resolved Hide resolved
@aleokdev
Copy link
Contributor

Please also update CHANGELOG.md and select the next branch as the merge target.

@darkautism darkautism changed the base branch from current to next October 22, 2024 08:02
@darkautism
Copy link
Contributor Author

I didn't know which should been in the CHANGELOG.md, so I cannot fix this conflicts .

@aleokdev
Copy link
Contributor

Alright, I'll fix it

@aleokdev
Copy link
Contributor

Had to rebase your branch to merge into next, please for next time base everything onto the next branch instead

aleokdev
aleokdev previously approved these changes Oct 22, 2024
@aleokdev
Copy link
Contributor

GH Actions froze because of the CI skip on the previous commit lol

aleokdev
aleokdev previously approved these changes Oct 22, 2024
Copy link
Member

@bjorn bjorn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, though I've suggested some small tweaks. Please remember to squash when merging. :-)

src/map.rs Outdated Show resolved Hide resolved
src/map.rs Outdated
@@ -56,6 +56,8 @@ pub struct Map {
/// individual tiles may have different sizes. As such, there is no guarantee that this value
/// will be the same as the one from the tilesets the map is using.
pub tile_height: u32,
/// The length of the side of a hexagonal tile in pixels (Used by tile layers on hexagonal maps).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/// The length of the side of a hexagonal tile in pixels (Used by tile layers on hexagonal maps).
/// The length of the side of a hexagonal tile in pixels (used by tile layers on hexagonal maps).

@aleokdev aleokdev merged commit 31783f0 into mapeditor:next Oct 22, 2024
4 checks passed
@bjorn
Copy link
Member

bjorn commented Oct 22, 2024

Whoops, I missed that a u32 was used. Actually this property isn't unsigned, even if there may not be an actual use for negative values...

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.

3 participants