diff --git a/core/doc_data.h b/core/doc_data.h
index 4e0db89984c..fc184c411cc 100644
--- a/core/doc_data.h
+++ b/core/doc_data.h
@@ -137,7 +137,7 @@ public:
return arguments[0] < p_method.arguments[0];
}
}
- return name < p_method.name;
+ return name.naturalcasecmp_to(p_method.name) < 0;
}
static MethodDoc from_dict(const Dictionary &p_dict) {
MethodDoc doc;
@@ -327,7 +327,7 @@ public:
bool is_deprecated = false;
bool is_experimental = false;
bool operator<(const PropertyDoc &p_prop) const {
- return name < p_prop.name;
+ return name.naturalcasecmp_to(p_prop.name) < 0;
}
static PropertyDoc from_dict(const Dictionary &p_dict) {
PropertyDoc doc;
@@ -432,7 +432,7 @@ public:
bool operator<(const ThemeItemDoc &p_theme_item) const {
// First sort by the data type, then by name.
if (data_type == p_theme_item.data_type) {
- return name < p_theme_item.name;
+ return name.naturalcasecmp_to(p_theme_item.name) < 0;
}
return data_type < p_theme_item.data_type;
}
diff --git a/doc/classes/FileAccess.xml b/doc/classes/FileAccess.xml
index d1ee90142ef..11dbb00f107 100644
--- a/doc/classes/FileAccess.xml
+++ b/doc/classes/FileAccess.xml
@@ -94,6 +94,12 @@
[b]Note:[/b] Only call [method flush] when you actually need it. Otherwise, it will decrease performance due to constant disk writes.
+
+
+
+ Returns the next 8 bits from the file as an integer. See [method store_8] for details on what values can be stored and retrieved this way.
+
+
@@ -112,12 +118,6 @@
Returns the next 64 bits from the file as an integer. See [method store_64] for details on what values can be stored and retrieved this way.
-
-
-
- Returns the next 8 bits from the file as an integer. See [method store_8] for details on what values can be stored and retrieved this way.
-
-
@@ -322,6 +322,15 @@
[b]Note:[/b] This is an offset, so you should use negative numbers or the cursor will be at the end of the file.
+
+
+
+
+ Stores an integer as 8 bits in the file.
+ [b]Note:[/b] The [param value] should lie in the interval [code][0, 255][/code]. Any other value will overflow and wrap around.
+ To store a signed integer, use [method store_64], or convert it manually (see [method store_16] for an example).
+
+
@@ -380,15 +389,6 @@
[b]Note:[/b] The [param value] must lie in the interval [code][-2^63, 2^63 - 1][/code] (i.e. be a valid [int] value).
-
-
-
-
- Stores an integer as 8 bits in the file.
- [b]Note:[/b] The [param value] should lie in the interval [code][0, 255][/code]. Any other value will overflow and wrap around.
- To store a signed integer, use [method store_64], or convert it manually (see [method store_16] for an example).
-
-
diff --git a/doc/classes/Image.xml b/doc/classes/Image.xml
index de7e1521f74..130f848a73c 100644
--- a/doc/classes/Image.xml
+++ b/doc/classes/Image.xml
@@ -382,12 +382,6 @@
Converts a standard RGBE (Red Green Blue Exponent) image to an sRGB image.
-
-
-
- Rotates the image by [code]180[/code] degrees. The width and height of the image must be greater than [code]1[/code].
-
-
@@ -395,6 +389,12 @@
Rotates the image in the specified [param direction] by [code]90[/code] degrees. The width and height of the image must be greater than [code]1[/code]. If the width and height are not equal, the image will be resized.
+
+
+
+ Rotates the image by [code]180[/code] degrees. The width and height of the image must be greater than [code]1[/code].
+
+
diff --git a/doc/classes/PackedByteArray.xml b/doc/classes/PackedByteArray.xml
index 431ccf634ca..3926ea8bebe 100644
--- a/doc/classes/PackedByteArray.xml
+++ b/doc/classes/PackedByteArray.xml
@@ -96,6 +96,13 @@
Decodes a 16-bit floating point number from the bytes starting at [param byte_offset]. Fails if the byte count is insufficient. Returns [code]0.0[/code] if a valid number can't be decoded.
+
+
+
+
+ Decodes a 8-bit signed integer number from the bytes starting at [param byte_offset]. Fails if the byte count is insufficient. Returns [code]0[/code] if a valid number can't be decoded.
+
+
@@ -117,11 +124,11 @@
Decodes a 64-bit signed integer number from the bytes starting at [param byte_offset]. Fails if the byte count is insufficient. Returns [code]0[/code] if a valid number can't be decoded.
-
+
- Decodes a 8-bit signed integer number from the bytes starting at [param byte_offset]. Fails if the byte count is insufficient. Returns [code]0[/code] if a valid number can't be decoded.
+ Decodes a 8-bit unsigned integer number from the bytes starting at [param byte_offset]. Fails if the byte count is insufficient. Returns [code]0[/code] if a valid number can't be decoded.
@@ -145,13 +152,6 @@
Decodes a 64-bit unsigned integer number from the bytes starting at [param byte_offset]. Fails if the byte count is insufficient. Returns [code]0[/code] if a valid number can't be decoded.
-
-
-
-
- Decodes a 8-bit unsigned integer number from the bytes starting at [param byte_offset]. Fails if the byte count is insufficient. Returns [code]0[/code] if a valid number can't be decoded.
-
-
@@ -216,6 +216,14 @@
Encodes a 16-bit floating point number as bytes at the index of [param byte_offset] bytes. The array must have at least 2 bytes of space, starting at the offset.
+
+
+
+
+
+ Encodes a 8-bit signed integer number (signed byte) at the index of [param byte_offset] bytes. The array must have at least 1 byte of space, starting at the offset.
+
+
@@ -240,12 +248,12 @@
Encodes a 64-bit signed integer number as bytes at the index of [param byte_offset] bytes. The array must have at least 8 bytes of space, starting at the offset.
-
+
- Encodes a 8-bit signed integer number (signed byte) at the index of [param byte_offset] bytes. The array must have at least 1 byte of space, starting at the offset.
+ Encodes a 8-bit unsigned integer number (byte) at the index of [param byte_offset] bytes. The array must have at least 1 byte of space, starting at the offset.
@@ -272,14 +280,6 @@
Encodes a 64-bit unsigned integer number as bytes at the index of [param byte_offset] bytes. The array must have at least 8 bytes of space, starting at the offset.
-
-
-
-
-
- Encodes a 8-bit unsigned integer number (byte) at the index of [param byte_offset] bytes. The array must have at least 1 byte of space, starting at the offset.
-
-
@@ -310,6 +310,12 @@
Converts ASCII/Latin-1 encoded array to [String]. Fast alternative to [method get_string_from_utf8] if the content is ASCII/Latin-1 only. Unlike the UTF-8 function this function maps every byte to a character in the array. Multibyte sequences will not be interpreted correctly. For parsing user input always use [method get_string_from_utf8].
+
+
+
+ Converts UTF-8 encoded array to [String]. Slower than [method get_string_from_ascii] but supports UTF-8 encoded data. Use this function if you are unsure about the source of the data. For user input this function should always be preferred. Returns empty string if source array is not valid UTF-8 string.
+
+
@@ -322,12 +328,6 @@
Converts UTF-32 encoded array to [String]. System endianness is assumed. Returns empty string if source array is not valid UTF-32 string.
-
-
-
- Converts UTF-8 encoded array to [String]. Slower than [method get_string_from_ascii] but supports UTF-8 encoded data. Use this function if you are unsure about the source of the data. For user input this function should always be preferred. Returns empty string if source array is not valid UTF-8 string.
-
-
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index 544bb6fd443..ec63045cc97 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -1242,6 +1242,30 @@
Optional name for the 2D navigation layer 1. If left empty, the layer will display as "Layer 1".
+
+ Optional name for the 2D navigation layer 2. If left empty, the layer will display as "Layer 2".
+
+
+ Optional name for the 2D navigation layer 3. If left empty, the layer will display as "Layer 3".
+
+
+ Optional name for the 2D navigation layer 4. If left empty, the layer will display as "Layer 4".
+
+
+ Optional name for the 2D navigation layer 5. If left empty, the layer will display as "Layer 5".
+
+
+ Optional name for the 2D navigation layer 6. If left empty, the layer will display as "Layer 6".
+
+
+ Optional name for the 2D navigation layer 7. If left empty, the layer will display as "Layer 7".
+
+
+ Optional name for the 2D navigation layer 8. If left empty, the layer will display as "Layer 8".
+
+
+ Optional name for the 2D navigation layer 9. If left empty, the layer will display as "Layer 9".
+
Optional name for the 2D navigation layer 10. If left empty, the layer will display as "Layer 10".
@@ -1272,9 +1296,6 @@
Optional name for the 2D navigation layer 19. If left empty, the layer will display as "Layer 19".
-
- Optional name for the 2D navigation layer 2. If left empty, the layer will display as "Layer 2".
-
Optional name for the 2D navigation layer 20. If left empty, the layer will display as "Layer 20".
@@ -1305,9 +1326,6 @@
Optional name for the 2D navigation layer 29. If left empty, the layer will display as "Layer 29".
-
- Optional name for the 2D navigation layer 3. If left empty, the layer will display as "Layer 3".
-
Optional name for the 2D navigation layer 30. If left empty, the layer will display as "Layer 30".
@@ -1317,27 +1335,33 @@
Optional name for the 2D navigation layer 32. If left empty, the layer will display as "Layer 32".
-
- Optional name for the 2D navigation layer 4. If left empty, the layer will display as "Layer 4".
-
-
- Optional name for the 2D navigation layer 5. If left empty, the layer will display as "Layer 5".
-
-
- Optional name for the 2D navigation layer 6. If left empty, the layer will display as "Layer 6".
-
-
- Optional name for the 2D navigation layer 7. If left empty, the layer will display as "Layer 7".
-
-
- Optional name for the 2D navigation layer 8. If left empty, the layer will display as "Layer 8".
-
-
- Optional name for the 2D navigation layer 9. If left empty, the layer will display as "Layer 9".
-
Optional name for the 2D physics layer 1. If left empty, the layer will display as "Layer 1".
+
+ Optional name for the 2D physics layer 2. If left empty, the layer will display as "Layer 2".
+
+
+ Optional name for the 2D physics layer 3. If left empty, the layer will display as "Layer 3".
+
+
+ Optional name for the 2D physics layer 4. If left empty, the layer will display as "Layer 4".
+
+
+ Optional name for the 2D physics layer 5. If left empty, the layer will display as "Layer 5".
+
+
+ Optional name for the 2D physics layer 6. If left empty, the layer will display as "Layer 6".
+
+
+ Optional name for the 2D physics layer 7. If left empty, the layer will display as "Layer 7".
+
+
+ Optional name for the 2D physics layer 8. If left empty, the layer will display as "Layer 8".
+
+
+ Optional name for the 2D physics layer 9. If left empty, the layer will display as "Layer 9".
+
Optional name for the 2D physics layer 10. If left empty, the layer will display as "Layer 10".
@@ -1368,9 +1392,6 @@
Optional name for the 2D physics layer 19. If left empty, the layer will display as "Layer 19".
-
- Optional name for the 2D physics layer 2. If left empty, the layer will display as "Layer 2".
-
Optional name for the 2D physics layer 20. If left empty, the layer will display as "Layer 20".
@@ -1401,9 +1422,6 @@
Optional name for the 2D physics layer 29. If left empty, the layer will display as "Layer 29".
-
- Optional name for the 2D physics layer 3. If left empty, the layer will display as "Layer 3".
-
Optional name for the 2D physics layer 30. If left empty, the layer will display as "Layer 30".
@@ -1413,27 +1431,33 @@
Optional name for the 2D physics layer 32. If left empty, the layer will display as "Layer 32".
-
- Optional name for the 2D physics layer 4. If left empty, the layer will display as "Layer 4".
-
-
- Optional name for the 2D physics layer 5. If left empty, the layer will display as "Layer 5".
-
-
- Optional name for the 2D physics layer 6. If left empty, the layer will display as "Layer 6".
-
-
- Optional name for the 2D physics layer 7. If left empty, the layer will display as "Layer 7".
-
-
- Optional name for the 2D physics layer 8. If left empty, the layer will display as "Layer 8".
-
-
- Optional name for the 2D physics layer 9. If left empty, the layer will display as "Layer 9".
-
Optional name for the 2D render layer 1. If left empty, the layer will display as "Layer 1".
+
+ Optional name for the 2D render layer 2. If left empty, the layer will display as "Layer 2".
+
+
+ Optional name for the 2D render layer 3. If left empty, the layer will display as "Layer 3".
+
+
+ Optional name for the 2D render layer 4. If left empty, the layer will display as "Layer 4".
+
+
+ Optional name for the 2D render layer 5. If left empty, the layer will display as "Layer 5".
+
+
+ Optional name for the 2D render layer 6. If left empty, the layer will display as "Layer 6".
+
+
+ Optional name for the 2D render layer 7. If left empty, the layer will display as "Layer 7".
+
+
+ Optional name for the 2D render layer 8. If left empty, the layer will display as "Layer 8".
+
+
+ Optional name for the 2D render layer 9. If left empty, the layer will display as "Layer 9".
+
Optional name for the 2D render layer 10. If left empty, the layer will display as "Layer 10".
@@ -1464,36 +1488,36 @@
Optional name for the 2D render layer 19. If left empty, the layer will display as "Layer 19".
-
- Optional name for the 2D render layer 2. If left empty, the layer will display as "Layer 2".
-
Optional name for the 2D render layer 20. If left empty, the layer will display as "Layer 20".
-
- Optional name for the 2D render layer 3. If left empty, the layer will display as "Layer 3".
-
-
- Optional name for the 2D render layer 4. If left empty, the layer will display as "Layer 4".
-
-
- Optional name for the 2D render layer 5. If left empty, the layer will display as "Layer 5".
-
-
- Optional name for the 2D render layer 6. If left empty, the layer will display as "Layer 6".
-
-
- Optional name for the 2D render layer 7. If left empty, the layer will display as "Layer 7".
-
-
- Optional name for the 2D render layer 8. If left empty, the layer will display as "Layer 8".
-
-
- Optional name for the 2D render layer 9. If left empty, the layer will display as "Layer 9".
-
Optional name for the 3D navigation layer 1. If left empty, the layer will display as "Layer 1".
+
+ Optional name for the 3D navigation layer 2. If left empty, the layer will display as "Layer 2".
+
+
+ Optional name for the 3D navigation layer 3. If left empty, the layer will display as "Layer 3".
+
+
+ Optional name for the 3D navigation layer 4. If left empty, the layer will display as "Layer 4".
+
+
+ Optional name for the 3D navigation layer 5. If left empty, the layer will display as "Layer 5".
+
+
+ Optional name for the 3D navigation layer 6. If left empty, the layer will display as "Layer 6".
+
+
+ Optional name for the 3D navigation layer 7. If left empty, the layer will display as "Layer 7".
+
+
+ Optional name for the 3D navigation layer 8. If left empty, the layer will display as "Layer 8".
+
+
+ Optional name for the 3D navigation layer 9. If left empty, the layer will display as "Layer 9".
+
Optional name for the 3D navigation layer 10. If left empty, the layer will display as "Layer 10".
@@ -1524,9 +1548,6 @@
Optional name for the 3D navigation layer 19. If left empty, the layer will display as "Layer 19".
-
- Optional name for the 3D navigation layer 2. If left empty, the layer will display as "Layer 2".
-
Optional name for the 3D navigation layer 20. If left empty, the layer will display as "Layer 20".
@@ -1557,9 +1578,6 @@
Optional name for the 3D navigation layer 29. If left empty, the layer will display as "Layer 29".
-
- Optional name for the 3D navigation layer 3. If left empty, the layer will display as "Layer 3".
-
Optional name for the 3D navigation layer 30. If left empty, the layer will display as "Layer 30".
@@ -1569,27 +1587,33 @@
Optional name for the 3D navigation layer 32. If left empty, the layer will display as "Layer 32".
-
- Optional name for the 3D navigation layer 4. If left empty, the layer will display as "Layer 4".
-
-
- Optional name for the 3D navigation layer 5. If left empty, the layer will display as "Layer 5".
-
-
- Optional name for the 3D navigation layer 6. If left empty, the layer will display as "Layer 6".
-
-
- Optional name for the 3D navigation layer 7. If left empty, the layer will display as "Layer 7".
-
-
- Optional name for the 3D navigation layer 8. If left empty, the layer will display as "Layer 8".
-
-
- Optional name for the 3D navigation layer 9. If left empty, the layer will display as "Layer 9".
-
Optional name for the 3D physics layer 1. If left empty, the layer will display as "Layer 1".
+
+ Optional name for the 3D physics layer 2. If left empty, the layer will display as "Layer 2".
+
+
+ Optional name for the 3D physics layer 3. If left empty, the layer will display as "Layer 3".
+
+
+ Optional name for the 3D physics layer 4. If left empty, the layer will display as "Layer 4".
+
+
+ Optional name for the 3D physics layer 5. If left empty, the layer will display as "Layer 5".
+
+
+ Optional name for the 3D physics layer 6. If left empty, the layer will display as "Layer 6".
+
+
+ Optional name for the 3D physics layer 7. If left empty, the layer will display as "Layer 7".
+
+
+ Optional name for the 3D physics layer 8. If left empty, the layer will display as "Layer 8".
+
+
+ Optional name for the 3D physics layer 9. If left empty, the layer will display as "Layer 9".
+
Optional name for the 3D physics layer 10. If left empty, the layer will display as "Layer 10".
@@ -1620,9 +1644,6 @@
Optional name for the 3D physics layer 19. If left empty, the layer will display as "Layer 19".
-
- Optional name for the 3D physics layer 2. If left empty, the layer will display as "Layer 2".
-
Optional name for the 3D physics layer 20. If left empty, the layer will display as "Layer 20".
@@ -1653,9 +1674,6 @@
Optional name for the 3D physics layer 29. If left empty, the layer will display as "Layer 29".
-
- Optional name for the 3D physics layer 3. If left empty, the layer will display as "Layer 3".
-
Optional name for the 3D physics layer 30. If left empty, the layer will display as "Layer 30".
@@ -1665,27 +1683,33 @@
Optional name for the 3D physics layer 32. If left empty, the layer will display as "Layer 32".
-
- Optional name for the 3D physics layer 4. If left empty, the layer will display as "Layer 4".
-
-
- Optional name for the 3D physics layer 5. If left empty, the layer will display as "Layer 5".
-
-
- Optional name for the 3D physics layer 6. If left empty, the layer will display as "Layer 6".
-
-
- Optional name for the 3D physics layer 7. If left empty, the layer will display as "Layer 7".
-
-
- Optional name for the 3D physics layer 8. If left empty, the layer will display as "Layer 8".
-
-
- Optional name for the 3D physics layer 9. If left empty, the layer will display as "Layer 9".
-
Optional name for the 3D render layer 1. If left empty, the layer will display as "Layer 1".
+
+ Optional name for the 3D render layer 2. If left empty, the layer will display as "Layer 2".
+
+
+ Optional name for the 3D render layer 3. If left empty, the layer will display as "Layer 3".
+
+
+ Optional name for the 3D render layer 4. If left empty, the layer will display as "Layer 4".
+
+
+ Optional name for the 3D render layer 5. If left empty, the layer will display as "Layer 5".
+
+
+ Optional name for the 3D render layer 6. If left empty, the layer will display as "Layer 6".
+
+
+ Optional name for the 3D render layer 7. If left empty, the layer will display as "Layer 7".
+
+
+ Optional name for the 3D render layer 8. If left empty, the layer will display as "Layer 8".
+
+
+ Optional name for the 3D render layer 9. If left empty, the layer will display as "Layer 9".
+
Optional name for the 3D render layer 10. If left empty, the layer will display as "Layer 10".
@@ -1716,33 +1740,9 @@
Optional name for the 3D render layer 19. If left empty, the layer will display as "Layer 19".
-
- Optional name for the 3D render layer 2. If left empty, the layer will display as "Layer 2".
-
Optional name for the 3D render layer 20. If left empty, the layer will display as "Layer 20".
-
- Optional name for the 3D render layer 3. If left empty, the layer will display as "Layer 3".
-
-
- Optional name for the 3D render layer 4. If left empty, the layer will display as "Layer 4".
-
-
- Optional name for the 3D render layer 5. If left empty, the layer will display as "Layer 5".
-
-
- Optional name for the 3D render layer 6. If left empty, the layer will display as "Layer 6".
-
-
- Optional name for the 3D render layer 7. If left empty, the layer will display as "Layer 7".
-
-
- Optional name for the 3D render layer 8. If left empty, the layer will display as "Layer 8".
-
-
- Optional name for the 3D render layer 9. If left empty, the layer will display as "Layer 9".
-
Godot uses a message queue to defer some function calls. If you run out of space on it (you will see an error), you can increase the size here.
diff --git a/doc/classes/StreamPeer.xml b/doc/classes/StreamPeer.xml
index e93b95617cd..c293f4ba5f7 100644
--- a/doc/classes/StreamPeer.xml
+++ b/doc/classes/StreamPeer.xml
@@ -10,6 +10,12 @@
+
+
+
+ Gets a signed byte from the stream.
+
+
@@ -28,12 +34,6 @@
Gets a signed 64-bit value from the stream.
-
-
-
- Gets a signed byte from the stream.
-
-
@@ -73,6 +73,12 @@
Gets an ASCII string with byte-length [param bytes] from the stream. If [param bytes] is negative (default) the length will be read from the stream using the reverse process of [method put_string].
+
+
+
+ Gets an unsigned byte from the stream.
+
+
@@ -91,12 +97,6 @@
Gets an unsigned 64-bit value from the stream.
-
-
-
- Gets an unsigned byte from the stream.
-
-
@@ -113,6 +113,13 @@
[b]Warning:[/b] Deserialized objects can contain code which gets executed. Do not use this option if the serialized object comes from untrusted sources to avoid potential security threats such as remote code execution.
+
+
+
+
+ Puts a signed byte into the stream.
+
+
@@ -134,13 +141,6 @@
Puts a signed 64-bit value into the stream.
-
-
-
-
- Puts a signed byte into the stream.
-
-
@@ -185,6 +185,13 @@
[/codeblocks]
+
+
+
+
+ Puts an unsigned byte into the stream.
+
+
@@ -206,13 +213,6 @@
Puts an unsigned 64-bit value into the stream.
-
-
-
-
- Puts an unsigned byte into the stream.
-
-
diff --git a/doc/classes/String.xml b/doc/classes/String.xml
index 4a6bf0e5265..09ded0f4ce4 100644
--- a/doc/classes/String.xml
+++ b/doc/classes/String.xml
@@ -964,6 +964,12 @@
Returns the string converted to uppercase.
+
+
+
+ Converts the string to a [url=https://en.wikipedia.org/wiki/UTF-8]UTF-8[/url] encoded [PackedByteArray]. This method is slightly slower than [method to_ascii_buffer], but supports all UTF-8 characters. For most cases, prefer using this method.
+
+
@@ -976,12 +982,6 @@
Converts the string to a [url=https://en.wikipedia.org/wiki/UTF-32]UTF-32[/url] encoded [PackedByteArray].
-
-
-
- Converts the string to a [url=https://en.wikipedia.org/wiki/UTF-8]UTF-8[/url] encoded [PackedByteArray]. This method is slightly slower than [method to_ascii_buffer], but supports all UTF-8 characters. For most cases, prefer using this method.
-
-
diff --git a/doc/classes/StringName.xml b/doc/classes/StringName.xml
index 1c881cd6bef..7ffe1d8c325 100644
--- a/doc/classes/StringName.xml
+++ b/doc/classes/StringName.xml
@@ -871,6 +871,12 @@
Returns the string converted to uppercase.
+
+
+
+ Converts the string to a [url=https://en.wikipedia.org/wiki/UTF-8]UTF-8[/url] encoded [PackedByteArray]. This method is slightly slower than [method to_ascii_buffer], but supports all UTF-8 characters. For most cases, prefer using this method.
+
+
@@ -883,12 +889,6 @@
Converts the string to a [url=https://en.wikipedia.org/wiki/UTF-32]UTF-32[/url] encoded [PackedByteArray].
-
-
-
- Converts the string to a [url=https://en.wikipedia.org/wiki/UTF-8]UTF-8[/url] encoded [PackedByteArray]. This method is slightly slower than [method to_ascii_buffer], but supports all UTF-8 characters. For most cases, prefer using this method.
-
-
diff --git a/editor/doc_tools.cpp b/editor/doc_tools.cpp
index e65d9da5629..67a8814aa18 100644
--- a/editor/doc_tools.cpp
+++ b/editor/doc_tools.cpp
@@ -417,6 +417,7 @@ void DocTools::generate(bool p_basic_types) {
ClassDB::get_property_list(name, &own_properties, true);
}
+ // Sort is still needed here to handle inherited properties, even though it is done below, do not remove.
properties.sort();
own_properties.sort();
@@ -535,9 +536,10 @@ void DocTools::generate(bool p_basic_types) {
c.properties.push_back(prop);
}
+ c.properties.sort();
+
List method_list;
ClassDB::get_method_list(name, &method_list, true);
- method_list.sort();
for (const MethodInfo &E : method_list) {
if (E.name.is_empty() || (E.name[0] == '_' && !(E.flags & METHOD_FLAG_VIRTUAL))) {
@@ -571,6 +573,8 @@ void DocTools::generate(bool p_basic_types) {
c.methods.push_back(method);
}
+ c.methods.sort();
+
List signal_list;
ClassDB::get_signal_list(name, &signal_list, true);
@@ -709,7 +713,6 @@ void DocTools::generate(bool p_basic_types) {
List method_list;
v.get_method_list(&method_list);
- method_list.sort();
Variant::get_constructor_list(Variant::Type(i), &method_list);
for (int j = 0; j < Variant::OP_AND; j++) { // Showing above 'and' is pretty confusing and there are a lot of variations.
@@ -832,6 +835,8 @@ void DocTools::generate(bool p_basic_types) {
}
}
+ c.methods.sort();
+
List properties;
v.get_property_list(&properties);
for (const PropertyInfo &pi : properties) {
diff --git a/platform/ios/doc_classes/EditorExportPlatformIOS.xml b/platform/ios/doc_classes/EditorExportPlatformIOS.xml
index ef2b0a256de..899ab612065 100644
--- a/platform/ios/doc_classes/EditorExportPlatformIOS.xml
+++ b/platform/ios/doc_classes/EditorExportPlatformIOS.xml
@@ -69,15 +69,15 @@
App Store application icon file. If left empty, project icon is used instead. See [url=https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/url].
+
+ Home screen application icon file on iPad (1x DPI). If left empty, project icon is used instead. See [url=https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/url].
+
Home screen application icon file on iPad (2x DPI). If left empty, project icon is used instead. See [url=https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/url].
Home screen application icon file on iPad (3x DPI). If left empty, project icon is used instead. See [url=https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/url].
-
- Home screen application icon file on iPad (1x DPI). If left empty, project icon is used instead. See [url=https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/url].
-
Home screen application icon file on iPhone (2x DPI). If left empty, project icon is used instead. See [url=https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/url].
@@ -114,10 +114,19 @@
Application launch screen image file, if left empty project splash screen is used instead.
+
+ Application launch screen image file, if left empty project splash screen is used instead.
+
Application launch screen image file, if left empty project splash screen is used instead.
-
+
+ Application launch screen image file, if left empty project splash screen is used instead.
+
+
+ Application launch screen image file, if left empty project splash screen is used instead.
+
+
Application launch screen image file, if left empty project splash screen is used instead.
@@ -126,15 +135,6 @@
Application launch screen image file, if left empty project splash screen is used instead.
-
- Application launch screen image file, if left empty project splash screen is used instead.
-
-
- Application launch screen image file, if left empty project splash screen is used instead.
-
-
- Application launch screen image file, if left empty project splash screen is used instead.
-
A message displayed when requesting access to the device's camera (in English).