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

UI icons, ability descriptions, popups, and more #565

Merged
merged 1 commit into from
Mar 22, 2020
Merged

Conversation

ozkriff
Copy link
Owner

@ozkriff ozkriff commented Mar 21, 2020

This giant ugly blob of interconnected changes PR:

  • Replaces text with icons in the abilities menu and adds ability descriptions;
  • Replaces "end turn", "menu" and "info" buttons with icons too;
  • Removes the "deselect" button;
  • Hides the "End Turn" button during enemy's turn;
  • Adds a battle exit & campaign exit confirmation dialogs (and enum BattleType { Skirmish, CampaignNode } to distinguish them).
  • Adds popup screens and renames screen::Transition to screen::StackCommand;
  • Allows grouping related widgets into panels;
  • Allows exiting from the ability mode by clicking on the ability icon again;
  • Adds a black frame, an is_active property and custom color highlighting to zgui::Button;
  • Adds new zgui widgets: ColoredRect, LayersLayout;
  • ... aaand does a bunch of smaller tweaks and changes.

All icons: image

Battle screenshot showing icon buttons, ability descriptions, agent info grouped into one panel:
image

Example of widgets grouping & grayed-out buttons in campaign menu: image

Example of confirmation dialog: image

Depends on ozkriff/zemeroth_assets#7

Closes #150 ("Gray-out inactive buttons")
Closes #276 ("Replace text with icons in abilities menu")
Closes #387 ("The player shouldn't be able to restart a battle in a campaign")
Closes #560 ("Exit confirmation dialogs")
Closes #419 ("zgui: Make buttons visually distinctive from labels")

@ozkriff ozkriff marked this pull request as ready for review March 22, 2020 08:00
@ozkriff ozkriff merged commit 12b9f4f into master Mar 22, 2020
@ozkriff ozkriff deleted the i276_icons branch March 22, 2020 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant