diff options
| -rw-r--r-- | core/config/project_settings.cpp | 1 | ||||
| -rw-r--r-- | core/math/geometry_3d.cpp | 1 | ||||
| -rw-r--r-- | doc/classes/ProjectSettings.xml | 10 | ||||
| -rw-r--r-- | editor/plugins/skeleton_2d_editor_plugin.cpp | 1 | ||||
| -rw-r--r-- | platform/android/java/app/config.gradle | 10 | ||||
| -rw-r--r-- | scene/resources/primitive_meshes.cpp | 1 |
6 files changed, 16 insertions, 8 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index c3df4a2ebe..9d097c2bef 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -1206,6 +1206,7 @@ void ProjectSettings::_bind_methods() { ClassDB::bind_method(D_METHOD("set_order", "name", "position"), &ProjectSettings::set_order); ClassDB::bind_method(D_METHOD("get_order", "name"), &ProjectSettings::get_order); ClassDB::bind_method(D_METHOD("set_initial_value", "name", "value"), &ProjectSettings::set_initial_value); + ClassDB::bind_method(D_METHOD("set_as_basic", "name", "basic"), &ProjectSettings::set_as_basic); ClassDB::bind_method(D_METHOD("add_property_info", "hint"), &ProjectSettings::_add_property_info_bind); ClassDB::bind_method(D_METHOD("set_restart_if_changed", "name", "restart"), &ProjectSettings::set_restart_if_changed); ClassDB::bind_method(D_METHOD("clear", "name"), &ProjectSettings::clear); diff --git a/core/math/geometry_3d.cpp b/core/math/geometry_3d.cpp index 590483bf20..9dd88485f9 100644 --- a/core/math/geometry_3d.cpp +++ b/core/math/geometry_3d.cpp @@ -30,7 +30,6 @@ #include "geometry_3d.h" -#include "thirdparty/misc/clipper.hpp" #include "thirdparty/misc/polypartition.h" void Geometry3D::get_closest_points_between_segments(const Vector3 &p_p0, const Vector3 &p_p1, const Vector3 &p_q0, const Vector3 &p_q1, Vector3 &r_ps, Vector3 &r_qt) { diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index 0b60f0dbf6..add2faa962 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -177,12 +177,20 @@ Saves the configuration to a custom file. The file extension must be [code].godot[/code] (to save in text-based [ConfigFile] format) or [code].binary[/code] (to save in binary format). You can also save [code]override.cfg[/code] file, which is also text, but can be used in exported projects unlike other formats. </description> </method> + <method name="set_as_basic"> + <return type="void" /> + <param index="0" name="name" type="String" /> + <param index="1" name="basic" type="bool" /> + <description> + Defines if the specified setting is considered basic or advanced. Basic settings will always be shown in the project settings. Advanced settings will only be shown if the user enables the "Advanced Settings" option. + </description> + </method> <method name="set_initial_value"> <return type="void" /> <param index="0" name="name" type="String" /> <param index="1" name="value" type="Variant" /> <description> - Sets the specified property's initial value. This is the value the property reverts to. + Sets the specified setting's initial value. This is the value the setting reverts to. </description> </method> <method name="set_order"> diff --git a/editor/plugins/skeleton_2d_editor_plugin.cpp b/editor/plugins/skeleton_2d_editor_plugin.cpp index 6cf73fc48d..18c2b0c6e0 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.cpp +++ b/editor/plugins/skeleton_2d_editor_plugin.cpp @@ -36,7 +36,6 @@ #include "scene/2d/mesh_instance_2d.h" #include "scene/gui/dialogs.h" #include "scene/gui/menu_button.h" -#include "thirdparty/misc/clipper.hpp" void Skeleton2DEditor::_node_removed(Node *p_node) { if (p_node == node) { diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index acc6b22c3a..e7c06628c8 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -135,14 +135,16 @@ ext.generateGodotLibraryVersion = { List<String> requiredKeys -> String statusValue = map["status"] if (statusValue == null) { statusCode = 0 - } else if (statusValue.startsWith("alpha") || statusValue.startsWith("dev")) { + } else if (statusValue.startsWith("dev")) { statusCode = 1 - } else if (statusValue.startsWith("beta")) { + } else if (statusValue.startsWith("alpha")) { statusCode = 2 - } else if (statusValue.startsWith("rc")) { + } else if (statusValue.startsWith("beta")) { statusCode = 3 - } else if (statusValue.startsWith("stable")) { + } else if (statusValue.startsWith("rc")) { statusCode = 4 + } else if (statusValue.startsWith("stable")) { + statusCode = 5 } else { statusCode = 0 } diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp index 6a4f7d082e..204987cac9 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -35,7 +35,6 @@ #include "scene/resources/theme.h" #include "scene/theme/theme_db.h" #include "servers/rendering_server.h" -#include "thirdparty/misc/clipper.hpp" #include "thirdparty/misc/polypartition.h" #define PADDING_REF_SIZE 1024.0 |