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.

Sign up for GitHub

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

Jump to bottom

Merge next into current #318

Merged
merged 5 commits into from
Nov 14, 2024
Merged

Merge next into current #318

merged 5 commits into from
Nov 14, 2024

Conversation

aleokdev
Copy link
Contributor

Remember to do from git.

aleokdev and others added 5 commits June 21, 2024 18:26
@aleokdev
Add source members to Tileset, Map and Template (#303)
87a4be5 
* Add source members to `Tileset`, `Map` and `Template`

* Fix test build

* Fix test asserts

* Review comments, fix CI

* Fix README doctest
@aleokdev
Merge remote-tracking branch 'upstream/current' into current_next_merge
78eaf51
@darkautism @aleokdev
Add hexside_length for newer tmx. (#313)
31783f0 
* Add hexside_length for newer tmx.

* Fix fmt check

* Add CHANGELOG.md

* Update changelog

* [ci skip] Small typo fix

* Retrigger CI

* Change hexside_length to hex_side_length.

---------

Co-authored-by: aleokdev <[email protected]>
@bjorn
Corrected the type of Map.hex_side_length (#316)
7e2bcb6
@aleokdev
Update version (#315)
8f21563
bjorn
bjorn approved these changes Nov 14, 2024
View reviewed changes
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.

This looks fine, but to avoid confusion, the title should be "Merge next into current". :-)

@aleokdev aleokdev changed the title Merge current into next Merge next into current Nov 14, 2024
@aleokdev
Copy link
Contributor Author

Oops lol. Fixed

@aleokdev aleokdev merged commit 8f21563 into current Nov 14, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn bjorn bjorn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@aleokdev @bjorn @darkautism