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 castle dialog rendering bugs #7960

Merged
merged 3 commits into from
Oct 20, 2023

Conversation

Districh-ru
Copy link
Collaborator

@Districh-ru Districh-ru commented Oct 18, 2023

This PR fixes #7913, fixes #6971 and also fixes incorrect hero recruitment (fade-in) animation when a hero is recruited after the castle was changed in the construction dialog:
Master build:

fheroes2.2023-10-18.18-01-31-221.mp4

This PR:

fheroes2.2023-10-18.18-06-44-978.mp4

Some minor code lean-up is also made in this PR along with adding the right mouse button press tips for OKAY and CANCEL buttons in Recruit Hero dialog and Build dialog:
pic

And adds captain image fade-in animation:

fheroes2.2023-10-18.18-10-10-320.mp4

@Districh-ru Districh-ru added bug Something doesn't work ui UI/GUI related stuff labels Oct 18, 2023
@Districh-ru Districh-ru added this to the 1.0.10 milestone Oct 18, 2023
@Districh-ru Districh-ru self-assigned this Oct 18, 2023
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/castle/buildinginfo.cpp Show resolved Hide resolved
src/fheroes2/castle/buildinginfo.cpp Show resolved Hide resolved
@Districh-ru Districh-ru added the improvement New feature, request or improvement label Oct 18, 2023
@ihhub ihhub merged commit e16e5e1 into ihhub:master Oct 20, 2023
20 checks passed
@ihhub
Copy link
Owner

ihhub commented Oct 20, 2023

@Districh-ru , huge thanks for these changes!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something doesn't work improvement New feature, request or improvement ui UI/GUI related stuff
Projects
None yet
3 participants