diff --git a/about/docs_changelog.rst b/about/docs_changelog.rst index 332b00f21..5f9ea448b 100644 --- a/about/docs_changelog.rst +++ b/about/docs_changelog.rst @@ -107,7 +107,7 @@ Step by step ^^^^^^^^^^^^ - :ref:`doc_signals` -- :ref:`doc_exporting` +- :ref:`doc_exporting_basics` Scripting ^^^^^^^^^ diff --git a/classes/class_directory.rst b/classes/class_directory.rst index 67a0cd760..7df3fdb18 100644 --- a/classes/class_directory.rst +++ b/classes/class_directory.rst @@ -41,7 +41,7 @@ Here is an example on how to iterate through the files of a directory: Tutorials --------- -- :doc:`../getting_started/step_by_step/filesystem` +- :doc:`../tutorials/scripting/filesystem` Methods ------- diff --git a/classes/class_file.rst b/classes/class_file.rst index 4a3ade99e..787837419 100644 --- a/classes/class_file.rst +++ b/classes/class_file.rst @@ -38,7 +38,7 @@ Here's a sample on how to write and read from a file: Tutorials --------- -- :doc:`../getting_started/step_by_step/filesystem` +- :doc:`../tutorials/scripting/filesystem` Properties ---------- diff --git a/classes/class_resource.rst b/classes/class_resource.rst index 2c0e6dd19..349c03bab 100644 --- a/classes/class_resource.rst +++ b/classes/class_resource.rst @@ -23,7 +23,7 @@ Resource is the base class for all Godot-specific resource types, serving primar Tutorials --------- -- :doc:`../getting_started/step_by_step/resources` +- :doc:`../tutorials/scripting/resources` Properties ---------- diff --git a/classes/class_scenetree.rst b/classes/class_scenetree.rst index 3790c424f..163b8acfb 100644 --- a/classes/class_scenetree.rst +++ b/classes/class_scenetree.rst @@ -25,7 +25,7 @@ You can also use the ``SceneTree`` to organize your nodes into groups: every nod Tutorials --------- -- :doc:`../getting_started/step_by_step/scene_tree` +- :doc:`../tutorials/scripting/scene_tree` - :doc:`../tutorials/rendering/multiple_resolutions` diff --git a/getting_started/step_by_step/godot_design_philosophy.rst b/getting_started/introduction/godot_design_philosophy.rst similarity index 97% rename from getting_started/step_by_step/godot_design_philosophy.rst rename to getting_started/introduction/godot_design_philosophy.rst index 74d4afdc6..556afcdd0 100644 --- a/getting_started/step_by_step/godot_design_philosophy.rst +++ b/getting_started/introduction/godot_design_philosophy.rst @@ -3,7 +3,7 @@ Godot's design philosophy ========================= -Now that you've gotten your hands wet, let's talk about Godot's design. +Now that you've gotten your feet wet, let's talk about Godot's design. **Every game engine is different and fits different needs.** Not only do they offer a range of features, but the design of each engine @@ -16,7 +16,7 @@ is it an engine comparison. To know if any engine can be a good fit for your project, you need to try it out for yourself and understand its design and limitations. -Please watch `Discover Godot 3, the Free game engine `_ +Please watch `Godot explained in 5 minutes `_ if you're looking for an overview of the engine's features. Object-oriented design and composition diff --git a/getting_started/step_by_step/img/engine_design_01.png b/getting_started/introduction/img/engine_design_01.png similarity index 100% rename from getting_started/step_by_step/img/engine_design_01.png rename to getting_started/introduction/img/engine_design_01.png diff --git a/getting_started/step_by_step/img/engine_design_02.png b/getting_started/introduction/img/engine_design_02.png similarity index 100% rename from getting_started/step_by_step/img/engine_design_02.png rename to getting_started/introduction/img/engine_design_02.png diff --git a/getting_started/step_by_step/img/engine_design_03.png b/getting_started/introduction/img/engine_design_03.png similarity index 100% rename from getting_started/step_by_step/img/engine_design_03.png rename to getting_started/introduction/img/engine_design_03.png diff --git a/getting_started/step_by_step/img/engine_design_fsm_plugin.png b/getting_started/introduction/img/engine_design_fsm_plugin.png similarity index 100% rename from getting_started/step_by_step/img/engine_design_fsm_plugin.png rename to getting_started/introduction/img/engine_design_fsm_plugin.png diff --git a/getting_started/step_by_step/img/engine_design_rpg_in_a_box.png b/getting_started/introduction/img/engine_design_rpg_in_a_box.png similarity index 100% rename from getting_started/step_by_step/img/engine_design_rpg_in_a_box.png rename to getting_started/introduction/img/engine_design_rpg_in_a_box.png diff --git a/getting_started/step_by_step/img/engine_design_visual_script.png b/getting_started/introduction/img/engine_design_visual_script.png similarity index 100% rename from getting_started/step_by_step/img/engine_design_visual_script.png rename to getting_started/introduction/img/engine_design_visual_script.png diff --git a/getting_started/introduction/index.rst b/getting_started/introduction/index.rst index 1afa629cf..8c1412aeb 100644 --- a/getting_started/introduction/index.rst +++ b/getting_started/introduction/index.rst @@ -21,3 +21,4 @@ make the most of your time learning it. key_concepts_overview first_look_at_the_editor learning_new_features + godot_design_philosophy diff --git a/getting_started/introduction/introduction_to_godot.rst b/getting_started/introduction/introduction_to_godot.rst index 4d4b8e140..1131cafa1 100644 --- a/getting_started/introduction/introduction_to_godot.rst +++ b/getting_started/introduction/introduction_to_godot.rst @@ -1,3 +1,5 @@ +.. _doc_introduction_to_godot: + Introduction to Godot ===================== diff --git a/getting_started/step_by_step/index.rst b/getting_started/step_by_step/index.rst index cf422a1ba..60a395d8d 100644 --- a/getting_started/step_by_step/index.rst +++ b/getting_started/step_by_step/index.rst @@ -23,9 +23,3 @@ where appropriate. scripting_player_input signals your_first_game - exporting - godot_design_philosophy - resources - filesystem - scene_tree - singletons_autoload diff --git a/getting_started/step_by_step/exporting.rst b/tutorials/export/exporting_basics.rst similarity index 99% rename from getting_started/step_by_step/exporting.rst rename to tutorials/export/exporting_basics.rst index f93df672f..53befc7be 100644 --- a/getting_started/step_by_step/exporting.rst +++ b/tutorials/export/exporting_basics.rst @@ -1,4 +1,4 @@ -.. _doc_exporting: +.. _doc_exporting_basics: Exporting ========= diff --git a/getting_started/step_by_step/img/export_android_oneclick.png b/tutorials/export/img/export_android_oneclick.png similarity index 100% rename from getting_started/step_by_step/img/export_android_oneclick.png rename to tutorials/export/img/export_android_oneclick.png diff --git a/getting_started/step_by_step/img/export_editor_android_settings.png b/tutorials/export/img/export_editor_android_settings.png similarity index 100% rename from getting_started/step_by_step/img/export_editor_android_settings.png rename to tutorials/export/img/export_editor_android_settings.png diff --git a/getting_started/step_by_step/img/export_handheld_stretchsettings.png b/tutorials/export/img/export_handheld_stretchsettings.png similarity index 100% rename from getting_started/step_by_step/img/export_handheld_stretchsettings.png rename to tutorials/export/img/export_handheld_stretchsettings.png diff --git a/getting_started/step_by_step/img/export_ios_settings.png b/tutorials/export/img/export_ios_settings.png similarity index 100% rename from getting_started/step_by_step/img/export_ios_settings.png rename to tutorials/export/img/export_ios_settings.png diff --git a/getting_started/step_by_step/img/export_presets_window.png b/tutorials/export/img/export_presets_window.png similarity index 100% rename from getting_started/step_by_step/img/export_presets_window.png rename to tutorials/export/img/export_presets_window.png diff --git a/getting_started/step_by_step/img/export_template_manager.png b/tutorials/export/img/export_template_manager.png similarity index 100% rename from getting_started/step_by_step/img/export_template_manager.png rename to tutorials/export/img/export_template_manager.png diff --git a/getting_started/step_by_step/img/export_template_menu.png b/tutorials/export/img/export_template_menu.png similarity index 100% rename from getting_started/step_by_step/img/export_template_menu.png rename to tutorials/export/img/export_template_menu.png diff --git a/getting_started/step_by_step/img/export_touchsettings.png b/tutorials/export/img/export_touchsettings.png similarity index 100% rename from getting_started/step_by_step/img/export_touchsettings.png rename to tutorials/export/img/export_touchsettings.png diff --git a/getting_started/step_by_step/img/export_web_example.png b/tutorials/export/img/export_web_example.png similarity index 100% rename from getting_started/step_by_step/img/export_web_example.png rename to tutorials/export/img/export_web_example.png diff --git a/getting_started/step_by_step/img/export_web_export_with_debug_disabled.png b/tutorials/export/img/export_web_export_with_debug_disabled.png similarity index 100% rename from getting_started/step_by_step/img/export_web_export_with_debug_disabled.png rename to tutorials/export/img/export_web_export_with_debug_disabled.png diff --git a/getting_started/step_by_step/img/export_web_files.png b/tutorials/export/img/export_web_files.png similarity index 100% rename from getting_started/step_by_step/img/export_web_files.png rename to tutorials/export/img/export_web_files.png diff --git a/getting_started/step_by_step/img/export_xcode_project_folders.png b/tutorials/export/img/export_xcode_project_folders.png similarity index 100% rename from getting_started/step_by_step/img/export_xcode_project_folders.png rename to tutorials/export/img/export_xcode_project_folders.png diff --git a/tutorials/export/index.rst b/tutorials/export/index.rst index fcc59d36e..0572450df 100644 --- a/tutorials/export/index.rst +++ b/tutorials/export/index.rst @@ -5,7 +5,7 @@ Export :maxdepth: 1 :name: toc-learn-workflow-export - + exporting_basics exporting_projects exporting_pcks feature_tags diff --git a/getting_started/step_by_step/files/autoload.zip b/tutorials/scripting/files/autoload.zip similarity index 100% rename from getting_started/step_by_step/files/autoload.zip rename to tutorials/scripting/files/autoload.zip diff --git a/getting_started/step_by_step/filesystem.rst b/tutorials/scripting/filesystem.rst similarity index 100% rename from getting_started/step_by_step/filesystem.rst rename to tutorials/scripting/filesystem.rst diff --git a/getting_started/step_by_step/img/activescene.png b/tutorials/scripting/img/activescene.png similarity index 100% rename from getting_started/step_by_step/img/activescene.png rename to tutorials/scripting/img/activescene.png diff --git a/getting_started/step_by_step/img/autoload_example.png b/tutorials/scripting/img/autoload_example.png similarity index 100% rename from getting_started/step_by_step/img/autoload_example.png rename to tutorials/scripting/img/autoload_example.png diff --git a/getting_started/step_by_step/img/autoload_runtime.png b/tutorials/scripting/img/autoload_runtime.png similarity index 100% rename from getting_started/step_by_step/img/autoload_runtime.png rename to tutorials/scripting/img/autoload_runtime.png diff --git a/getting_started/step_by_step/img/autoload_script.png b/tutorials/scripting/img/autoload_script.png similarity index 100% rename from getting_started/step_by_step/img/autoload_script.png rename to tutorials/scripting/img/autoload_script.png diff --git a/getting_started/step_by_step/img/autoload_tab.png b/tutorials/scripting/img/autoload_tab.png similarity index 100% rename from getting_started/step_by_step/img/autoload_tab.png rename to tutorials/scripting/img/autoload_tab.png diff --git a/getting_started/step_by_step/img/autoload_tutorial1.png b/tutorials/scripting/img/autoload_tutorial1.png similarity index 100% rename from getting_started/step_by_step/img/autoload_tutorial1.png rename to tutorials/scripting/img/autoload_tutorial1.png diff --git a/getting_started/step_by_step/img/nodes_resources.png b/tutorials/scripting/img/nodes_resources.png similarity index 100% rename from getting_started/step_by_step/img/nodes_resources.png rename to tutorials/scripting/img/nodes_resources.png diff --git a/getting_started/step_by_step/img/resourcerobi.png b/tutorials/scripting/img/resourcerobi.png similarity index 100% rename from getting_started/step_by_step/img/resourcerobi.png rename to tutorials/scripting/img/resourcerobi.png diff --git a/getting_started/step_by_step/img/singleton.png b/tutorials/scripting/img/singleton.png similarity index 100% rename from getting_started/step_by_step/img/singleton.png rename to tutorials/scripting/img/singleton.png diff --git a/getting_started/step_by_step/img/spriteprop.png b/tutorials/scripting/img/spriteprop.png similarity index 100% rename from getting_started/step_by_step/img/spriteprop.png rename to tutorials/scripting/img/spriteprop.png diff --git a/getting_started/step_by_step/img/toptobottom.png b/tutorials/scripting/img/toptobottom.png similarity index 100% rename from getting_started/step_by_step/img/toptobottom.png rename to tutorials/scripting/img/toptobottom.png diff --git a/tutorials/scripting/index.rst b/tutorials/scripting/index.rst index 346569502..0e337d1e8 100644 --- a/tutorials/scripting/index.rst +++ b/tutorials/scripting/index.rst @@ -30,6 +30,8 @@ Some features are specific to the engine and are available in all supported languages. Whether you code in GDScript, C#, or another language, the pages below will help you make the most of Godot. +.. To split and organize better, into some related toctrees? + .. toctree:: :maxdepth: 1 :name: toc-scripting-core-features @@ -45,3 +47,7 @@ below will help you make the most of Godot. change_scenes_manually instancing_with_signals pausing_games + filesystem + resources + singletons_autoload + scene_tree diff --git a/getting_started/step_by_step/resources.rst b/tutorials/scripting/resources.rst similarity index 100% rename from getting_started/step_by_step/resources.rst rename to tutorials/scripting/resources.rst diff --git a/getting_started/step_by_step/scene_tree.rst b/tutorials/scripting/scene_tree.rst similarity index 100% rename from getting_started/step_by_step/scene_tree.rst rename to tutorials/scripting/scene_tree.rst diff --git a/getting_started/step_by_step/singletons_autoload.rst b/tutorials/scripting/singletons_autoload.rst similarity index 100% rename from getting_started/step_by_step/singletons_autoload.rst rename to tutorials/scripting/singletons_autoload.rst