-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.

4 files changed, 41 insertions, 3 deletions

diff --git a/core/image.cpp b/core/image.cpp
index 184ab70dc4..52946bbb85 100644
--- a/core/image.cpp
+++ b/core/image.cpp
@@ -2214,6 +2214,8 @@ void Image::blit_rect(const Image& p_src, const Rect2& p_src_rect,const Point2&
 
 
 Image (*Image::_png_mem_loader_func)(const uint8_t*,int)=NULL;
+Image (*Image::_jpg_mem_loader_func)(const uint8_t*,int)=NULL;
+
 void (*Image::_image_compress_bc_func)(Image *)=NULL;
 void (*Image::_image_compress_pvrtc2_func)(Image *)=NULL;
 void (*Image::_image_compress_pvrtc4_func)(Image *)=NULL;
@@ -2388,7 +2390,7 @@ String Image::get_format_name(Format p_format) {
 	return format_names[p_format];
 }
 
-Image::Image(const uint8_t* p_png,int p_len) {
+Image::Image(const uint8_t* p_mem_png_jpg, int p_len) {
 
 	width=0;
 	height=0;
@@ -2396,8 +2398,13 @@ Image::Image(const uint8_t* p_png,int p_len) {
 	format=FORMAT_GRAYSCALE;
 
 	if (_png_mem_loader_func) {
-		*this = _png_mem_loader_func(p_png,p_len);
+		*this = _png_mem_loader_func(p_mem_png_jpg,p_len);
+	}
+
+	if (empty() && _jpg_mem_loader_func) {
+		*this = _jpg_mem_loader_func(p_mem_png_jpg,p_len);
 	}
+
 }
 
 Image::Image() {
diff --git a/core/image.h b/core/image.h
index 8f8fff755e..fe1822f661 100644
--- a/core/image.h
+++ b/core/image.h
@@ -97,6 +97,7 @@ public:
 	};
 
 	static Image (*_png_mem_loader_func)(const uint8_t* p_png,int p_size);
+	static Image (*_jpg_mem_loader_func)(const uint8_t* p_png,int p_size);
 	static void (*_image_compress_bc_func)(Image *);
 	static void (*_image_compress_pvrtc2_func)(Image *);
 	static void (*_image_compress_pvrtc4_func)(Image *);
@@ -355,7 +356,7 @@ public:
 	static void set_compress_bc_func(void (*p_compress_func)(Image *));
 	static String get_format_name(Format p_format);
 
-	Image(const uint8_t* p_mem_png, int p_len=-1);
+	Image(const uint8_t* p_mem_png_jpg, int p_len=-1);
 	Image(const char **p_xpm);
 	~Image();
 
diff --git a/core/io/stream_peer_ssl.cpp b/core/io/stream_peer_ssl.cpp
index a7132d99ef..2114993783 100644
--- a/core/io/stream_peer_ssl.cpp
+++ b/core/io/stream_peer_ssl.cpp
@@ -4,12 +4,28 @@
 StreamPeerSSL* (*StreamPeerSSL::_create)()=NULL;
 
 
+
+
 StreamPeerSSL *StreamPeerSSL::create() {
 
 	return _create();
 }
 
 
+
+StreamPeerSSL::LoadCertsFromMemory StreamPeerSSL::load_certs_func=NULL;
+bool StreamPeerSSL::available=false;
+bool StreamPeerSSL::initialize_certs=true;
+
+void StreamPeerSSL::load_certs_from_memory(const ByteArray& p_memory) {
+	if (load_certs_func)
+		load_certs_func(p_memory);
+}
+
+bool StreamPeerSSL::is_available() {
+	return available;
+}
+
 void StreamPeerSSL::_bind_methods() {
 
 
diff --git a/core/io/stream_peer_ssl.h b/core/io/stream_peer_ssl.h
index be7504cd8f..4b1c8e93bb 100644
--- a/core/io/stream_peer_ssl.h
+++ b/core/io/stream_peer_ssl.h
@@ -5,11 +5,23 @@
 
 class StreamPeerSSL : public StreamPeer {
 	OBJ_TYPE(StreamPeerSSL,StreamPeer);
+public:
+
+	typedef void (*LoadCertsFromMemory)(const ByteArray& p_certs);
 protected:
 	static StreamPeerSSL* (*_create)();
 	static void _bind_methods();
+
+	static LoadCertsFromMemory load_certs_func;
+	static bool available;
+
+
+friend class Main;
+	static bool initialize_certs;
+
 public:
 
+
 	enum Status {
 		STATUS_DISCONNECTED,
 		STATUS_CONNECTED,
@@ -25,6 +37,8 @@ public:
 
 	static StreamPeerSSL* create();
 
+	static void load_certs_from_memory(const ByteArray& p_memory);
+	static bool is_available();
 
 	StreamPeerSSL();
 };