CoffeeAnon/SnootGame
1
Fork 0
forked from Cavemanon/SnootGame
Code Issues Pull Requests Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Nutbuster
2021-07-11 10:53:18 +10:00
parent fce061e138
commit 30df22db5d
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
game/gui.rpy
View File

@ -103,11 +103,8 @@ define gui.main_menu_text_size = 60
## The images used for the main and game menus. ## The images used for the main and game menus.
define gui.main_menu_background = "gui/main_menu.png" define gui.main_menu_background = "gui/main_menu.png"
define gui.game_menu_background = "gui/game_menu.png" define gui.game_menu_background = "gui/game_menu.png"
<<<<<<< HEAD
define gui.extras_submenu_background = "gui/overlay/extras_submenu.png" define gui.extras_submenu_background = "gui/overlay/extras_submenu.png"
define gui.extras_submenu_panel = "gui/overlay/extras_submenu_panel.png" define gui.extras_submenu_panel = "gui/overlay/extras_submenu_panel.png"
=======
>>>>>>> origin/Monster-Update-6
## Dialogue #################################################################### ## Dialogue ####################################################################
## ##

11
game/screens.rpy
View File

@ -416,16 +416,6 @@ screen main_menu():
else: else:
add "gui/snootgame.png" add "gui/snootgame.png"
vbox: vbox:
<<<<<<< HEAD
spacing 25
xpos 1885
yalign 0.9
imagebutton auto "gui/button/menubuttons/startbutton_%s.png" action Start()
imagebutton auto "gui/button/menubuttons/loadbutton_%s.png" action ShowMenu("load")
imagebutton auto "gui/button/menubuttons/optionsbutton_%s.png" action ShowMenu("preferences")
imagebutton auto "gui/button/menubuttons/extrasbutton_%s.png" action ShowMenu("extras")
imagebutton auto "gui/button/menubuttons/quitbutton_%s.png" action Quit(confirm=not main_menu)
=======
spacing 25 spacing 25
xpos 1885 xpos 1885
yalign 0.9 yalign 0.9
@ -443,7 +433,6 @@ screen main_menu():
# vbox: # vbox:
# text "[config.version]": # text "[config.version]":
# style "main_menu_version" # style "main_menu_version"
>>>>>>> origin/Monster-Update-6
style main_menu_frame is empty style main_menu_frame is empty