Merge branch 'master' into Monster-Update-6

Move mod_menu into it's own file in src/
This commit is contained in:
2021-07-22 21:28:18 +10:00
29 changed files with 2230 additions and 1904 deletions

View File

@ -23,10 +23,10 @@ init python:
## The colors of text in the interface.
## An accent color used throughout the interface to label and highlight text.
define gui.accent_color = '#FF00FC'
define gui.accent_color = '#A2029F'
## The color used for a text button when it is neither selected nor hovered.
define gui.idle_color = '#FFFE00'
define gui.idle_color = '#D5D507'
## The small color is used for small text, which needs to be brighter/darker to
## achieve the same effect.
@ -103,6 +103,8 @@ define gui.main_menu_text_size = 60
## The images used for the main and game menus.
define gui.main_menu_background = "gui/main_menu.png"
define gui.game_menu_background = "gui/game_menu.png"
define gui.extras_submenu_background = "gui/overlay/extras_submenu.png"
define gui.extras_submenu_panel = "gui/overlay/extras_submenu_panel.png"
## Dialogue ####################################################################
##