Merge remote-tracking branch 'origin/interface2' into kinetic_text
This commit is contained in:
commit
e91b95d882
File diff suppressed because it is too large
Load Diff
@ -204,7 +204,18 @@ screen preferences_accessibility():
|
|||||||
textbutton "Delete persistent data ({color=#f00}!{/color})" action Confirm(gui.CONFIRM_DELETE_PERSISTENT, Function(delete_persistent))
|
textbutton "Delete persistent data ({color=#f00}!{/color})" action Confirm(gui.CONFIRM_DELETE_PERSISTENT, Function(delete_persistent))
|
||||||
textbutton "Delete save files ({color=#f00}!{/color})" action Confirm(gui.CONFIRM_DELETE_SAVES, Function(delete_saves))
|
textbutton "Delete save files ({color=#f00}!{/color})" action Confirm(gui.CONFIRM_DELETE_SAVES, Function(delete_saves))
|
||||||
frame style "navigation_page_right":
|
frame style "navigation_page_right":
|
||||||
pass
|
frame style "navigation_note":
|
||||||
|
xysize (180, 180)
|
||||||
|
pos (20, 50)
|
||||||
|
at transform:
|
||||||
|
rotate 6
|
||||||
|
text "TIP: If text overflows, try reducing vertical text spacing."
|
||||||
|
frame style "navigation_note":
|
||||||
|
xysize (180, 180)
|
||||||
|
pos (25, 150)
|
||||||
|
at transform:
|
||||||
|
rotate -4
|
||||||
|
text "You could also try changing the font, it might help! :)"
|
||||||
|
|
||||||
define gui.CONFIRM_DELETE_PERSISTENT = """{color=#7a0000}Warning!{/color}
|
define gui.CONFIRM_DELETE_PERSISTENT = """{color=#7a0000}Warning!{/color}
|
||||||
{size=-4}You are about to reset all persistent data, including
|
{size=-4}You are about to reset all persistent data, including
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -27,6 +27,8 @@ init python:
|
|||||||
renpy.music.register_channel("sound2", "sfx", False)
|
renpy.music.register_channel("sound2", "sfx", False)
|
||||||
renpy.music.register_channel("weather", "weather", True)
|
renpy.music.register_channel("weather", "weather", True)
|
||||||
|
|
||||||
|
default _game_menu_screen = "navigation"
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
# https://www.renpy.org/doc/html/config.html
|
# https://www.renpy.org/doc/html/config.html
|
||||||
|
|
||||||
@ -126,8 +128,8 @@ define config.default_music_volume = 0.8
|
|||||||
define config.default_sfx_volume = 1.0
|
define config.default_sfx_volume = 1.0
|
||||||
|
|
||||||
# Transitions
|
# Transitions
|
||||||
define config.enter_transition = f3
|
define config.enter_transition = None
|
||||||
define config.exit_transition = f3
|
define config.exit_transition = pause_trans(0.4)
|
||||||
define config.intra_transition = d1
|
define config.intra_transition = d1
|
||||||
define config.main_game_transition = f3
|
define config.main_game_transition = f3
|
||||||
define config.game_main_transition = f3
|
define config.game_main_transition = f3
|
||||||
|
@ -123,7 +123,7 @@ init python early:
|
|||||||
|
|
||||||
def enable_game_menu():
|
def enable_game_menu():
|
||||||
global _game_menu_screen
|
global _game_menu_screen
|
||||||
_game_menu_screen = "save_screen"
|
_game_menu_screen = "navigation"
|
||||||
|
|
||||||
def make_revertable(obj):
|
def make_revertable(obj):
|
||||||
if isinstance(obj, _list):
|
if isinstance(obj, _list):
|
||||||
|
@ -211,8 +211,8 @@ label _wardrobe:
|
|||||||
|
|
||||||
show screen main_room
|
show screen main_room
|
||||||
show screen ui_top_bar
|
show screen ui_top_bar
|
||||||
$ _game_menu_screen = "save" # documented
|
$ _game_menu_screen = "navigation"
|
||||||
$ _skipping = True # documented
|
$ _skipping = True
|
||||||
$ renpy.stop_predict(__predicted)
|
$ renpy.stop_predict(__predicted)
|
||||||
$ __predicted = None
|
$ __predicted = None
|
||||||
$ renpy.suspend_rollback(False)
|
$ renpy.suspend_rollback(False)
|
||||||
|
Loading…
Reference in New Issue
Block a user