Sara/this-city
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: updated engine

Browse source
This commit is contained in:
Sara Gerretsen 2026-07-10 17:04:34 +02:00
parent cbe99774ff
commit f4cf6b3999
6607 changed files with 910135 additions and 430025 deletions
Download patch file Download diff file Expand all files Collapse all files

27
engine/editor/settings/project_settings_editor.cpp
View file

@ -32,6 +32,8 @@
#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"
@ -39,6 +41,7 @@
#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"
@ -411,8 +414,6 @@ 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) {
@ -613,6 +614,11 @@ 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;
@ -673,6 +679,12 @@ 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;
}
}
@ -832,9 +844,18 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
group_settings->connect("group_changed", callable_mp(this, &ProjectSettingsEditor::queue_save));
globals_container->add_child(group_settings);
TabContainer *addons_container = memnew(TabContainer);
addons_container->set_theme_type_variation("TabContainerInner");
addons_container->set_name(TTRC("Addons"));
tab_container->add_child(addons_container);
plugin_settings = memnew(EditorPluginSettings);
plugin_settings->set_name(TTRC("Plugins"));
tab_container->add_child(plugin_settings);
addons_container->add_child(plugin_settings);
gdextension_settings = memnew(ProjectSettingsGDExtension);
gdextension_settings->set_name(TTRC("GDExtension"));
addons_container->add_child(gdextension_settings);
timer = memnew(Timer);
timer->set_wait_time(1.5);