-project settings are saved when changed

-load() was in the GDScript docs but missing in the scripting-different music for platformer 2D and 3D
-fix how documentation is generated, built in doc browser should be always up to date
-copypaste, scrolling, etc in  builtin doc
-built-in scripts get saved now (though debugger may not always work on them)
-Theme can be set to controls as a property

4 files changed, 138 insertions, 65 deletions

diff --git a/core/io/compression.cpp b/core/io/compression.cpp
index 156767d241..67ba5de0fa 100644
--- a/core/io/compression.cpp
+++ b/core/io/compression.cpp
@@ -26,66 +26,123 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "compression.h"

-

-#include "fastlz.h"

-#include "os/copymem.h"

-

-int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size,Mode p_mode) {

-

-	switch(p_mode) {

-		case MODE_FASTLZ: {

-

-			if (p_src_size<16) {

-				uint8_t src[16];

-				zeromem(&src[p_src_size],16-p_src_size);

-				copymem(src,p_src,p_src_size);

-				return fastlz_compress(src,16,p_dst);

-			} else {

-				return fastlz_compress(p_src,p_src_size,p_dst);

-			}

-

-		} break;

-	}

-

-	ERR_FAIL_V(-1);

-}

-

-int Compression::get_max_compressed_buffer_size(int p_src_size,Mode p_mode){

-

-	switch(p_mode) {

-		case MODE_FASTLZ: {

-

-

-			int ss = p_src_size+p_src_size*6/100;

-			if (ss<66)

-				ss=66;

-			return ss;

-

-		} break;

-	}

-

-	ERR_FAIL_V(-1);

-

-}

-

-

-

-void Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size,Mode p_mode){

-

-	switch(p_mode) {

-		case MODE_FASTLZ: {

-

-			if (p_dst_max_size<16) {

-				uint8_t dst[16];

-				fastlz_decompress(p_src,p_src_size,dst,16);

-				copymem(p_dst,dst,p_dst_max_size);

-			} else {

-				fastlz_decompress(p_src,p_src_size,p_dst,p_dst_max_size);

-			}

-			return;

-		} break;

-	}

-

-	ERR_FAIL();

-}

+#include "compression.h"
+
+#include "fastlz.h"
+#include "zlib.h"
+#include "zip_io.h"
+#include "os/copymem.h"
+
+int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size,Mode p_mode) {
+
+	switch(p_mode) {
+		case MODE_FASTLZ: {
+
+			if (p_src_size<16) {
+				uint8_t src[16];
+				zeromem(&src[p_src_size],16-p_src_size);
+				copymem(src,p_src,p_src_size);
+				return fastlz_compress(src,16,p_dst);
+			} else {
+				return fastlz_compress(p_src,p_src_size,p_dst);
+			}
+
+		} break;
+		case MODE_DEFLATE: {
+
+			z_stream strm;
+			strm.zalloc = zipio_alloc;
+			strm.zfree = zipio_free;
+			strm.opaque = Z_NULL;
+			int err = deflateInit(&strm,Z_DEFAULT_COMPRESSION);
+			if (err==Z_OK)
+			    return -1;
+
+			strm.avail_in=p_src_size;
+			int aout = deflateBound(&strm,p_src_size);;
+			strm.avail_out=aout;
+			strm.next_in=(Bytef*)p_src;
+			strm.next_out=p_dst;
+			deflate(&strm,Z_FINISH);
+			aout = aout - strm.avail_out;
+			deflateEnd(&strm);
+			return aout;
+
+		} break;
+	}
+
+	ERR_FAIL_V(-1);
+}
+
+int Compression::get_max_compressed_buffer_size(int p_src_size,Mode p_mode){
+
+	switch(p_mode) {
+		case MODE_FASTLZ: {
+
+
+			int ss = p_src_size+p_src_size*6/100;
+			if (ss<66)
+				ss=66;
+			return ss;
+
+		} break;
+		case MODE_DEFLATE: {
+
+			z_stream strm;
+			strm.zalloc = zipio_alloc;
+			strm.zfree = zipio_free;
+			strm.opaque = Z_NULL;
+			int err = deflateInit(&strm,Z_DEFAULT_COMPRESSION);
+			if (err==Z_OK)
+			    return -1;
+			int aout = deflateBound(&strm,p_src_size);
+			deflateEnd(&strm);
+			return aout;
+		} break;
+	}
+
+	ERR_FAIL_V(-1);
+
+}
+
+
+
+void Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size,Mode p_mode){
+
+	switch(p_mode) {
+		case MODE_FASTLZ: {
+
+			if (p_dst_max_size<16) {
+				uint8_t dst[16];
+				fastlz_decompress(p_src,p_src_size,dst,16);
+				copymem(p_dst,dst,p_dst_max_size);
+			} else {
+				fastlz_decompress(p_src,p_src_size,p_dst,p_dst_max_size);
+			}
+			return;
+		} break;
+		case MODE_DEFLATE: {
+
+			z_stream strm;
+			strm.zalloc = zipio_alloc;
+			strm.zfree = zipio_free;
+			strm.opaque = Z_NULL;
+			strm.avail_in= 0;
+			strm.next_in=Z_NULL;
+			int err = inflateInit(&strm);
+			ERR_FAIL_COND(err!=Z_OK);
+
+			strm.avail_in=p_src_size;
+			strm.avail_out=p_dst_max_size;
+			strm.next_in=(Bytef*)p_src;
+			strm.next_out=p_dst;
+
+			err = inflate(&strm,Z_FINISH);
+			inflateEnd(&strm);
+			ERR_FAIL_COND(err!=Z_STREAM_END);
+			return;
+		} break;
+	}
+
+	ERR_FAIL();
+}
diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp
index 150643b2e1..5d3e4f61ad 100644
--- a/core/io/xml_parser.cpp
+++ b/core/io/xml_parser.cpp
@@ -392,7 +392,8 @@ void XMLParser::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_current_line"),&XMLParser::get_current_line);
 	ObjectTypeDB::bind_method(_MD("skip_section"),&XMLParser::skip_section);
 	ObjectTypeDB::bind_method(_MD("seek"),&XMLParser::seek);
-	ObjectTypeDB::bind_method(_MD("open"),&XMLParser::open);
+	ObjectTypeDB::bind_method(_MD("open","file"),&XMLParser::open);
+	ObjectTypeDB::bind_method(_MD("open_buffer","buffer"),&XMLParser::open_buffer);
 
 	BIND_CONSTANT( NODE_NONE );
 	BIND_CONSTANT( NODE_ELEMENT );
@@ -493,6 +494,19 @@ bool XMLParser::is_empty() const {
 	return node_empty;
 }
 
+Error XMLParser::open_buffer(const Vector<uint8_t>& p_buffer) {
+
+	ERR_FAIL_COND_V(p_buffer.size()==0,ERR_INVALID_DATA);
+
+	length = p_buffer.size();
+	data = memnew_arr( char, length+1);
+	copymem(data,p_buffer.ptr(),length);
+	data[length]=0;
+	P=data;
+	return OK;
+
+}
+
 Error XMLParser::open(const String& p_path) {
 
 	Error err;
diff --git a/core/io/xml_parser.h b/core/io/xml_parser.h
index 3025c041b3..9debbf9e2f 100644
--- a/core/io/xml_parser.h
+++ b/core/io/xml_parser.h
@@ -113,6 +113,8 @@ public:
 	Error seek(uint64_t p_pos);
 
 	Error open(const String& p_path);
+	Error open_buffer(const Vector<uint8_t>& p_buffer);
+
 	void close();
 
 	XMLParser();
diff --git a/core/io/zip_io.h b/core/io/zip_io.h
index 2f99113392..798265cc48 100644
--- a/core/io/zip_io.h
+++ b/core/io/zip_io.h
@@ -32,7 +32,7 @@
 #include "io/zip.h"
 #include "io/unzip.h"
 #include "os/file_access.h"
-//#include "copymem.h"
+#include "os/copymem.h"
 
 static void* zipio_open(void* data, const char* p_fname, int mode) {