feat: updated godot version
This commit is contained in:
parent
0c508b0831
commit
42b028dbb5
4694 changed files with 236470 additions and 401376 deletions
|
|
@ -32,8 +32,6 @@
|
|||
|
||||
#include "core/config/project_settings.h"
|
||||
#include "core/input/input_map.h"
|
||||
#include "core/object/callable_mp.h"
|
||||
#include "core/object/class_db.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_string_names.h"
|
||||
#include "editor/editor_undo_redo_manager.h"
|
||||
|
|
@ -41,7 +39,6 @@
|
|||
#include "editor/gui/editor_variant_type_selectors.h"
|
||||
#include "editor/inspector/editor_inspector.h"
|
||||
#include "editor/settings/editor_settings.h"
|
||||
#include "editor/settings/gdextension/project_settings_gdextension.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "scene/gui/check_button.h"
|
||||
#include "servers/movie_writer/movie_writer.h"
|
||||
|
|
@ -414,6 +411,8 @@ void ProjectSettingsEditor::_focus_current_path_box() {
|
|||
current_path_box = property_box;
|
||||
} else if (tab == action_map_editor) {
|
||||
current_path_box = action_map_editor->get_path_box();
|
||||
} else if (tab == autoload_settings) {
|
||||
current_path_box = autoload_settings->get_path_box();
|
||||
} else if (tab == shaders_global_shader_uniforms_editor) {
|
||||
current_path_box = shaders_global_shader_uniforms_editor->get_name_box();
|
||||
} else if (tab == group_settings) {
|
||||
|
|
@ -614,11 +613,6 @@ void ProjectSettingsEditor::_update_action_map_editor() {
|
|||
String display_name = property_name.substr(String("input/").size() - 1);
|
||||
Dictionary action = GLOBAL_GET(property_name);
|
||||
|
||||
if (!action.has("events")) {
|
||||
WARN_PRINT_ONCE_ED(vformat("Attempted to load invalid input action from setting at \"%s\". The `input/` prefix should only be used for input actions, and cannot be changed in the settings editor. Consider changing the category.", property_name));
|
||||
continue;
|
||||
}
|
||||
|
||||
ActionMapEditor::ActionInfo action_info;
|
||||
action_info.action = action;
|
||||
action_info.editable = true;
|
||||
|
|
@ -679,12 +673,6 @@ void ProjectSettingsEditor::_notification(int p_what) {
|
|||
case NOTIFICATION_THEME_CHANGED: {
|
||||
_update_theme();
|
||||
} break;
|
||||
|
||||
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
|
||||
if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen")) {
|
||||
general_settings_inspector->set_touch_dragger_enabled(EDITOR_GET("interface/touchscreen/enable_touch_optimizations"));
|
||||
}
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -848,10 +836,6 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
|
|||
plugin_settings->set_name(TTRC("Plugins"));
|
||||
tab_container->add_child(plugin_settings);
|
||||
|
||||
gdextension_settings = memnew(ProjectSettingsGDExtension);
|
||||
gdextension_settings->set_name(TTRC("GDExtension"));
|
||||
tab_container->add_child(gdextension_settings);
|
||||
|
||||
timer = memnew(Timer);
|
||||
timer->set_wait_time(1.5);
|
||||
timer->connect("timeout", callable_mp(this, &ProjectSettingsEditor::_save));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue