Skip to content

[pull] master from renpy:master #951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
May 22, 2023
Merged

[pull] master from renpy:master #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
078ffb9
doc: move reload-related functions to the dedicated section
Gouvernathor May 22, 2023
09a29a9
Update launcher.rpy
Moshibit May 22, 2023
217d0e8
Update launcher.rpy
Moshibit May 22, 2023
a851c97
Merge branch 'fix'
renpy-bot May 22, 2023
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
18 changes: 13 additions & 5 deletions launcher/game/tl/spanish/launcher.rpy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2116,11 +2116,19 @@ translate spanish strings:
# game/androidstrings.rpy:69
old "I found a bundle.keystore file in the rapt directory. Do you want to use this file?"
new "He encontrado un archivo bundle.keystore en el directorio rapt. ¿Quieres usar este archivo?"

translate spanish strings:


# game/updater.rpy:79
old "A nightly build of fixes to the release version of Ren'Py."
# Automatic translation.
new "Una compilación nocturna de correcciones de la versión de lanzamiento de Ren'Py."
new "Compilación nocturna de correcciones para la versión de lanzamiento de Ren'Py."

# game/updater.rpy:76
old "Nightly Fix"
new "Correciones nocturnas"

# game/updater.rpy:77
old "Nightly Fix (Ren'Py 8, Python 3)"
new "Correciones nocturnas (Ren'Py 8, Python 3)"

# game/updater.rpy:78
old "Nightly Fix (Ren'Py 7, Python 2)"
new "Correciones nocturnas (Ren'Py 7, Python 2)"
9 changes: 6 additions & 3 deletions renpy/exports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1907,11 +1907,14 @@ def full_restart(transition=False, label="_invoke_main_menu", target="_main_menu

def utter_restart(keep_renderer=False):
"""
:undocumented: Used in the implementation of shift+R.
:doc: reload

Causes an utter restart of Ren'Py. This reloads the script and
re-runs initialization.

This may not work on other platforms, notably Android.
"""
# Used in the implementation of shift+R.

renpy.session["_keep_renderer"] = keep_renderer

Expand Down Expand Up @@ -3782,7 +3785,7 @@ def set_mouse_pos(x, y, duration=0):

def set_autoreload(autoreload):
"""
:doc: other
:doc: reload

Sets the autoreload flag, which determines if the game will be
automatically reloaded after file changes. Autoreload will not be
Expand All @@ -3794,7 +3797,7 @@ def set_autoreload(autoreload):

def get_autoreload():
"""
:doc: other
:doc: reload

Gets the autoreload flag.
"""
Expand Down
5 changes: 5 additions & 0 deletions sphinx/source/developer_tools.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ new effect.

Shift+R reloading does not work in a replay.

The following functions implement the same behavior in pure python. Note that
they should only be used in developer mode.

.. include:: inc/reload

.. _style-inspector:

Shift+I Style Inspecting
Expand Down