Merge branch 'godotengine:master' into drawing

_extensions/gdscript.py

@@ -85,6 +85,7 @@ def innerstring_rules(ttype):
  Operator,
  ),
  include("keywords"),
+ include("control_flow_keywords"),
  (r"(func)((?:\s|\\\s)+)", bygroups(Keyword, Text), "funcname"),
  (r"(class)((?:\s|\\\s)+)", bygroups(Keyword, Text), "classname"),
  include("builtins"),
@@ -155,21 +156,33 @@ def innerstring_rules(ttype):
  "enum",
  "static",
  "var",
+ "super",
+ ),
+ suffix=r"\b",
+ ),
+ Keyword,
+ ),
+ ],
+ "control_flow_keywords": [
+ (
+ words(
+ (
  "break",
  "continue",
- "if",
  "elif",
  "else",
+ "if",
  "for",
+ "match",
  "pass",
  "return",
- "match",
  "while",
- "super",
  ),
  suffix=r"\b",
  ),
- Keyword,
+ # Custom control flow class used to give control flow keywords a different color,
+ # like in the Godot editor.
+ Keyword.ControlFlow,
  ),
  ],
  "builtins": [

_static/css/custom.css

@@ -95,6 +95,7 @@
  --highlight-comment-color: #408090;
  --highlight-keyword-color: #007020;
  --highlight-keyword2-color: #902000;
+ --highlight-control-flow-keyword-color: #902060;
  --highlight-number-color: #208050;
  --highlight-decorator-color: #4070a0;
  --highlight-type-color: #007020;
@@ -223,6 +224,7 @@
  --highlight-comment-color: rgba(204, 206, 211, 0.5);
  --highlight-keyword-color: #ff7085;
  --highlight-keyword2-color: #42ffc2;
+ --highlight-control-flow-keyword-color: #ff8ccc;
  --highlight-number-color: #a1ffe0;
  --highlight-decorator-color: #ffb373;
  --highlight-type-color: #8effda;
@@ -877,6 +879,10 @@ code,
  color: var(--highlight-keyword-color);
 }
 
+.highlight .k-ControlFlow /* Keyword.ControlFlow */ {
+ color: var(--highlight-control-flow-keyword-color);
+}
+
 .highlight .ch /* Comment.Hashbang */,
 .highlight .cp /* Comment.Preproc */ {
  color: var(--highlight-keyword2-color);

about/docs_changelog.rst

@@ -1,5 +1,3 @@
-:article_outdated: True
-
 .. _doc_docs_changelog:
 
 Documentation changelog
@@ -13,6 +11,121 @@ added since version 3.0.
 .. note:: This document only contains new pages so not all changes are reflected,
  many pages have been substantially updated but are not reflected in this document.
 
+New pages since version 4.0
+---------------------------
+
+Development
+^^^^^^^^^^^
+
+- :ref:`doc_internal_rendering_architecture`
+- :ref:`doc_using_sanitizers`
+
+Migrating
+^^^^^^^^^
+
+- :ref:`doc_upgrading_to_godot_4.1`
+
+Physics
+^^^^^^^
+
+- :ref:`doc_troubleshooting_physics_issues`
+
+New pages since version 3.6
+---------------------------
+
+2D
+^^
+
+- :ref:`doc_2d_antialiasing`
+
+3D
+^^
+
+- :ref:`doc_3d_antialiasing`
+- :ref:`doc_faking_global_illumination`
+- :ref:`doc_introduction_to_global_illumination`
+- :ref:`doc_mesh_lod`
+- :ref:`doc_occlusion_culling`
+- :ref:`doc_using_sdfgi`
+- :ref:`doc_using_decals`
+- :ref:`doc_visibility_ranges`
+- :ref:`doc_volumetric_fog`
+- :ref:`doc_variable_rate_shading`
+- :ref:`doc_physical_light_and_camera_units`
+
+Animation
+^^^^^^^^^
+
+- :ref:`doc_creating_movies`
+
+Assets pipeline
+^^^^^^^^^^^^^^^
+
+- :ref:`doc_retargeting_3d_skeletons`
+
+Development
+^^^^^^^^^^^
+
+- :ref:`doc_custom_platform_ports`
+
+Migrating
+^^^^^^^^^
+
+- :ref:`doc_upgrading_to_godot_4`
+
+Physics
+^^^^^^^
+
+- :ref:`doc_large_world_coordinates`
+
+Scripting
+^^^^^^^^^
+
+- :ref:`doc_custom_performance_monitors`
+- :ref:`doc_c_sharp_collections`
+- :ref:`doc_c_sharp_global_classes`
+- :ref:`doc_c_sharp_variant`
+
+Shaders
+^^^^^^^
+
+- :ref:`doc_compute_shaders`
+
+Workflow
+^^^^^^^^
+
+- :ref:`doc_pr_review_guidelines`
+
+XR
+^^
+
+- :ref:`doc_introducing_xr_tools`
+- :ref:`doc_xr_action_map`
+- :ref:`doc_deploying_to_android`
+
+New pages since version 3.5
+---------------------------
+
+None.
+
+New pages since version 3.4
+---------------------------
+
+3D
+^^
+
+- :ref:`doc_3d_text`
+
+Animation
+^^^^^^^^^
+
+- :ref:`doc_playing_videos`
+
+Editor
+^^^^^^
+
+- :ref:`doc_managing_editor_features`
+
 New pages since version 3.3
 ---------------------------
 
@@ -87,7 +200,6 @@ Math
 Platform-specific
 ^^^^^^^^^^^^^^^^^
 
-- :ref:`doc_android_custom_build`
 - :ref:`doc_plugins_for_ios`
 - :ref:`doc_ios_plugin`
 - :ref:`doc_html5_shell_classref`

about/faq.rst

@@ -81,12 +81,14 @@ the long run, for prototyping, developing Minimum Viable Products (MVPs), and
 focusing on Time-To-Market (TTM), GDScript will provide a fast, friendly, and capable
 way of developing your games.
 
-Note that C# support is still relatively new, and as such, you may encounter some
-issues along the way. Our friendly and hard-working development community is always
-ready to tackle new problems as they arise, but since this is an open source project,
-we recommend that you first do some due diligence yourself. Searching through
-discussions on `open issues <https://github.com/godotengine/godot/issues>`_ is a
-great way to start your troubleshooting.
+Note that C# support is still relatively new, and as such, you may encounter
+some issues along the way. C# support is also currently missing on Android, iOS
+and web platforms. Our friendly and hard-working development community is always
+ready to tackle new problems as they arise, but since this is an open source
+project, we recommend that you first do some due diligence yourself. Searching
+through discussions on
+`open issues <https://github.com/godotengine/godot/issues?q=is%3Aopen+is%3Aissue+label%3Atopic%3Adotnet>`__
+is a great way to start your troubleshooting.
 
 As for new languages, support is possible via third parties with GDExtensions. (See the question
 about plugins below). Work is currently underway, for example, on unofficial bindings for Godot
@@ -376,6 +378,20 @@ When is the next release of Godot out?
 When it's ready! See :ref:`doc_release_policy_when_is_next_release_out` for more
 information.
 
+Which Godot version should I use for a new project?
+---------------------------------------------------
+
+We recommend using Godot 4.x for new projects, but depending on the feature set
+you need, it may be better to use 3.x instead. See
+:ref:`doc_release_policy_which_version_should_i_use` for more information.
+
+Should I upgrade my project to use new Godot versions?
+------------------------------------------------------
+
+Some new versions are safer to upgrade to than others. In general, whether you
+should upgrade depends on your project's circumstances. See
+:ref:`doc_release_policy_should_i_upgrade_my_project` for more information.
+
 I would like to contribute! How can I get started?
 --------------------------------------------------
 

about/list_of_features.rst

@@ -433,7 +433,8 @@ Scripting
 
  - Full support for the C# 10.0 syntax and features.
 
-- Supports Windows, Linux and macOS.
+- Supports Windows, Linux and macOS. Mobile/web platforms are currently
+ unsupported. To use C# on mobile/web platforms, use Godot 3 instead.
 - Using an external editor is recommended to benefit from IDE functionality.
 
 **GDExtension (C, C++, Rust, D, ...):**