asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #61183 from timothyqiu/interpolate-if

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/ArrayMesh.xml
View file

@ -172,7 +172,7 @@
</members>
<constants>
<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 name="ARRAY_WEIGHTS_SIZE" value="4">
Amount of weights/bone indices per vertex (always 4).

2
doc/classes/EditorFileSystem.xml
View file

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

2
doc/classes/Node.xml
View file

@ -392,7 +392,7 @@
<return type="bool" />
<description>
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>
</method>
<method name="is_physics_interpolated_and_enabled" qualifiers="const">

2
doc/classes/PopupMenu.xml
View file

@ -249,7 +249,7 @@
<return type="String" />
<argument index="0" name="idx" type="int" />
<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>
</method>
<method name="is_hide_on_window_lose_focus" qualifiers="const">

2
doc/classes/RichTextLabel.xml
View file

@ -430,7 +430,7 @@
The default text font.
</theme_item>
<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 name="normal" data_type="style" type="StyleBox">
The normal background for the [RichTextLabel].

2
modules/enet/doc_classes/NetworkedMultiplayerENet.xml
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.
</member>
<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 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">

4
modules/gdnative/doc_classes/VideoStreamGDNative.xml
View file

@ -1,10 +1,10 @@
<?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">
<brief_description>
[VideoStream] resource for for video formats implemented via GDNative.
[VideoStream] resource for video formats implemented via GDNative.
</brief_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.
</description>
<tutorials>

2
modules/visual_script/visual_script_func_nodes.cpp
View file

@ -2166,7 +2166,7 @@ public:
Node *another = node->get_node(node_path);
if (!another) {
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;
}

2
modules/webxr/doc_classes/WebXRInterface.xml
View file

@ -256,7 +256,7 @@
</signals>
<constants>
<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 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.

4
servers/visual/shader_language.cpp
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:
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;
}
break;
case ShaderNode::Varying::STAGE_FRAGMENT_TO_LIGHT:
case ShaderNode::Varying::STAGE_FRAGMENT:
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;
}
break;