aboutsummaryrefslogtreecommitdiff
path: root/main/main.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2016-03-12 10:44:12 -0300
committerJuan Linietsky2016-03-12 10:46:38 -0300
commit8b1dcbfe4d92f9d7273bbd2f1eb805e5c508961a (patch)
tree77bd972e494e7deeef49bfa271c94d03ef2af749 /main/main.cpp
parentd85f06c42d54971af5da826581c75d1ed001475e (diff)
downloadgodot-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 'main/main.cpp')
-rw-r--r--main/main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 817b99924..c12b68cd0 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -73,6 +73,7 @@
#include "core/os/thread.h"
#include "core/io/file_access_pack.h"
#include "core/io/file_access_zip.h"
+#include "core/io/stream_peer_ssl.h"
#include "translation.h"
#include "version.h"
#include "main/input_default.h"
@@ -635,6 +636,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
if (editor) {
packed_data->set_disabled(true);
globals->set_disable_platform_override(true);
+ StreamPeerSSL::initialize_certs=false; //will be initialized by editor
}
#endif