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

Sync classref with current source

Rémi Verschelde 6 лет назад
Родитель
Сommit
33091c9623

+ 1 - 1
classes/class_animationnode.rst

@@ -209,7 +209,7 @@ Return ``true`` whether you want the blend tree editor to display filter editing
 
 
 - :ref:`bool<class_bool>` **is_path_filtered** **(** :ref:`NodePath<class_NodePath>` path **)** const
 - :ref:`bool<class_bool>` **is_path_filtered** **(** :ref:`NodePath<class_NodePath>` path **)** const
 
 
-Return ``true`` wether a given path is filtered.
+Return ``true`` whether a given path is filtered.
 
 
 .. _class_AnimationNode_method_process:
 .. _class_AnimationNode_method_process:
 
 

+ 1 - 1
classes/class_animationnodestatemachine.rst

@@ -68,7 +68,7 @@ Methods
 Description
 Description
 -----------
 -----------
 
 
-Contains multiple root nodes as children in a graph. Each node is used as a state, and provides multiple functions to alternate between states. Retrieve the AnimationNodeStateMachinePlayback object from the :ref:`AnimationTree<class_AnimationTree>` node to control it programatically.
+Contains multiple root nodes as children in a graph. Each node is used as a state, and provides multiple functions to alternate between states. Retrieve the AnimationNodeStateMachinePlayback object from the :ref:`AnimationTree<class_AnimationTree>` node to control it programmatically.
 
 
 ::
 ::
 
 

+ 5 - 1
classes/class_animationnodestatemachinetransition.rst

@@ -72,7 +72,11 @@ Property Descriptions
 | *Getter* | get_advance_condition()      |
 | *Getter* | get_advance_condition()      |
 +----------+------------------------------+
 +----------+------------------------------+
 
 
-Turn on auto advance when this condition is set. This is a custom text field that can be filled with a variable name. The variable can be modified from code.
+Turn on auto advance when this condition is set. The provided name will become a boolean parameter on the :ref:`AnimationTree<class_AnimationTree>` that can be controlled from code (see :ref:`https://docs.godotengine.org/en/latest/tutorials/animation/animation_tree.html#controlling-from-code<https://docs.godotengine.org/en/latest/tutorials/animation/animation_tree.html#controlling-from-code>`). For example, if :ref:`AnimationTree.tree_root<class_AnimationTree_property_tree_root>` is an :ref:`AnimationNodeStateMachine<class_AnimationNodeStateMachine>` and :ref:`advance_condition<class_AnimationNodeStateMachineTransition_property_advance_condition>` is set to "idle":
+
+::
+
+    $animation_tree["parameters/conditions/idle"] = is_on_floor and linear_velocity.x == 0
 
 
 .. _class_AnimationNodeStateMachineTransition_property_auto_advance:
 .. _class_AnimationNodeStateMachineTransition_property_auto_advance:
 
 

+ 20 - 2
classes/class_control.rst

@@ -195,7 +195,7 @@ Methods
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | void                                         | :ref:`set_anchors_and_margins_preset<class_Control_method_set_anchors_and_margins_preset>` **(** :ref:`LayoutPreset<enum_Control_LayoutPreset>` preset, :ref:`LayoutPresetMode<enum_Control_LayoutPresetMode>` resize_mode=0, :ref:`int<class_int>` margin=0 **)** |
 | void                                         | :ref:`set_anchors_and_margins_preset<class_Control_method_set_anchors_and_margins_preset>` **(** :ref:`LayoutPreset<enum_Control_LayoutPreset>` preset, :ref:`LayoutPresetMode<enum_Control_LayoutPresetMode>` resize_mode=0, :ref:`int<class_int>` margin=0 **)** |
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| void                                         | :ref:`set_anchors_preset<class_Control_method_set_anchors_preset>` **(** :ref:`LayoutPreset<enum_Control_LayoutPreset>` preset, :ref:`bool<class_bool>` keep_margin=false **)**                                                                                    |
+| void                                         | :ref:`set_anchors_preset<class_Control_method_set_anchors_preset>` **(** :ref:`LayoutPreset<enum_Control_LayoutPreset>` preset, :ref:`bool<class_bool>` keep_margins=false **)**                                                                                   |
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | void                                         | :ref:`set_begin<class_Control_method_set_begin>` **(** :ref:`Vector2<class_Vector2>` position **)**                                                                                                                                                                |
 | void                                         | :ref:`set_begin<class_Control_method_set_begin>` **(** :ref:`Vector2<class_Vector2>` position **)**                                                                                                                                                                |
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -205,10 +205,16 @@ Methods
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | void                                         | :ref:`set_end<class_Control_method_set_end>` **(** :ref:`Vector2<class_Vector2>` position **)**                                                                                                                                                                    |
 | void                                         | :ref:`set_end<class_Control_method_set_end>` **(** :ref:`Vector2<class_Vector2>` position **)**                                                                                                                                                                    |
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| void                                         | :ref:`set_global_position<class_Control_method_set_global_position>` **(** :ref:`Vector2<class_Vector2>` position, :ref:`bool<class_bool>` keep_margins=false **)**                                                                                                |
++----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | void                                         | :ref:`set_margins_preset<class_Control_method_set_margins_preset>` **(** :ref:`LayoutPreset<enum_Control_LayoutPreset>` preset, :ref:`LayoutPresetMode<enum_Control_LayoutPresetMode>` resize_mode=0, :ref:`int<class_int>` margin=0 **)**                         |
 | void                                         | :ref:`set_margins_preset<class_Control_method_set_margins_preset>` **(** :ref:`LayoutPreset<enum_Control_LayoutPreset>` preset, :ref:`LayoutPresetMode<enum_Control_LayoutPresetMode>` resize_mode=0, :ref:`int<class_int>` margin=0 **)**                         |
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| void                                         | :ref:`set_position<class_Control_method_set_position>` **(** :ref:`Vector2<class_Vector2>` position, :ref:`bool<class_bool>` keep_margins=false **)**                                                                                                              |
++----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | void                                         | :ref:`set_rotation<class_Control_method_set_rotation>` **(** :ref:`float<class_float>` radians **)**                                                                                                                                                               |
 | void                                         | :ref:`set_rotation<class_Control_method_set_rotation>` **(** :ref:`float<class_float>` radians **)**                                                                                                                                                               |
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| void                                         | :ref:`set_size<class_Control_method_set_size>` **(** :ref:`Vector2<class_Vector2>` size, :ref:`bool<class_bool>` keep_margins=false **)**                                                                                                                          |
++----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | void                                         | :ref:`show_modal<class_Control_method_show_modal>` **(** :ref:`bool<class_bool>` exclusive=false **)**                                                                                                                                                             |
 | void                                         | :ref:`show_modal<class_Control_method_show_modal>` **(** :ref:`bool<class_bool>` exclusive=false **)**                                                                                                                                                             |
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +----------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | void                                         | :ref:`warp_mouse<class_Control_method_warp_mouse>` **(** :ref:`Vector2<class_Vector2>` to_position **)**                                                                                                                                                           |
 | void                                         | :ref:`warp_mouse<class_Control_method_warp_mouse>` **(** :ref:`Vector2<class_Vector2>` to_position **)**                                                                                                                                                           |
@@ -1275,7 +1281,7 @@ Give up the focus. No other control will be able to receive keyboard input.
 
 
 .. _class_Control_method_set_anchors_preset:
 .. _class_Control_method_set_anchors_preset:
 
 
-- void **set_anchors_preset** **(** :ref:`LayoutPreset<enum_Control_LayoutPreset>` preset, :ref:`bool<class_bool>` keep_margin=false **)**
+- void **set_anchors_preset** **(** :ref:`LayoutPreset<enum_Control_LayoutPreset>` preset, :ref:`bool<class_bool>` keep_margins=false **)**
 
 
 .. _class_Control_method_set_begin:
 .. _class_Control_method_set_begin:
 
 
@@ -1326,16 +1332,28 @@ Shows the given control at the mouse pointer. A good time to call this method is
 
 
 Sets :ref:`margin_right<class_Control_property_margin_right>` and :ref:`margin_bottom<class_Control_property_margin_bottom>` at the same time.
 Sets :ref:`margin_right<class_Control_property_margin_right>` and :ref:`margin_bottom<class_Control_property_margin_bottom>` at the same time.
 
 
+.. _class_Control_method_set_global_position:
+
+- void **set_global_position** **(** :ref:`Vector2<class_Vector2>` position, :ref:`bool<class_bool>` keep_margins=false **)**
+
 .. _class_Control_method_set_margins_preset:
 .. _class_Control_method_set_margins_preset:
 
 
 - void **set_margins_preset** **(** :ref:`LayoutPreset<enum_Control_LayoutPreset>` preset, :ref:`LayoutPresetMode<enum_Control_LayoutPresetMode>` resize_mode=0, :ref:`int<class_int>` margin=0 **)**
 - void **set_margins_preset** **(** :ref:`LayoutPreset<enum_Control_LayoutPreset>` preset, :ref:`LayoutPresetMode<enum_Control_LayoutPresetMode>` resize_mode=0, :ref:`int<class_int>` margin=0 **)**
 
 
+.. _class_Control_method_set_position:
+
+- void **set_position** **(** :ref:`Vector2<class_Vector2>` position, :ref:`bool<class_bool>` keep_margins=false **)**
+
 .. _class_Control_method_set_rotation:
 .. _class_Control_method_set_rotation:
 
 
 - void **set_rotation** **(** :ref:`float<class_float>` radians **)**
 - void **set_rotation** **(** :ref:`float<class_float>` radians **)**
 
 
 Sets the rotation (in radians).
 Sets the rotation (in radians).
 
 
+.. _class_Control_method_set_size:
+
+- void **set_size** **(** :ref:`Vector2<class_Vector2>` size, :ref:`bool<class_bool>` keep_margins=false **)**
+
 .. _class_Control_method_show_modal:
 .. _class_Control_method_show_modal:
 
 
 - void **show_modal** **(** :ref:`bool<class_bool>` exclusive=false **)**
 - void **show_modal** **(** :ref:`bool<class_bool>` exclusive=false **)**

+ 1 - 1
classes/class_editorinspectorplugin.rst

@@ -61,7 +61,7 @@ Method Descriptions
 
 
 - void **add_custom_control** **(** :ref:`Control<class_Control>` control **)**
 - void **add_custom_control** **(** :ref:`Control<class_Control>` control **)**
 
 
-Add a custom control, not necesarily a property editor.
+Add a custom control, not necessarily a property editor.
 
 
 .. _class_EditorInspectorPlugin_method_add_property_editor:
 .. _class_EditorInspectorPlugin_method_add_property_editor:
 
 

+ 2 - 0
classes/class_editorplugin.rst

@@ -560,3 +560,5 @@ Restore the plugin GUI layout saved by :ref:`get_window_layout<class_EditorPlugi
 
 
 - :ref:`int<class_int>` **update_overlays** **(** **)** const
 - :ref:`int<class_int>` **update_overlays** **(** **)** const
 
 
+Updates the overlays of the editor (2D/3D) viewport.
+

+ 4 - 0
classes/class_image.rst

@@ -297,6 +297,8 @@ enum **Format**:
 
 
 .. _class_Image_constant_INTERPOLATE_TRILINEAR:
 .. _class_Image_constant_INTERPOLATE_TRILINEAR:
 
 
+.. _class_Image_constant_INTERPOLATE_LANCZOS:
+
 enum **Interpolation**:
 enum **Interpolation**:
 
 
 - **INTERPOLATE_NEAREST** = **0**
 - **INTERPOLATE_NEAREST** = **0**
@@ -313,6 +315,8 @@ If the image does not have mipmaps, they will be generated and used internally,
 
 
 On the other hand, if the image already has mipmaps, they will be used, and a new set will be generated for the resulting image.
 On the other hand, if the image already has mipmaps, they will be used, and a new set will be generated for the resulting image.
 
 
+- **INTERPOLATE_LANCZOS** = **4**
+
 .. _enum_Image_AlphaMode:
 .. _enum_Image_AlphaMode:
 
 
 .. _class_Image_constant_ALPHA_NONE:
 .. _class_Image_constant_ALPHA_NONE:

+ 1 - 1
classes/class_networkedmultiplayerenet.rst

@@ -116,7 +116,7 @@ Always use ``TRANSFER_MODE_ORDERED`` in place of ``TRANSFER_MODE_UNRELIABLE``. T
 | *Getter* | get_channel_count()      |
 | *Getter* | get_channel_count()      |
 +----------+--------------------------+
 +----------+--------------------------+
 
 
-The number of channels to be used by ENet. Default: ``3``. Channels are used to separate different kinds of data. In realiable or ordered mode, for example, the packet delivery order is ensured on a per channel basis.
+The number of channels to be used by ENet. Default: ``3``. Channels are used to separate different kinds of data. In reliable or ordered mode, for example, the packet delivery order is ensured on a per channel basis.
 
 
 .. _class_NetworkedMultiplayerENet_property_compression_mode:
 .. _class_NetworkedMultiplayerENet_property_compression_mode:
 
 

+ 20 - 0
classes/class_object.rst

@@ -30,6 +30,8 @@ Methods
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | :ref:`bool<class_bool>`                       | :ref:`_set<class_Object_method__set>` **(** :ref:`String<class_String>` property, :ref:`Variant<class_Variant>` value **)** virtual                                                                                                     |
 | :ref:`bool<class_bool>`                       | :ref:`_set<class_Object_method__set>` **(** :ref:`String<class_String>` property, :ref:`Variant<class_Variant>` value **)** virtual                                                                                                     |
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| :ref:`String<class_String>`                   | :ref:`_to_string<class_Object_method__to_string>` **(** **)** virtual                                                                                                                                                                   |
++-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | void                                          | :ref:`add_user_signal<class_Object_method_add_user_signal>` **(** :ref:`String<class_String>` signal, :ref:`Array<class_Array>` arguments=[  ] **)**                                                                                    |
 | void                                          | :ref:`add_user_signal<class_Object_method_add_user_signal>` **(** :ref:`String<class_String>` signal, :ref:`Array<class_Array>` arguments=[  ] **)**                                                                                    |
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | :ref:`Variant<class_Variant>`                 | :ref:`call<class_Object_method_call>` **(** :ref:`String<class_String>` method, ... **)** vararg                                                                                                                                        |
 | :ref:`Variant<class_Variant>`                 | :ref:`call<class_Object_method_call>` **(** :ref:`String<class_String>` method, ... **)** vararg                                                                                                                                        |
@@ -106,6 +108,8 @@ Methods
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | void                                          | :ref:`set_script<class_Object_method_set_script>` **(** :ref:`Reference<class_Reference>` script **)**                                                                                                                                  |
 | void                                          | :ref:`set_script<class_Object_method_set_script>` **(** :ref:`Reference<class_Reference>` script **)**                                                                                                                                  |
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| :ref:`String<class_String>`                   | :ref:`to_string<class_Object_method_to_string>` **(** **)**                                                                                                                                                                             |
++-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | :ref:`String<class_String>`                   | :ref:`tr<class_Object_method_tr>` **(** :ref:`String<class_String>` message **)** const                                                                                                                                                 |
 | :ref:`String<class_String>`                   | :ref:`tr<class_Object_method_tr>` **(** :ref:`String<class_String>` message **)** const                                                                                                                                                 |
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +-----------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
 
@@ -200,6 +204,14 @@ Notify the object internally using an ID.
 
 
 Sets a property. Returns ``true`` if the ``property`` exists.
 Sets a property. Returns ``true`` if the ``property`` exists.
 
 
+.. _class_Object_method__to_string:
+
+- :ref:`String<class_String>` **_to_string** **(** **)** virtual
+
+Returns a :ref:`String<class_String>` representing the object. Default is ``"[ClassName:RID]"``.
+
+Override this method to customize the :ref:`String<class_String>` representation of the object when it's being converted to a string, for example: ``print(obj)``.
+
 .. _class_Object_method_add_user_signal:
 .. _class_Object_method_add_user_signal:
 
 
 - void **add_user_signal** **(** :ref:`String<class_String>` signal, :ref:`Array<class_Array>` arguments=[  ] **)**
 - void **add_user_signal** **(** :ref:`String<class_String>` signal, :ref:`Array<class_Array>` arguments=[  ] **)**
@@ -430,6 +442,14 @@ Set a metadata into the object. Metadata is serialized. Metadata can be *anythin
 
 
 Set a script into the object, scripts extend the object functionality.
 Set a script into the object, scripts extend the object functionality.
 
 
+.. _class_Object_method_to_string:
+
+- :ref:`String<class_String>` **to_string** **(** **)**
+
+Returns a :ref:`String<class_String>` representing the object. Default is ``"[ClassName:RID]"``.
+
+Override the method :ref:`_to_string<class_Object_method__to_string>` to customize the :ref:`String<class_String>` representation.
+
 .. _class_Object_method_tr:
 .. _class_Object_method_tr:
 
 
 - :ref:`String<class_String>` **tr** **(** :ref:`String<class_String>` message **)** const
 - :ref:`String<class_String>` **tr** **(** :ref:`String<class_String>` message **)** const

+ 9 - 5
classes/class_physicsbody.rst

@@ -71,10 +71,12 @@ Property Descriptions
 
 
 The physics layers this area is in.
 The physics layers this area is in.
 
 
-Collidable objects can exist in any of 32 different layers. These layers work like a tagging system, and are not visual. A collidable can use these layers to select with which objects it can collide, using the collision_mask property.
+Collidable objects can exist in any of 32 different layers. These layers work like a tagging system, and are not visual. A collidable can use these layers to select with which objects it can collide, using the :ref:`collision_mask<class_PhysicsBody_property_collision_mask>` property.
 
 
 A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
 A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
 
 
+Default value: 1 (the first layer/bit is enabled).
+
 .. _class_PhysicsBody_property_collision_mask:
 .. _class_PhysicsBody_property_collision_mask:
 
 
 - :ref:`int<class_int>` **collision_mask**
 - :ref:`int<class_int>` **collision_mask**
@@ -87,6 +89,8 @@ A contact is detected if object A is in any of the layers that object B scans, o
 
 
 The physics layers this area scans for collisions.
 The physics layers this area scans for collisions.
 
 
+Default value: 1 (the first layer/bit is enabled).
+
 Method Descriptions
 Method Descriptions
 -------------------
 -------------------
 
 
@@ -106,13 +110,13 @@ Returns an array of nodes that were added as collision exceptions for this body.
 
 
 - :ref:`bool<class_bool>` **get_collision_layer_bit** **(** :ref:`int<class_int>` bit **)** const
 - :ref:`bool<class_bool>` **get_collision_layer_bit** **(** :ref:`int<class_int>` bit **)** const
 
 
-Returns an individual bit on the collision mask.
+Returns an individual bit on the :ref:`collision_layer<class_PhysicsBody_property_collision_layer>`.
 
 
 .. _class_PhysicsBody_method_get_collision_mask_bit:
 .. _class_PhysicsBody_method_get_collision_mask_bit:
 
 
 - :ref:`bool<class_bool>` **get_collision_mask_bit** **(** :ref:`int<class_int>` bit **)** const
 - :ref:`bool<class_bool>` **get_collision_mask_bit** **(** :ref:`int<class_int>` bit **)** const
 
 
-Returns an individual bit on the collision mask.
+Returns an individual bit on the :ref:`collision_mask<class_PhysicsBody_property_collision_mask>`.
 
 
 .. _class_PhysicsBody_method_remove_collision_exception_with:
 .. _class_PhysicsBody_method_remove_collision_exception_with:
 
 
@@ -124,11 +128,11 @@ Removes a body from the list of bodies that this body can't collide with.
 
 
 - void **set_collision_layer_bit** **(** :ref:`int<class_int>` bit, :ref:`bool<class_bool>` value **)**
 - void **set_collision_layer_bit** **(** :ref:`int<class_int>` bit, :ref:`bool<class_bool>` value **)**
 
 
-Sets individual bits on the layer mask. Use this if you only need to change one layer's value.
+Sets individual bits on the :ref:`collision_layer<class_PhysicsBody_property_collision_layer>` bitmask. Use this if you only need to change one layer's value.
 
 
 .. _class_PhysicsBody_method_set_collision_mask_bit:
 .. _class_PhysicsBody_method_set_collision_mask_bit:
 
 
 - void **set_collision_mask_bit** **(** :ref:`int<class_int>` bit, :ref:`bool<class_bool>` value **)**
 - void **set_collision_mask_bit** **(** :ref:`int<class_int>` bit, :ref:`bool<class_bool>` value **)**
 
 
-Sets individual bits on the collision mask. Use this if you only need to change one layer's value.
+Sets individual bits on the :ref:`collision_mask<class_PhysicsBody_property_collision_mask>` bitmask. Use this if you only need to change one layer's value.
 
 

+ 9 - 5
classes/class_physicsbody2d.rst

@@ -73,10 +73,12 @@ Property Descriptions
 
 
 The physics layers this area is in.
 The physics layers this area is in.
 
 
-Collidable objects can exist in any of 32 different layers. These layers work like a tagging system, and are not visual. A collidable can use these layers to select with which objects it can collide, using the collision_mask property.
+Collidable objects can exist in any of 32 different layers. These layers work like a tagging system, and are not visual. A collidable can use these layers to select with which objects it can collide, using the :ref:`collision_mask<class_PhysicsBody2D_property_collision_mask>` property.
 
 
 A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
 A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
 
 
+Default value: 1 (the first layer/bit is enabled).
+
 .. _class_PhysicsBody2D_property_collision_mask:
 .. _class_PhysicsBody2D_property_collision_mask:
 
 
 - :ref:`int<class_int>` **collision_mask**
 - :ref:`int<class_int>` **collision_mask**
@@ -89,6 +91,8 @@ A contact is detected if object A is in any of the layers that object B scans, o
 
 
 The physics layers this area scans for collisions.
 The physics layers this area scans for collisions.
 
 
+Default value: 1 (the first layer/bit is enabled).
+
 .. _class_PhysicsBody2D_property_layers:
 .. _class_PhysicsBody2D_property_layers:
 
 
 - :ref:`int<class_int>` **layers**
 - :ref:`int<class_int>` **layers**
@@ -114,13 +118,13 @@ Returns an array of nodes that were added as collision exceptions for this body.
 
 
 - :ref:`bool<class_bool>` **get_collision_layer_bit** **(** :ref:`int<class_int>` bit **)** const
 - :ref:`bool<class_bool>` **get_collision_layer_bit** **(** :ref:`int<class_int>` bit **)** const
 
 
-Returns an individual bit on the collision mask.
+Returns an individual bit on the :ref:`collision_layer<class_PhysicsBody2D_property_collision_layer>`.
 
 
 .. _class_PhysicsBody2D_method_get_collision_mask_bit:
 .. _class_PhysicsBody2D_method_get_collision_mask_bit:
 
 
 - :ref:`bool<class_bool>` **get_collision_mask_bit** **(** :ref:`int<class_int>` bit **)** const
 - :ref:`bool<class_bool>` **get_collision_mask_bit** **(** :ref:`int<class_int>` bit **)** const
 
 
-Returns an individual bit on the collision mask.
+Returns an individual bit on the :ref:`collision_mask<class_PhysicsBody2D_property_collision_mask>`.
 
 
 .. _class_PhysicsBody2D_method_remove_collision_exception_with:
 .. _class_PhysicsBody2D_method_remove_collision_exception_with:
 
 
@@ -132,11 +136,11 @@ Removes a body from the list of bodies that this body can't collide with.
 
 
 - void **set_collision_layer_bit** **(** :ref:`int<class_int>` bit, :ref:`bool<class_bool>` value **)**
 - void **set_collision_layer_bit** **(** :ref:`int<class_int>` bit, :ref:`bool<class_bool>` value **)**
 
 
-Sets individual bits on the layer mask. Use this if you only need to change one layer's value.
+Sets individual bits on the :ref:`collision_layer<class_PhysicsBody2D_property_collision_layer>` bitmask. Use this if you only need to change one layer's value.
 
 
 .. _class_PhysicsBody2D_method_set_collision_mask_bit:
 .. _class_PhysicsBody2D_method_set_collision_mask_bit:
 
 
 - void **set_collision_mask_bit** **(** :ref:`int<class_int>` bit, :ref:`bool<class_bool>` value **)**
 - void **set_collision_mask_bit** **(** :ref:`int<class_int>` bit, :ref:`bool<class_bool>` value **)**
 
 
-Sets individual bits on the collision mask. Use this if you only need to change one layer's value.
+Sets individual bits on the :ref:`collision_mask<class_PhysicsBody2D_property_collision_mask>` bitmask. Use this if you only need to change one layer's value.
 
 

+ 1 - 1
classes/class_prismmesh.rst

@@ -49,7 +49,7 @@ Property Descriptions
 | *Getter* | get_left_to_right()      |
 | *Getter* | get_left_to_right()      |
 +----------+--------------------------+
 +----------+--------------------------+
 
 
-Displacement of the upper edge along the x-axis. 0.0 positions edge straight above the bottome left edge. Defaults to 0.5 (positioned on the midpoint).
+Displacement of the upper edge along the x-axis. 0.0 positions edge straight above the bottom left edge. Defaults to 0.5 (positioned on the midpoint).
 
 
 .. _class_PrismMesh_property_size:
 .. _class_PrismMesh_property_size:
 
 

+ 5 - 0
classes/class_string.rst

@@ -214,6 +214,11 @@ Description
 
 
 This is the built-in string class (and the one used by GDScript). It supports Unicode and provides all necessary means for string handling. Strings are reference counted and use a copy-on-write approach, so passing them around is cheap in resources.
 This is the built-in string class (and the one used by GDScript). It supports Unicode and provides all necessary means for string handling. Strings are reference counted and use a copy-on-write approach, so passing them around is cheap in resources.
 
 
+Tutorials
+---------
+
+- :doc:`../getting_started/scripting/gdscript/gdscript_format_string`
+
 Method Descriptions
 Method Descriptions
 -------------------
 -------------------
 
 

+ 18 - 0
classes/class_textedit.rst

@@ -32,6 +32,8 @@ Properties
 +-----------------------------+-------------------------------------------------------------------------------------------+
 +-----------------------------+-------------------------------------------------------------------------------------------+
 | :ref:`bool<class_bool>`     | :ref:`context_menu_enabled<class_TextEdit_property_context_menu_enabled>`                 |
 | :ref:`bool<class_bool>`     | :ref:`context_menu_enabled<class_TextEdit_property_context_menu_enabled>`                 |
 +-----------------------------+-------------------------------------------------------------------------------------------+
 +-----------------------------+-------------------------------------------------------------------------------------------+
+| :ref:`bool<class_bool>`     | :ref:`draw_spaces<class_TextEdit_property_draw_spaces>`                                   |
++-----------------------------+-------------------------------------------------------------------------------------------+
 | :ref:`bool<class_bool>`     | :ref:`draw_tabs<class_TextEdit_property_draw_tabs>`                                       |
 | :ref:`bool<class_bool>`     | :ref:`draw_tabs<class_TextEdit_property_draw_tabs>`                                       |
 +-----------------------------+-------------------------------------------------------------------------------------------+
 +-----------------------------+-------------------------------------------------------------------------------------------+
 | :ref:`bool<class_bool>`     | :ref:`fold_gutter<class_TextEdit_property_fold_gutter>`                                   |
 | :ref:`bool<class_bool>`     | :ref:`fold_gutter<class_TextEdit_property_fold_gutter>`                                   |
@@ -154,6 +156,8 @@ Theme Properties
 +---------------------------------+-----------------------------+
 +---------------------------------+-----------------------------+
 | :ref:`Color<class_Color>`       | background_color            |
 | :ref:`Color<class_Color>`       | background_color            |
 +---------------------------------+-----------------------------+
 +---------------------------------+-----------------------------+
+| :ref:`Color<class_Color>`       | bookmark_color              |
++---------------------------------+-----------------------------+
 | :ref:`Color<class_Color>`       | brace_mismatch_color        |
 | :ref:`Color<class_Color>`       | brace_mismatch_color        |
 +---------------------------------+-----------------------------+
 +---------------------------------+-----------------------------+
 | :ref:`Color<class_Color>`       | breakpoint_color            |
 | :ref:`Color<class_Color>`       | breakpoint_color            |
@@ -218,6 +222,8 @@ Theme Properties
 +---------------------------------+-----------------------------+
 +---------------------------------+-----------------------------+
 | :ref:`Color<class_Color>`       | selection_color             |
 | :ref:`Color<class_Color>`       | selection_color             |
 +---------------------------------+-----------------------------+
 +---------------------------------+-----------------------------+
+| :ref:`Texture<class_Texture>`   | space                       |
++---------------------------------+-----------------------------+
 | :ref:`Color<class_Color>`       | symbol_color                |
 | :ref:`Color<class_Color>`       | symbol_color                |
 +---------------------------------+-----------------------------+
 +---------------------------------+-----------------------------+
 | :ref:`Texture<class_Texture>`   | tab                         |
 | :ref:`Texture<class_Texture>`   | tab                         |
@@ -397,6 +403,18 @@ If ``false``, the context menu disregards mouse location.
 
 
 If ``true``, a right click displays the context menu.
 If ``true``, a right click displays the context menu.
 
 
+.. _class_TextEdit_property_draw_spaces:
+
+- :ref:`bool<class_bool>` **draw_spaces**
+
++----------+------------------------+
+| *Setter* | set_draw_spaces(value) |
++----------+------------------------+
+| *Getter* | is_drawing_spaces()    |
++----------+------------------------+
+
+If ``true``, the "space" character will have a visible representation.
+
 .. _class_TextEdit_property_draw_tabs:
 .. _class_TextEdit_property_draw_tabs:
 
 
 - :ref:`bool<class_bool>` **draw_tabs**
 - :ref:`bool<class_bool>` **draw_tabs**

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
classes/class_visualshadernode.rst


+ 18 - 0
classes/class_visualshadernodefresnel.rst

@@ -0,0 +1,18 @@
+.. Generated automatically by doc/tools/makerst.py in Godot's source tree.
+.. DO NOT EDIT THIS FILE, but the VisualShaderNodeFresnel.xml source instead.
+.. The source is found in doc/classes or modules/<name>/doc_classes.
+
+.. _class_VisualShaderNodeFresnel:
+
+VisualShaderNodeFresnel
+=======================
+
+**Inherits:** :ref:`VisualShaderNode<class_VisualShaderNode>` **<** :ref:`Resource<class_Resource>` **<** :ref:`Reference<class_Reference>` **<** :ref:`Object<class_Object>`
+
+**Category:** Core
+
+Brief Description
+-----------------
+
+
+

+ 4 - 0
classes/class_visualshadernodescalarfunc.rst

@@ -90,6 +90,8 @@ Enumerations
 
 
 .. _class_VisualShaderNodeScalarFunc_constant_FUNC_TRUNC:
 .. _class_VisualShaderNodeScalarFunc_constant_FUNC_TRUNC:
 
 
+.. _class_VisualShaderNodeScalarFunc_constant_FUNC_ONEMINUS:
+
 enum **Function**:
 enum **Function**:
 
 
 - **FUNC_SIN** = **0**
 - **FUNC_SIN** = **0**
@@ -154,6 +156,8 @@ enum **Function**:
 
 
 - **FUNC_TRUNC** = **30**
 - **FUNC_TRUNC** = **30**
 
 
+- **FUNC_ONEMINUS** = **31**
+
 Property Descriptions
 Property Descriptions
 ---------------------
 ---------------------
 
 

+ 4 - 0
classes/class_visualshadernodevectorfunc.rst

@@ -96,6 +96,8 @@ Enumerations
 
 
 .. _class_VisualShaderNodeVectorFunc_constant_FUNC_TRUNC:
 .. _class_VisualShaderNodeVectorFunc_constant_FUNC_TRUNC:
 
 
+.. _class_VisualShaderNodeVectorFunc_constant_FUNC_ONEMINUS:
+
 enum **Function**:
 enum **Function**:
 
 
 - **FUNC_NORMALIZE** = **0**
 - **FUNC_NORMALIZE** = **0**
@@ -166,6 +168,8 @@ enum **Function**:
 
 
 - **FUNC_TRUNC** = **33**
 - **FUNC_TRUNC** = **33**
 
 
+- **FUNC_ONEMINUS** = **34**
+
 Property Descriptions
 Property Descriptions
 ---------------------
 ---------------------
 
 

Некоторые файлы не были показаны из-за большого количества измененных файлов