diff --git a/core/object/object.h b/core/object/object.h index c633208d7cd..ae22851c155 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -61,7 +61,6 @@ enum PropertyHint { PROPERTY_HINT_LAYERS_3D_RENDER, PROPERTY_HINT_LAYERS_3D_PHYSICS, PROPERTY_HINT_LAYERS_3D_NAVIGATION, - PROPERTY_HINT_LAYERS_AVOIDANCE, PROPERTY_HINT_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc," PROPERTY_HINT_DIR, ///< a directory path must be passed PROPERTY_HINT_GLOBAL_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc," @@ -86,6 +85,7 @@ enum PropertyHint { PROPERTY_HINT_NODE_TYPE, ///< a node object type PROPERTY_HINT_HIDE_QUATERNION_EDIT, /// Only Node3D::transform should hide the quaternion editor. PROPERTY_HINT_PASSWORD, + PROPERTY_HINT_LAYERS_AVOIDANCE, PROPERTY_HINT_MAX, }; diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml index 1ca44db11c0..ad68d2f8185 100644 --- a/doc/classes/@GlobalScope.xml +++ b/doc/classes/@GlobalScope.xml @@ -2695,39 +2695,39 @@ Hints that an [int] property is a bitmask using the optionally named 3D navigation layers. - + Hints that an integer property is a bitmask using the optionally named avoidance layers. - + Hints that a [String] property is a path to a file. Editing it will show a file dialog for picking the path. The hint string can be a set of filters with wildcards like [code]"*.png,*.jpg"[/code]. - + Hints that a [String] property is a path to a directory. Editing it will show a file dialog for picking the path. - + Hints that a [String] property is an absolute path to a file outside the project folder. Editing it will show a file dialog for picking the path. The hint string can be a set of filters with wildcards, like [code]"*.png,*.jpg"[/code]. - + Hints that a [String] property is an absolute path to a directory outside the project folder. Editing it will show a file dialog for picking the path. - + Hints that a property is an instance of a [Resource]-derived type, optionally specified via the hint string (e.g. [code]"Texture2D"[/code]). Editing it will show a popup menu of valid resource types to instantiate. - + Hints that a [String] property is text with line breaks. Editing it will show a text input field where line breaks can be typed. - + Hints that a [String] property is an [Expression]. - + Hints that a [String] property should show a placeholder text on its input field, if empty. The hint string is the placeholder text to use. - + Hints that a [Color] property should be edited without affecting its transparency ([member Color.a] is not editable). - + - + Hint that a property represents a particular type. If a property is [constant TYPE_STRING], allows to set a type from the create dialog. If you need to create an [Array] to contain elements of a specific type, the [code]hint_string[/code] must encode nested types using [code]":"[/code] and [code]"/"[/code] for specifying [Resource] types. For instance: [codeblock] hint_string = "%s:" % [TYPE_INT] # Array of integers. @@ -2737,34 +2737,34 @@ [/codeblock] [b]Note:[/b] The final colon is required for properly detecting built-in types. - + - + - + - + - + - + - + - + - + Hints that a string property is a locale code. Editing it will show a locale dialog for picking language and country. - + Hints that a dictionary property is string translation map. Dictionary keys are locale codes and, values are translated strings. - + - + Hints that a quaternion property should disable the temporary euler editor. - + Hints that a string property is a password, and every character is replaced with the secret character. diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/GodotEnums.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/GodotEnums.cs index b30c8c240e7..834beaa1311 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/GodotEnums.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/GodotEnums.cs @@ -86,7 +86,8 @@ namespace Godot.SourceGenerators NodeType = 34, HideQuaternionEdit = 35, Password = 36, - Max = 37 + LayersAvoidance = 37, + Max = 38 } [Flags]