Просмотр исходного кода

Mention the new main screen switch shortcuts (#4903)

These shortcuts changed in Godot 3.3.
tacevee 4 лет назад
Родитель
Сommit
99a44fac6b

+ 1 - 1
getting_started/first_3d_game/04.mob_scene.rst

@@ -215,7 +215,7 @@ We still have to destroy the mobs when they leave the screen. To do so, we'll
 connect our *VisibilityNotifier* node's ``screen_exited`` signal to the *Mob*.
 connect our *VisibilityNotifier* node's ``screen_exited`` signal to the *Mob*.
 
 
 Head back to the 3D viewport by clicking on the *3D* label at the top of the
 Head back to the 3D viewport by clicking on the *3D* label at the top of the
-editor. You can also press :kbd:`F2`.
+editor. You can also press :kbd:`Ctrl + F2` (:kbd:`Alt + 2` on macOS).
 
 
 |image8|
 |image8|
 
 

+ 3 - 3
getting_started/introduction/first_look_at_the_editor.rst

@@ -98,13 +98,13 @@ There are four main screen buttons centered at the top of the editor:
 2D, 3D, Script, and AssetLib.
 2D, 3D, Script, and AssetLib.
 
 
 You'll use the **2D screen** for all types of games. In addition to 2D games,
 You'll use the **2D screen** for all types of games. In addition to 2D games,
-the 2D screen is where you'll build your interfaces. Press :kbd:`F1` (or
+the 2D screen is where you'll build your interfaces. Press :kbd:`Ctrl + F1` (or
 :kbd:`Alt + 1` on macOS) to access it.
 :kbd:`Alt + 1` on macOS) to access it.
 
 
 .. image:: img/editor_intro_workspace_2d.png
 .. image:: img/editor_intro_workspace_2d.png
 
 
 In the **3D screen**, you can work with meshes, lights, and design levels for
 In the **3D screen**, you can work with meshes, lights, and design levels for
-3D games. Press :kbd:`F2` (:kbd:`Alt + 2` on macOS) to access it.
+3D games. Press :kbd:`Ctrl + F2` (:kbd:`Alt + 2` on macOS) to access it.
 
 
 .. image:: img/editor_intro_workspace_3d.png
 .. image:: img/editor_intro_workspace_3d.png
 
 
@@ -117,7 +117,7 @@ options related to the 3D view.
           main screen**.
           main screen**.
 
 
 The **Script screen** is a complete code editor with a debugger, rich
 The **Script screen** is a complete code editor with a debugger, rich
-auto-completion, and built-in code reference. Press :kbd:`F3` (:kbd:`Alt + 3`
+auto-completion, and built-in code reference. Press :kbd:`Ctrl + F3` (:kbd:`Alt + 3`
 on macOS) to access it.
 on macOS) to access it.
 
 
 .. image:: img/editor_intro_workspace_script.png
 .. image:: img/editor_intro_workspace_script.png

+ 1 - 1
getting_started/step_by_step/signals.rst

@@ -190,7 +190,7 @@ Let's use a different node here. Godot has a :ref:`Timer <class_Timer>` node
 that's useful to implement skill cooldown times, weapon reloading, and more.
 that's useful to implement skill cooldown times, weapon reloading, and more.
 
 
 Head back to the 2D workspace. You can either click the "2D" text at the top of
 Head back to the 2D workspace. You can either click the "2D" text at the top of
-the window or press :kbd:`F2` (:kbd:`Alt + 2` on macOS).
+the window or press :kbd:`Ctrl + F2` (:kbd:`Alt + 2` on macOS).
 
 
 In the Scene dock, right-click on the Sprite node and add a new node. Search for
 In the Scene dock, right-click on the Sprite node and add a new node. Search for
 Timer and add the corresponding node. Your scene should now look like this.
 Timer and add the corresponding node. Your scene should now look like this.

+ 3 - 3
tutorials/editor/default_key_mapping.rst

@@ -23,11 +23,11 @@ General Editor Actions
 +-----------------------+-------------------------------+------------------------------+----------------------------------+
 +-----------------------+-------------------------------+------------------------------+----------------------------------+
 | Action name           | Windows, Linux                | macOS                        | Editor setting                   |
 | Action name           | Windows, Linux                | macOS                        | Editor setting                   |
 +=======================+===============================+==============================+==================================+
 +=======================+===============================+==============================+==================================+
-| Open 2D Editor        | :kbd:`F1`                     | :kbd:`Alt + 1`               | ``editor/editor_2d``             |
+| Open 2D Editor        | :kbd:`Ctrl + F1`              | :kbd:`Alt + 1`               | ``editor/editor_2d``             |
 +-----------------------+-------------------------------+------------------------------+----------------------------------+
 +-----------------------+-------------------------------+------------------------------+----------------------------------+
-| Open 3D Editor        | :kbd:`F2`                     | :kbd:`Alt + 2`               | ``editor/editor_3d``             |
+| Open 3D Editor        | :kbd:`Ctrl + F2`              | :kbd:`Alt + 2`               | ``editor/editor_3d``             |
 +-----------------------+-------------------------------+------------------------------+----------------------------------+
 +-----------------------+-------------------------------+------------------------------+----------------------------------+
-| Open Script Editor    | :kbd:`F3`                     | :kbd:`Alt + 3`               | ``editor/editor_script``         |
+| Open Script Editor    | :kbd:`Ctrl + F3`              | :kbd:`Alt + 3`               | ``editor/editor_script``         |
 +-----------------------+-------------------------------+------------------------------+----------------------------------+
 +-----------------------+-------------------------------+------------------------------+----------------------------------+
 | Search Help           | :kbd:`Shift + F1`             | :kbd:`Alt + Space`           | ``editor/editor_help``           |
 | Search Help           | :kbd:`Shift + F1`             | :kbd:`Alt + Space`           | ``editor/editor_help``           |
 +-----------------------+-------------------------------+------------------------------+----------------------------------+
 +-----------------------+-------------------------------+------------------------------+----------------------------------+