diff options
| author | Juan Linietsky | 2016-03-12 10:44:12 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-03-12 10:46:38 -0300 |
| commit | 8b1dcbfe4d92f9d7273bbd2f1eb805e5c508961a (patch) | |
| tree | 77bd972e494e7deeef49bfa271c94d03ef2af749 /tools/editor/editor_node.cpp | |
| parent | d85f06c42d54971af5da826581c75d1ed001475e (diff) | |
| download | godot-8b1dcbfe4d92f9d7273bbd2f1eb805e5c508961a.tar.gz godot-8b1dcbfe4d92f9d7273bbd2f1eb805e5c508961a.tar.zst godot-8b1dcbfe4d92f9d7273bbd2f1eb805e5c508961a.zip | |
-Made editor support SSL certs by default (embedded them)
-Made asset sharing support https
-Many fixes to HTTPRequest
-Added an asset installer dialog
-Visual cleanups to asset sharing tab
-Fixed some issues in ScrollContainer, hope it does not break things
-Asset sharing tab is not visible (hidden on purpose) for now.
Diffstat (limited to 'tools/editor/editor_node.cpp')
| -rw-r--r-- | tools/editor/editor_node.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index dfc1c7455..02b0e9447 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -107,7 +107,7 @@ #include "tools/editor/io_plugins/editor_export_scene.h" #include "plugins/editor_preview_plugins.h" - +#include "editor_initialize_ssl.h" #include "script_editor_debugger.h" EditorNode *EditorNode::singleton=NULL; @@ -4145,9 +4145,10 @@ Error EditorNode::export_platform(const String& p_platform, const String& p_path return OK; } -void EditorNode::show_warning(const String& p_text) { +void EditorNode::show_warning(const String& p_text, const String &p_title) { warning->set_text(p_text); + warning->set_title(p_title); warning->popup_centered_minsize(); } @@ -4950,6 +4951,7 @@ EditorNode::EditorNode() { EditorHelp::generate_doc(); //before any editor classes are crated SceneState::set_disable_placeholders(true); + editor_initialize_certificates(); //for asset sharing InputDefault *id = Input::get_singleton()->cast_to<InputDefault>(); |
