summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/classes/@GDScript.xml4
-rw-r--r--doc/classes/EditorFileSystem.xml4
-rw-r--r--doc/classes/EditorPlugin.xml14
-rw-r--r--doc/classes/EditorResourcePreviewGenerator.xml16
-rw-r--r--doc/classes/ProjectSettings.xml3
-rwxr-xr-xdoc/tools/makerst.py15
-rw-r--r--editor/filesystem_dock.cpp1
-rw-r--r--modules/opensimplex/doc_classes/SimplexNoise.xml6
8 files changed, 31 insertions, 32 deletions
diff --git a/doc/classes/@GDScript.xml b/doc/classes/@GDScript.xml
index 3e46dc4e92..7bd332a3e4 100644
--- a/doc/classes/@GDScript.xml
+++ b/doc/classes/@GDScript.xml
@@ -120,9 +120,9 @@
<method name="atan2">
<return type="float">
</return>
- <argument index="0" name="x" type="float">
+ <argument index="0" name="y" type="float">
</argument>
- <argument index="1" name="y" type="float">
+ <argument index="1" name="x" type="float">
</argument>
<description>
Returns the arc tangent of [code]y/x[/code] in radians. Use to get the angle of tangent [code]y/x[/code]. To compute the value, the method takes into account the sign of both arguments in order to determine the quadrant.
diff --git a/doc/classes/EditorFileSystem.xml b/doc/classes/EditorFileSystem.xml
index ade6d2034d..5a8b506f9e 100644
--- a/doc/classes/EditorFileSystem.xml
+++ b/doc/classes/EditorFileSystem.xml
@@ -93,10 +93,6 @@
Remitted if a resource is reimported.
</description>
</signal>
- <signal name="script_classes_updated">
- <description>
- </description>
- </signal>
<signal name="sources_changed">
<argument index="0" name="exist" type="bool">
</argument>
diff --git a/doc/classes/EditorPlugin.xml b/doc/classes/EditorPlugin.xml
index 208780547e..66314a4ace 100644
--- a/doc/classes/EditorPlugin.xml
+++ b/doc/classes/EditorPlugin.xml
@@ -165,15 +165,15 @@
This function is used for plugins that edit specific object types (nodes or resources). It requests the editor to edit the given object.
</description>
</method>
- <method name="forward_canvas_gui_input" qualifiers="virtual">
- <return type="bool">
+ <method name="forward_canvas_draw_over_viewport" qualifiers="virtual">
+ <return type="void">
</return>
- <argument index="0" name="event" type="InputEvent">
+ <argument index="0" name="overlay" type="Control">
</argument>
<description>
</description>
</method>
- <method name="forward_draw_over_viewport" qualifiers="virtual">
+ <method name="forward_canvas_force_draw_over_viewport" qualifiers="virtual">
<return type="void">
</return>
<argument index="0" name="overlay" type="Control">
@@ -181,10 +181,10 @@
<description>
</description>
</method>
- <method name="forward_force_draw_over_viewport" qualifiers="virtual">
- <return type="void">
+ <method name="forward_canvas_gui_input" qualifiers="virtual">
+ <return type="bool">
</return>
- <argument index="0" name="overlay" type="Control">
+ <argument index="0" name="event" type="InputEvent">
</argument>
<description>
</description>
diff --git a/doc/classes/EditorResourcePreviewGenerator.xml b/doc/classes/EditorResourcePreviewGenerator.xml
index fb9af47b1f..c4dcbbbc82 100644
--- a/doc/classes/EditorResourcePreviewGenerator.xml
+++ b/doc/classes/EditorResourcePreviewGenerator.xml
@@ -16,10 +16,12 @@
</return>
<argument index="0" name="from" type="Resource">
</argument>
+ <argument index="1" name="size" type="Vector2">
+ </argument>
<description>
- Generate a preview from a given resource. This must be always implemented.
- Returning an empty texture is an OK way to fail and let another generator take care.
- Care must be taken because this function is always called from a thread (not the main thread).
+ Generate a preview from a given resource with the specified size. This must always be implemented.
+ Returning an empty texture is an OK way to fail and let another generator take care.
+ Care must be taken because this function is always called from a thread (not the main thread).
</description>
</method>
<method name="generate_from_path" qualifiers="virtual">
@@ -27,10 +29,12 @@
</return>
<argument index="0" name="path" type="String">
</argument>
+ <argument index="1" name="size" type="Vector2">
+ </argument>
<description>
- Generate a preview directly from a path, implementing this is optional, as default code will load and call generate()
- Returning an empty texture is an OK way to fail and let another generator take care.
- Care must be taken because this function is always called from a thread (not the main thread).
+ Generate a preview directly from a path with the specified size. Implementing this is optional, as default code will load and call [method generate].
+ Returning an empty texture is an OK way to fail and let another generator take care.
+ Care must be taken because this function is always called from a thread (not the main thread).
</description>
</method>
<method name="handles" qualifiers="virtual">
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index 548d60fe35..c05d6bc849 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -609,9 +609,6 @@
<member name="network/remote_fs/page_size" type="int" setter="" getter="">
Page size used by remote filesystem.
</member>
- <member name="network/ssl/certificates" type="String" setter="" getter="">
- If your game or application uses HTTPS, a certificates file is needed. It must be set here.
- </member>
<member name="node/name_casing" type="int" setter="" getter="">
When creating nodes names automatically, set the type of casing in this project. This is mostly an editor setting.
</member>
diff --git a/doc/tools/makerst.py b/doc/tools/makerst.py
index 06b9a10123..63a5c8cbbf 100755
--- a/doc/tools/makerst.py
+++ b/doc/tools/makerst.py
@@ -573,7 +573,7 @@ def make_rst_class(node):
if events != None and len(list(events)) > 0:
f.write(make_heading('Signals', '-'))
for m in list(events):
- f.write(" .. _class_" + name + "_" + m.attrib['name'] + ":\n\n")
+ f.write(".. _class_" + name + "_" + m.attrib['name'] + ":\n\n")
make_method(f, name, m, True, True)
f.write('\n')
d = m.find('description')
@@ -599,7 +599,7 @@ def make_rst_class(node):
if len(enum_names) > 0:
f.write(make_heading('Enumerations', '-'))
for e in enum_names:
- f.write(" .. _enum_" + name + "_" + e + ":\n\n")
+ f.write(".. _enum_" + name + "_" + e + ":\n\n")
f.write("enum **" + e + "**:\n\n")
for c in enums:
if c.attrib['enum'] != e:
@@ -624,6 +624,7 @@ def make_rst_class(node):
if c.text.strip() != '':
s += ' --- ' + rstize_text(c.text.strip(), name)
f.write(s + '\n')
+ f.write('\n')
# Class description
descr = node.find('description')
@@ -644,25 +645,25 @@ def make_rst_class(node):
if match.lastindex == 2:
# Doc reference with fragment identifier: emit direct link to section with reference to page, for example:
# `#calling-javascript-from-script in Exporting For Web`
- f.write("- `" + groups[1] + " <../" + groups[0] + ".html" + groups[1] + ">`_ in :doc:`../" + groups[0] + "`\n")
+ f.write("- `" + groups[1] + " <../" + groups[0] + ".html" + groups[1] + ">`_ in :doc:`../" + groups[0] + "`\n\n")
# Commented out alternative: Instead just emit:
# `Subsection in Exporting For Web`
- # f.write("- `Subsection <../" + groups[0] + ".html" + groups[1] + ">`_ in :doc:`../" + groups[0] + "`\n")
+ # f.write("- `Subsection <../" + groups[0] + ".html" + groups[1] + ">`_ in :doc:`../" + groups[0] + "`\n\n")
elif match.lastindex == 1:
# Doc reference, for example:
# `Math`
- f.write("- :doc:`../" + groups[0] + "`\n")
+ f.write("- :doc:`../" + groups[0] + "`\n\n")
else:
# External link, for example:
# `http://enet.bespin.org/usergroup0.html`
- f.write("- `" + link + " <" + link + ">`_\n")
+ f.write("- `" + link + " <" + link + ">`_\n\n")
# Property descriptions
members = node.find('members')
if members != None and len(list(members)) > 0:
f.write(make_heading('Property Descriptions', '-'))
for m in list(members):
- f.write(" .. _class_" + name + "_" + m.attrib['name'] + ":\n\n")
+ f.write(".. _class_" + name + "_" + m.attrib['name'] + ":\n\n")
make_properties(f, name, m, True)
if m.text.strip() != '':
f.write(rstize_text(m.text.strip(), name))
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index 49784de381..d8925630b1 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -2249,6 +2249,7 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
current_path = memnew(LineEdit);
current_path->set_h_size_flags(SIZE_EXPAND_FILL);
+ current_path->set_text(path);
toolbar_hbc->add_child(current_path);
button_reload = memnew(Button);
diff --git a/modules/opensimplex/doc_classes/SimplexNoise.xml b/modules/opensimplex/doc_classes/SimplexNoise.xml
index de29ff874c..5b3af1cd67 100644
--- a/modules/opensimplex/doc_classes/SimplexNoise.xml
+++ b/modules/opensimplex/doc_classes/SimplexNoise.xml
@@ -14,7 +14,7 @@
noise.seed = randi()
noise.octaves = 4
noise.period = 20.0
- noise.persistance = 0.8
+ noise.persistence = 0.8
# Sample
print("Values:")
@@ -118,9 +118,9 @@
Period of the base octave.
A lower period results in a higher-frequency noise (more value changes across the same distance).
</member>
- <member name="persistance" type="float" setter="set_persistance" getter="get_persistance">
+ <member name="persistence" type="float" setter="set_persistence" getter="get_persistence">
Contribution factor of the different octaves.
- A [code]persistance[/code] value of 1 means all the octaves have the same contribution, a value of 0.5 means each octave contributes half as much as the previous one.
+ A [code]persistence[/code] value of 1 means all the octaves have the same contribution, a value of 0.5 means each octave contributes half as much as the previous one.
</member>
<member name="seed" type="int" setter="set_seed" getter="get_seed">
Seed used to generate random values, different seeds will generate different noise maps.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 04:35:16 +0000