Merge pull request #61183 from timothyqiu/interpolate-if

This commit is contained in:
Rémi Verschelde 2022-05-19 13:30:17 +02:00 committed by GitHub
commit 2e6b9ec207
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 12 deletions

View file

@ -172,7 +172,7 @@
</members> </members>
<constants> <constants>
<constant name="NO_INDEX_ARRAY" value="-1"> <constant name="NO_INDEX_ARRAY" value="-1">
Default value used for index_array_len when no indices are present. Value used internally when no indices are present.
</constant> </constant>
<constant name="ARRAY_WEIGHTS_SIZE" value="4"> <constant name="ARRAY_WEIGHTS_SIZE" value="4">
Amount of weights/bone indices per vertex (always 4). Amount of weights/bone indices per vertex (always 4).

View file

@ -39,7 +39,7 @@
<method name="is_scanning" qualifiers="const"> <method name="is_scanning" qualifiers="const">
<return type="bool" /> <return type="bool" />
<description> <description>
Returns [code]true[/code] of the filesystem is being scanned. Returns [code]true[/code] if the filesystem is being scanned.
</description> </description>
</method> </method>
<method name="scan"> <method name="scan">

View file

@ -392,7 +392,7 @@
<return type="bool" /> <return type="bool" />
<description> <description>
Returns [code]true[/code] if the physics interpolated flag is set for this Node (see [member physics_interpolation_mode]). Returns [code]true[/code] if the physics interpolated flag is set for this Node (see [member physics_interpolation_mode]).
[b]Note:[/b] Interpolation will only be active is both the flag is set [b]and[/b] physics interpolation is enabled within the [SceneTree]. This can be tested using [method is_physics_interpolated_and_enabled]. [b]Note:[/b] Interpolation will only be active if both the flag is set [b]and[/b] physics interpolation is enabled within the [SceneTree]. This can be tested using [method is_physics_interpolated_and_enabled].
</description> </description>
</method> </method>
<method name="is_physics_interpolated_and_enabled" qualifiers="const"> <method name="is_physics_interpolated_and_enabled" qualifiers="const">

View file

@ -249,7 +249,7 @@
<return type="String" /> <return type="String" />
<argument index="0" name="idx" type="int" /> <argument index="0" name="idx" type="int" />
<description> <description>
Returns the tooltip associated with the specified index index [code]idx[/code]. Returns the tooltip associated with the specified index [code]idx[/code].
</description> </description>
</method> </method>
<method name="is_hide_on_window_lose_focus" qualifiers="const"> <method name="is_hide_on_window_lose_focus" qualifiers="const">

View file

@ -430,7 +430,7 @@
The default text font. The default text font.
</theme_item> </theme_item>
<theme_item name="focus" data_type="style" type="StyleBox"> <theme_item name="focus" data_type="style" type="StyleBox">
The background The background used when the [RichTextLabel] is focused. The background used when the [RichTextLabel] is focused.
</theme_item> </theme_item>
<theme_item name="normal" data_type="style" type="StyleBox"> <theme_item name="normal" data_type="style" type="StyleBox">
The normal background for the [RichTextLabel]. The normal background for the [RichTextLabel].

View file

@ -125,7 +125,7 @@
When set to an empty string, the [code]address[/code] parameter passed to [method create_client] is used instead. When set to an empty string, the [code]address[/code] parameter passed to [method create_client] is used instead.
</member> </member>
<member name="dtls_verify" type="bool" setter="set_dtls_verify_enabled" getter="is_dtls_verify_enabled" default="true"> <member name="dtls_verify" type="bool" setter="set_dtls_verify_enabled" getter="is_dtls_verify_enabled" default="true">
Enable or disable certificate verification when [member use_dtls] [code]true[/code]. Enable or disable certificate verification when [member use_dtls] is [code]true[/code].
</member> </member>
<member name="refuse_new_connections" type="bool" setter="set_refuse_new_connections" getter="is_refusing_new_connections" overrides="NetworkedMultiplayerPeer" default="false" /> <member name="refuse_new_connections" type="bool" setter="set_refuse_new_connections" getter="is_refusing_new_connections" overrides="NetworkedMultiplayerPeer" default="false" />
<member name="server_relay" type="bool" setter="set_server_relay_enabled" getter="is_server_relay_enabled" default="true"> <member name="server_relay" type="bool" setter="set_server_relay_enabled" getter="is_server_relay_enabled" default="true">

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<class name="VideoStreamGDNative" inherits="VideoStream" version="3.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd"> <class name="VideoStreamGDNative" inherits="VideoStream" version="3.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
<brief_description> <brief_description>
[VideoStream] resource for for video formats implemented via GDNative. [VideoStream] resource for video formats implemented via GDNative.
</brief_description> </brief_description>
<description> <description>
[VideoStream] resource for for video formats implemented via GDNative. [VideoStream] resource for video formats implemented via GDNative.
It can be used via [url=https://github.com/KidRigger/godot-videodecoder]godot-videodecoder[/url] which uses the [url=https://ffmpeg.org]FFmpeg[/url] library. It can be used via [url=https://github.com/KidRigger/godot-videodecoder]godot-videodecoder[/url] which uses the [url=https://ffmpeg.org]FFmpeg[/url] library.
</description> </description>
<tutorials> <tutorials>

View file

@ -2166,7 +2166,7 @@ public:
Node *another = node->get_node(node_path); Node *another = node->get_node(node_path);
if (!another) { if (!another) {
r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
r_error_str = RTR("Path does not lead Node!"); r_error_str = RTR("Path does not lead to Node!");
return 0; return 0;
} }

View file

@ -256,7 +256,7 @@
</signals> </signals>
<constants> <constants>
<constant name="TARGET_RAY_MODE_UNKNOWN" value="0" enum="TargetRayMode"> <constant name="TARGET_RAY_MODE_UNKNOWN" value="0" enum="TargetRayMode">
We don't know the the target ray mode. We don't know the target ray mode.
</constant> </constant>
<constant name="TARGET_RAY_MODE_GAZE" value="1" enum="TargetRayMode"> <constant name="TARGET_RAY_MODE_GAZE" value="1" enum="TargetRayMode">
Target ray originates at the viewer's eyes and points in the direction they are looking. Target ray originates at the viewer's eyes and points in the direction they are looking.

View file

@ -2893,14 +2893,14 @@ bool ShaderLanguage::_validate_varying_assign(ShaderNode::Varying &p_varying, St
case ShaderNode::Varying::STAGE_VERTEX_TO_FRAGMENT_LIGHT: case ShaderNode::Varying::STAGE_VERTEX_TO_FRAGMENT_LIGHT:
case ShaderNode::Varying::STAGE_VERTEX: case ShaderNode::Varying::STAGE_VERTEX:
if (current_function == String("fragment")) { if (current_function == String("fragment")) {
*r_message = RTR("Varyings which assigned in 'vertex' function may not be reassigned in 'fragment' or 'light'."); *r_message = RTR("Varyings which were assigned in 'vertex' function may not be reassigned in 'fragment' or 'light'.");
return false; return false;
} }
break; break;
case ShaderNode::Varying::STAGE_FRAGMENT_TO_LIGHT: case ShaderNode::Varying::STAGE_FRAGMENT_TO_LIGHT:
case ShaderNode::Varying::STAGE_FRAGMENT: case ShaderNode::Varying::STAGE_FRAGMENT:
if (current_function == String("vertex")) { if (current_function == String("vertex")) {
*r_message = RTR("Varyings which assigned in 'fragment' function may not be reassigned in 'vertex' or 'light'."); *r_message = RTR("Varyings which were assigned in 'fragment' function may not be reassigned in 'vertex' or 'light'.");
return false; return false;
} }
break; break;