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 attack icons to unit_preview_pane #3740

Merged
merged 4 commits into from Mar 8, 2019

Conversation

@jostephd
Copy link
Member

commented Nov 23, 2018

This adds range and damage type icons to the unit preview pane, like #3732 did to the sidebar.

Depends on #3732 for finding the the blade icon (#3732 renamed blades.png to blade.png).

Currently this is a work in progress, not ready to be merged yet. This is how far I got, does anyone know how to stop that line from stretching to fill the width of the pane?

screenshot_2018-11-23_04-53-40

cc @CelticMinstrel

@jostephd jostephd added this to the 1.15.0 milestone Nov 23, 2018

@jostephd jostephd self-assigned this Nov 23, 2018

@jostephd jostephd referenced this pull request Nov 23, 2018
6 of 7 tasks complete
@CelticMinstrel

This comment has been minimized.

Copy link
Member

commented Nov 23, 2018

I think you want grow_factor=0 on the icons and grow_factor=1 on the text.

@jostephd

This comment has been minimized.

Copy link
Member Author

commented Nov 23, 2018

Thanks, that did it.

@jostephd jostephd force-pushed the jostephd:attack-icons-upp branch from 3841ddb to 1a62bc9 Feb 24, 2019

@jostephd

This comment has been minimized.

Copy link
Member Author

commented Feb 24, 2019

Updated, ready for review.

screenshot_2019-02-24_13-43-50

@jostephd jostephd changed the title [WIP] Add attack icons to unit_preview_pane Add attack icons to unit_preview_pane Feb 24, 2019

@jostephd jostephd force-pushed the jostephd:attack-icons-upp branch from 1a62bc9 to 134c8b1 Mar 3, 2019

@jostephd

This comment has been minimized.

Copy link
Member Author

commented Mar 3, 2019

Moved the icons:

screenshot_2019-03-03_16-43-50

@CelticMinstrel

This comment has been minimized.

Copy link
Member

commented Mar 3, 2019

Do the icons have tooltips? (Do you think they should have tooltips?)

@jostephd

This comment has been minimized.

Copy link
Member Author

commented Mar 3, 2019

I added tooltips. :)


#damage types
type_ttt=_ "ttt"

This comment has been minimized.

Copy link
@jostephd

jostephd Mar 3, 2019

Author Member

I added these to test units that don't have range or damage type graphics. I'll revert them and rebase before merge.

@wesnoth wesnoth deleted a comment Mar 7, 2019

@jostephd jostephd force-pushed the jostephd:attack-icons-upp branch from 962bf99 to f160e5c Mar 8, 2019

@jostephd jostephd force-pushed the jostephd:attack-icons-upp branch from f160e5c to 977dc97 Mar 8, 2019

@jostephd jostephd merged commit 977dc97 into wesnoth:master Mar 8, 2019

0 of 2 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
jostephd added a commit that referenced this pull request Mar 8, 2019

@jostephd jostephd added this to Damage type and range icons in Damage type and range icons Mar 20, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.