diff options
| author | Juan Linietsky | 2014-04-05 12:39:30 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-04-05 12:39:30 -0300 |
| commit | 9f33134c93ecbadda70e8eefc50563e29b2eb7f2 (patch) | |
| tree | 299ded94fe74a61bf8094935d0f3283f6f30e435 /tools/editor/editor_settings.cpp | |
| parent | 35b84d2c85fd152bee05d7d5a05e20a5f602a285 (diff) | |
| download | godot-9f33134c93ecbadda70e8eefc50563e29b2eb7f2.tar.gz godot-9f33134c93ecbadda70e8eefc50563e29b2eb7f2.tar.zst godot-9f33134c93ecbadda70e8eefc50563e29b2eb7f2.zip | |
-Support for changing fonts
-Detect when free() might crash the project and throw error
-fixed 2D Bounce in physics (3d still broken)
-renamed “on_top” property to “behind_parent”, which makes more sense, old on_top remains there for compatibility but is invisible.
-large amount of fixes
Diffstat (limited to 'tools/editor/editor_settings.cpp')
| -rw-r--r-- | tools/editor/editor_settings.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 6f4db7412..6d3384d0f 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -384,6 +384,9 @@ void EditorSettings::_load_defaults() { _THREAD_SAFE_METHOD_ + set("global/font",""); + hints["global/font"]=PropertyInfo(Variant::STRING,"global/font",PROPERTY_HINT_GLOBAL_FILE,"*.fnt"); + set("text_editor/background_color",Color::html("3b000000")); set("text_editor/text_color",Color::html("aaaaaa")); set("text_editor/text_selected_color",Color::html("000000")); @@ -398,6 +401,9 @@ void EditorSettings::_load_defaults() { set("text_editor/idle_parse_delay",2); set("text_editor/create_signal_callbacks",true); set("text_editor/autosave_interval_seconds",60); + set("text_editor/font",""); + hints["text_editor/font"]=PropertyInfo(Variant::STRING,"text_editor/font",PROPERTY_HINT_GLOBAL_FILE,"*.fnt"); + set("3d_editor/default_fov",45.0); set("3d_editor/default_z_near",0.1); @@ -429,9 +435,9 @@ void EditorSettings::_load_defaults() { set("import/pvrtc_texture_tool",""); #ifdef WINDOWS_ENABLED - hints["import/pvrtc_texture_tool"]=PropertyInfo(Variant::STRING,"import/pvrtc_texture_tool",PROPERTY_HINT_FILE,"*.exe"); + hints["import/pvrtc_texture_tool"]=PropertyInfo(Variant::STRING,"import/pvrtc_texture_tool",PROPERTY_HINT_GLOBAL_FILE,"*.exe"); #else - hints["import/pvrtc_texture_tool"]=PropertyInfo(Variant::STRING,"import/pvrtc_texture_tool",PROPERTY_HINT_FILE,""); + hints["import/pvrtc_texture_tool"]=PropertyInfo(Variant::STRING,"import/pvrtc_texture_tool",PROPERTY_HINT_GLOBAL_FILE,""); #endif set("PVRTC/fast_conversion",false); |
