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

Fix object picking up animation, fix object remove from map and fix restoration of the object type for the tile #8949

Merged
merged 37 commits into from
Jul 21, 2024

Conversation

Districh-ru
Copy link
Collaborator

@Districh-ru Districh-ru commented Jul 10, 2024

close #8505

This PR also fixes:

This PR affects all objects remove from the map including the move of the boat using Summon Boat.

Tile object type update:

  • Master build:
fheroes2.2024-07-13.07-38-02-610.mp4
  • This PR:
fheroes2.2024-07-13.07-38-35-565.mp4

Radar update:

  • Master build:
fheroes2.2024-07-13.20-11-06-631.mp4
  • This PR:
fheroes2.2024-07-13.20-10-04-690.mp4

@Districh-ru Districh-ru added bug Something doesn't work ui UI/GUI related stuff labels Jul 10, 2024
@Districh-ru Districh-ru added this to the 1.1.2 milestone Jul 10, 2024
@Districh-ru Districh-ru self-assigned this Jul 10, 2024
@Districh-ru Districh-ru changed the title Fix artifact picking up animation when it is set to the bottom layer addon and tile type setting Fix artifact picking up animation when it is set to the bottom layer addon Jul 10, 2024
@Districh-ru Districh-ru changed the title Fix artifact picking up animation when it is set to the bottom layer addon Fix object picking up animation when it is set to the bottom layer addon and therestoration of the object type for the tile Jul 12, 2024
@Districh-ru Districh-ru marked this pull request as ready for review July 12, 2024 17:52
@Districh-ru Districh-ru changed the title Fix object picking up animation when it is set to the bottom layer addon and therestoration of the object type for the tile Fix object picking up animation when it is set to the bottom layer addon and fix restoration of the object type for the tile Jul 12, 2024
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ Clang-Tidy found issue(s) with the introduced code (1/1)

src/fheroes2/maps/maps_tiles.cpp Outdated Show resolved Hide resolved
src/fheroes2/maps/maps_tiles.cpp Outdated Show resolved Hide resolved
@ihhub ihhub marked this pull request as ready for review July 14, 2024 10:44
Copy link
Collaborator

@oleg-derevenetz oleg-derevenetz left a comment

Choose a reason for hiding this comment

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

Hi @Districh-ru I just left one question, could you please take a look when you have time?

src/fheroes2/heroes/heroes_action.cpp Outdated Show resolved Hide resolved
@Districh-ru Districh-ru changed the title Fix object picking up animation when it is set to the bottom layer addon and fix restoration of the object type for the tile Fix object picking up animation, fix object remove from map and fix restoration of the object type for the tile Jul 15, 2024
@ihhub ihhub added the high priority Very critical change needed immediately label Jul 18, 2024
@ihhub
Copy link
Owner

ihhub commented Jul 20, 2024

Hi @Districh-ru , please resolve merge conflicts here.

@Districh-ru
Copy link
Collaborator Author

Hi @Districh-ru , please resolve merge conflicts here.

Done!

@ihhub ihhub merged commit e35f33c into ihhub:master Jul 21, 2024
20 checks passed
@ihhub
Copy link
Owner

ihhub commented Jul 21, 2024

@Districh-ru , thank you so much for these changes!

@Districh-ru Districh-ru deleted the fix-artifact-pickup branch July 21, 2024 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something doesn't work high priority Very critical change needed immediately ui UI/GUI related stuff
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adventure map, faulty artifact being picked up causes forest to disappear temporary
4 participants