Skip to content

Commit bce0491

Browse files
authored
Merge pull request #78340 from YuriSizov/4.0-cherrypicks
Cherry-picks for the 4.0 branch (future 4.0.4) - 1st batch
2 parents 4eefe8a + 09dc11b commit bce0491

422 files changed

Lines changed: 9135 additions & 6150 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/windows_builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
target: editor
2929
tests: true
3030
# Skip debug symbols, they're way too big with MSVC.
31-
sconsflags: debug_symbols=no vsproj=yes
31+
sconsflags: debug_symbols=no vsproj=yes windows_subsystem=console
3232
bin: "./bin/godot.windows.editor.x86_64.exe"
3333

3434
- name: Template (target=template_release)

COPYRIGHT.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ License: BSD-2-clause
390390

391391
Files: ./thirdparty/msdfgen/
392392
Comment: Multi-channel signed distance field generator
393-
Copyright: 2016, Viktor Chlumsky
393+
Copyright: 2016-2022, Viktor Chlumsky
394394
License: MIT
395395

396396
Files: ./thirdparty/oidn/
@@ -483,7 +483,7 @@ License: Zlib
483483

484484
Files: ./thirdparty/zstd/
485485
Comment: Zstandard
486-
Copyright: 2016-2021, Facebook, Inc.
486+
Copyright: Meta Platforms, Inc. and affiliates.
487487
License: BSD-3-clause
488488

489489

core/io/http_client.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@ Error HTTPClient::_request_raw(Method p_method, const String &p_url, const Vecto
6363
}
6464

6565
Error HTTPClient::_request(Method p_method, const String &p_url, const Vector<String> &p_headers, const String &p_body) {
66-
int size = p_body.length();
67-
return request(p_method, p_url, p_headers, size > 0 ? (const uint8_t *)p_body.utf8().get_data() : nullptr, size);
66+
CharString body_utf8 = p_body.utf8();
67+
int size = body_utf8.length();
68+
return request(p_method, p_url, p_headers, size > 0 ? (const uint8_t *)body_utf8.get_data() : nullptr, size);
6869
}
6970

7071
String HTTPClient::query_string_from_dict(const Dictionary &p_dict) {

core/string/string_name.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,15 @@ class StringName {
117117
_FORCE_INLINE_ bool operator<(const StringName &p_name) const {
118118
return _data < p_name._data;
119119
}
120+
_FORCE_INLINE_ bool operator<=(const StringName &p_name) const {
121+
return _data <= p_name._data;
122+
}
123+
_FORCE_INLINE_ bool operator>(const StringName &p_name) const {
124+
return _data > p_name._data;
125+
}
126+
_FORCE_INLINE_ bool operator>=(const StringName &p_name) const {
127+
return _data >= p_name._data;
128+
}
120129
_FORCE_INLINE_ bool operator==(const StringName &p_name) const {
121130
// the real magic of all this mess happens here.
122131
// this is why path comparisons are very fast

doc/classes/@GlobalScope.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@
829829
Converts one or more arguments of any type to string in the best way possible and prints them to the console.
830830
The following BBCode tags are supported: [code]b[/code], [code]i[/code], [code]u[/code], [code]s[/code], [code]indent[/code], [code]code[/code], [code]url[/code], [code]center[/code], [code]right[/code], [code]color[/code], [code]bgcolor[/code], [code]fgcolor[/code].
831831
Color tags only support the following named colors: [code]black[/code], [code]red[/code], [code]green[/code], [code]yellow[/code], [code]blue[/code], [code]magenta[/code], [code]pink[/code], [code]purple[/code], [code]cyan[/code], [code]white[/code], [code]orange[/code], [code]gray[/code]. Hexadecimal color codes are not supported.
832-
URL tags only support URLs wrapped by an URL tag, not URLs with a different title.
832+
URL tags only support URLs wrapped by a URL tag, not URLs with a different title.
833833
When printing to standard output, the supported subset of BBCode is converted to ANSI escape codes for the terminal emulator to display. Support for ANSI escape codes varies across terminal emulators, especially for italic and strikethrough. In standard output, [code]code[/code] is represented with faint text but without any font change. Unsupported tags are left as-is in standard output.
834834
[codeblocks]
835835
[gdscript]

doc/classes/AABB.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<class name="AABB" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
33
<brief_description>
4-
Axis-Aligned Bounding Box.
4+
A 3D axis-aligned bounding box.
55
</brief_description>
66
<description>
77
[AABB] consists of a position, a size, and several utility functions. It is typically used for fast overlap tests.

doc/classes/AESContext.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<class name="AESContext" inherits="RefCounted" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
33
<brief_description>
4-
Interface to low level AES encryption features.
4+
Provides access to AES encryption/decryption of raw data.
55
</brief_description>
66
<description>
7-
This class provides access to AES encryption/decryption of raw data. Both AES-ECB and AES-CBC mode are supported.
7+
This class holds the context information required for encryption and decryption operations with AES (Advanced Encryption Standard). Both AES-ECB and AES-CBC modes are supported.
88
[codeblocks]
99
[gdscript]
1010
extends Node

doc/classes/AcceptDialog.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<class name="AcceptDialog" inherits="Window" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
33
<brief_description>
4-
Base dialog for user notification.
4+
A base dialog used for user notification.
55
</brief_description>
66
<description>
7-
This dialog is useful for small notifications to the user about an event. It can only be accepted or closed, with the same result.
7+
The default use of [AcceptDialog] is to allow it to only be accepted or closed, with the same result. However, the [signal confirmed] and [signal canceled] signals allow to make the two actions different, and the [method add_button] method allows to add custom buttons and actions.
88
</description>
99
<tutorials>
1010
</tutorials>

doc/classes/Animation.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<class name="Animation" inherits="Resource" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
33
<brief_description>
4-
Contains data used to animate everything in the engine.
4+
Holds data that can be used to animate anything in the engine.
55
</brief_description>
66
<description>
7-
An Animation resource contains data used to animate everything in the engine. Animations are divided into tracks, and each track must be linked to a node. The state of that node can be changed through time, by adding timed keys (events) to the track.
7+
This resource holds data that can be used to animate anything in the engine. Animations are divided into tracks and each track must be linked to a node. The state of that node can be changed through time, by adding timed keys (events) to the track.
88
[codeblocks]
99
[gdscript]
1010
# This creates an animation that makes the node "Enemy" move to the right by

doc/classes/AnimationNode.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<class name="AnimationNode" inherits="Resource" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
33
<brief_description>
4-
Base resource for [AnimationTree] nodes.
4+
Base class for [AnimationTree] nodes. Not related to scene nodes.
55
</brief_description>
66
<description>
77
Base resource for [AnimationTree] nodes. In general, it's not used directly, but you can create custom ones with custom blending formulas.
88
Inherit this when creating nodes mainly for use in [AnimationNodeBlendTree], otherwise [AnimationRootNode] should be used instead.
99
</description>
1010
<tutorials>
11-
<link title="AnimationTree">$DOCS_URL/tutorials/animation/animation_tree.html</link>
11+
<link title="Using AnimationTree">$DOCS_URL/tutorials/animation/animation_tree.html</link>
1212
</tutorials>
1313
<methods>
1414
<method name="_get_caption" qualifiers="virtual const">

0 commit comments

Comments
 (0)