Merge remote-tracking branch 'origin/Monster-Update-6' into lazysnake/feature/ISSUE-3_CG_Gallery

2021-07-11 10:51:29 +10:00
parent 87c6665084 c131ce6328
commit fce061e138
20 changed files with 214 additions and 112 deletions
--- a/game/gui/button/menubuttons/helpbutton.png
+++ b/game/gui/button/menubuttons/helpbutton.png
--- a/game/gui/button/menubuttons/loadbutton_idle.png
+++ b/game/gui/button/menubuttons/loadbutton_idle.png
--- a/game/gui/button/menubuttons/optionsbutton_idle.png
+++ b/game/gui/button/menubuttons/optionsbutton_idle.png
--- a/game/gui/button/menubuttons/quitbutton_idle.png
+++ b/game/gui/button/menubuttons/quitbutton_idle.png
--- a/game/gui/button/menubuttons/startbutton_idle.png
+++ b/game/gui/button/menubuttons/startbutton_idle.png
--- a/game/gui/button/menubuttons/template_idle.png
+++ b/game/gui/button/menubuttons/template_idle.png
--- a/game/gui/button/uioptionbuttons/auto_hover.png
+++ b/game/gui/button/uioptionbuttons/auto_hover.png
--- a/game/gui/button/uioptionbuttons/auto_idle.png
+++ b/game/gui/button/uioptionbuttons/auto_idle.png
--- a/game/gui/button/uioptionbuttons/load_hover.png
+++ b/game/gui/button/uioptionbuttons/load_hover.png
--- a/game/gui/button/uioptionbuttons/load_idle.png
+++ b/game/gui/button/uioptionbuttons/load_idle.png
--- a/game/gui/button/uioptionbuttons/save_hover.png
+++ b/game/gui/button/uioptionbuttons/save_hover.png
--- a/game/gui/button/uioptionbuttons/save_idle.png
+++ b/game/gui/button/uioptionbuttons/save_idle.png
--- a/game/gui/button/uioptionbuttons/skip_hover.png
+++ b/game/gui/button/uioptionbuttons/skip_hover.png
--- a/game/gui/button/uioptionbuttons/skip_idle.png
+++ b/game/gui/button/uioptionbuttons/skip_idle.png
--- a/game/gui/button/uioptionbuttons/template_hover.png
+++ b/game/gui/button/uioptionbuttons/template_hover.png
--- a/game/gui/button/uioptionbuttons/template_idle.png
+++ b/game/gui/button/uioptionbuttons/template_idle.png