Skip to content
This repository has been archived by the owner on Sep 20, 2023. It is now read-only.

Towards a better menu #725

Merged
merged 6 commits into from
Feb 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added resources/ui/blue_boxCheckmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_boxCross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_boxTick.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button00.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button08.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button09.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_button13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_checkmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_circle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_panel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_sliderDown.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_sliderLeft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_sliderRight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_sliderUp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ui/blue_tick.png
Binary file added resources/ui/click1.ogg
Binary file not shown.
Binary file added resources/ui/click2.ogg
Binary file not shown.
Binary file added resources/ui/dropdownBottom.png
Binary file added resources/ui/dropdownMid.png
Binary file added resources/ui/dropdownTop.png
Binary file added resources/ui/green_boxCheckmark.png
Binary file added resources/ui/green_boxCross.png
Binary file added resources/ui/green_boxTick.png
Binary file added resources/ui/green_button00.png
Binary file added resources/ui/green_button01.png
Binary file added resources/ui/green_button02.png
Binary file added resources/ui/green_button03.png
Binary file added resources/ui/green_button04.png
Binary file added resources/ui/green_button05.png
Binary file added resources/ui/green_button06.png
Binary file added resources/ui/green_button07.png
Binary file added resources/ui/green_button08.png
Binary file added resources/ui/green_button09.png
Binary file added resources/ui/green_button10.png
Binary file added resources/ui/green_button11.png
Binary file added resources/ui/green_button12.png
Binary file added resources/ui/green_button13.png
Binary file added resources/ui/green_checkmark.png
Binary file added resources/ui/green_circle.png
Binary file added resources/ui/green_cross.png
Binary file added resources/ui/green_panel.png
Binary file added resources/ui/green_sliderDown.png
Binary file added resources/ui/green_sliderLeft.png
Binary file added resources/ui/green_sliderRight.png
Binary file added resources/ui/green_sliderUp.png
Binary file added resources/ui/green_tick.png
Binary file added resources/ui/grey_arrowDownGrey.png
Binary file added resources/ui/grey_arrowDownWhite.png
Binary file added resources/ui/grey_arrowUpGrey.png
Binary file added resources/ui/grey_arrowUpWhite.png
Binary file added resources/ui/grey_box.png
Binary file added resources/ui/grey_boxCheckmark.png
Binary file added resources/ui/grey_boxCross.png
Binary file added resources/ui/grey_boxTick.png
Binary file added resources/ui/grey_button00.png
Binary file added resources/ui/grey_button01.png
Binary file added resources/ui/grey_button02.png
Binary file added resources/ui/grey_button03.png
Binary file added resources/ui/grey_button04.png
Binary file added resources/ui/grey_button05.png
Binary file added resources/ui/grey_button06.png
Binary file added resources/ui/grey_button07.png
Binary file added resources/ui/grey_button08.png
Binary file added resources/ui/grey_button09.png
Binary file added resources/ui/grey_button10.png
Binary file added resources/ui/grey_button11.png
Binary file added resources/ui/grey_button12.png
Binary file added resources/ui/grey_button13.png
Binary file added resources/ui/grey_button14.png
Binary file added resources/ui/grey_button15.png
Binary file added resources/ui/grey_checkmarkGrey.png
Binary file added resources/ui/grey_checkmarkWhite.png
Binary file added resources/ui/grey_circle.png
Binary file added resources/ui/grey_crossGrey.png
Binary file added resources/ui/grey_crossWhite.png
Binary file added resources/ui/grey_panel.png
Binary file added resources/ui/grey_sliderDown.png
Binary file added resources/ui/grey_sliderEnd.png
Binary file added resources/ui/grey_sliderHorizontal.png
Binary file added resources/ui/grey_sliderLeft.png
Binary file added resources/ui/grey_sliderRight.png
Binary file added resources/ui/grey_sliderUp.png
Binary file added resources/ui/grey_sliderVertical.png
Binary file added resources/ui/grey_tickGrey.png
Binary file added resources/ui/grey_tickWhite.png
Binary file added resources/ui/kenvector_future.ttf
Binary file not shown.
Binary file added resources/ui/kenvector_future_thin.ttf
Binary file not shown.
14 changes: 14 additions & 0 deletions resources/ui/license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

###############################################################################

UI pack by Kenney Vleugels (www.kenney.nl)

------------------------------

License (CC0)
http://creativecommons.org/publicdomain/zero/1.0/

You may use these graphics in personal and commercial projects.
Credit (Kenney or www.kenney.nl) would be nice but is not mandatory.

###############################################################################
Binary file added resources/ui/red_boxCheckmark.png
Binary file added resources/ui/red_boxCross.png
Binary file added resources/ui/red_boxTick.png
Binary file added resources/ui/red_button00.png
Binary file added resources/ui/red_button01.png
Binary file added resources/ui/red_button02.png
Binary file added resources/ui/red_button03.png
Binary file added resources/ui/red_button04.png
Binary file added resources/ui/red_button05.png
Binary file added resources/ui/red_button06.png
Binary file added resources/ui/red_button07.png
Binary file added resources/ui/red_button08.png
Binary file added resources/ui/red_button09.png
Binary file added resources/ui/red_button10.png
Binary file added resources/ui/red_button11.png
Binary file added resources/ui/red_button12.png
Binary file added resources/ui/red_button13.png
Binary file added resources/ui/red_checkmark.png
Binary file added resources/ui/red_circle.png
Binary file added resources/ui/red_cross.png
Binary file added resources/ui/red_panel.png
Binary file added resources/ui/red_sliderDown.png
Binary file added resources/ui/red_sliderLeft.png
Binary file added resources/ui/red_sliderRight.png
Binary file added resources/ui/red_sliderUp.png
Binary file added resources/ui/red_tick.png
Binary file added resources/ui/rollover1.ogg
Binary file not shown.
Binary file added resources/ui/rollover2.ogg
Binary file not shown.
Binary file added resources/ui/switch2.ogg
Binary file not shown.
Binary file added resources/ui/switch3.ogg
Binary file not shown.
Binary file added resources/ui/yellow_boxCheckmark.png
Binary file added resources/ui/yellow_boxCross.png
Binary file added resources/ui/yellow_boxTick.png
Binary file added resources/ui/yellow_button00.png
Binary file added resources/ui/yellow_button01.png
Binary file added resources/ui/yellow_button02.png
Binary file added resources/ui/yellow_button03.png
Binary file added resources/ui/yellow_button04.png
Binary file added resources/ui/yellow_button05.png
Binary file added resources/ui/yellow_button06.png
Binary file added resources/ui/yellow_button07.png
Binary file added resources/ui/yellow_button08.png
Binary file added resources/ui/yellow_button09.png
Binary file added resources/ui/yellow_button10.png
Binary file added resources/ui/yellow_button11.png
Binary file added resources/ui/yellow_button12.png
Binary file added resources/ui/yellow_button13.png
Binary file added resources/ui/yellow_checkmark.png
Binary file added resources/ui/yellow_circle.png
Binary file added resources/ui/yellow_cross.png
Binary file added resources/ui/yellow_panel.png
Binary file added resources/ui/yellow_sliderDown.png
Binary file added resources/ui/yellow_sliderLeft.png
Binary file added resources/ui/yellow_sliderRight.png
Binary file added resources/ui/yellow_sliderUp.png
Binary file added resources/ui/yellow_tick.png
15 changes: 14 additions & 1 deletion src/game_resources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,22 @@ game_resources::game_resources()
void test_game_resources()
{
#ifndef NDEBUG // no tests in release

game_resources g;
assert(g.get_coastal_world().getSize().x > 0.0);
assert(g.get_artwork_1().getSize().x > 0.0);

#endif
#ifdef FIX_ISSUE_724
// (724) Button sprites are loaded and ready to use
{
game_resources gr;
gr.get_blue_button();
gr.get_green_button();
gr.get_red_button();
gr.get_yellow_button();
gr.get_grey_button();
}
#endif // FIX_ISSUE_724

#endif // NDEBUG
}