From 9bbc3f0c94bfdbaceb507e4ccaf388950d84d8f0 Mon Sep 17 00:00:00 2001 From: Dana Olson Date: Sun, 11 Jan 2015 00:08:32 -0500 Subject: fix naming of duplicated nodes, closes #1161, adds separator character preferences --- tools/editor/editor_settings.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools/editor/editor_settings.cpp') diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index bc800d7e9e..60b8f41dab 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -413,6 +413,10 @@ void EditorSettings::_load_defaults() { set("text_editor/auto_brace_complete", false); + set("scenetree_editor/duplicate_node_name_num_separator",0); + hints["scenetree_editor/duplicate_node_name_num_separator"]=PropertyInfo(Variant::INT,"scenetree_editor/duplicate_node_name_num_separator",PROPERTY_HINT_ENUM, "None,Space,Underscore,Dash"); + + set("3d_editor/default_fov",45.0); set("3d_editor/default_z_near",0.1); set("3d_editor/default_z_far",500.0); -- cgit v1.2.3 From d0055a751bc425b27c1e442c0e83cb618f8eca16 Mon Sep 17 00:00:00 2001 From: marynate Date: Sat, 27 Dec 2014 10:28:16 +0800 Subject: Add current_line_color ediotr setting for script and shader editor --- tools/editor/editor_settings.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'tools/editor/editor_settings.cpp') diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index bc800d7e9e..59e06d1e69 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -404,6 +404,7 @@ void EditorSettings::_load_defaults() { set("text_editor/symbol_color",Color::html("badfff")); set("text_editor/selection_color",Color::html("7b5dbe")); set("text_editor/brace_mismatch_color",Color(1,0.2,0.2)); + set("text_editor/current_line_color",Color(0.3,0.5,0.8,0.15)); set("text_editor/idle_parse_delay",2); set("text_editor/create_signal_callbacks",true); -- cgit v1.2.3