Merge branch 'master' of https://github.com/okamstudio/godot

17 files changed, 102 insertions, 37 deletions

diff --git a/.gitignore b/.gitignore
index b9f3f80af4..de9eed200a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,12 +13,24 @@ modules/register_module_types.cpp
 core/version.h
 core/method_bind.inc
 core/global_defaults.cpp
+tools/editor/register_exporters.cpp
+-fpic
+
+# Android specific
+platform/android/java/local.properties
 platform/android/java/project.properties
 platform/android/java/AndroidManifest.xml
-tools/editor/register_exporters.cpp
+platform/android/java/bin/
+platform/android/java/gen/
+platform/android/java/assets
 
 # General c++ generated files
 *.lib
+*.o
+*.a
+*.d
+*.so
+*.os
 
 # QT project files
 *.config
@@ -26,6 +38,8 @@ tools/editor/register_exporters.cpp
 *.files
 *.includes
 
+# Misc
+.DS_Store
 
 # for projects that use SCons for building: http://http://www.scons.org/
 .sconsign.dblite
@@ -59,6 +73,8 @@ bld/
 *.VisualState.xml
 TestResult.xml
 
+*.o
+*.a
 *_i.c
 *_p.c
 *_i.h
@@ -216,4 +232,4 @@ ehthumbs.db
 Desktop.ini
 
 # Recycle Bin used on file shares
-$RECYCLE.BIN/
\ No newline at end of file
+$RECYCLE.BIN/
diff --git a/core/io/resource_format_xml.cpp b/core/io/resource_format_xml.cpp
index f175c73e98..20a42f25df 100644
--- a/core/io/resource_format_xml.cpp
+++ b/core/io/resource_format_xml.cpp
@@ -97,16 +97,17 @@ ResourceInteractiveLoaderXML::Tag* ResourceInteractiveLoaderXML::parse_tag(bool
 
 	if (!complete) {
 		String name;
-		String value;
+		CharString r_value;
 		bool reading_value=false;
 
 		while(!f->eof_reached()) {
 
 			CharType c=get_char();
 			if (c=='>') {
-				if (value.length()) {
+				if (r_value.size()) {
 
-					tag.args[name]=value;
+					r_value.push_back(0);
+					tag.args[name].parse_utf8(r_value.get_data());
 				}
 				break;
 
@@ -115,17 +116,18 @@ ResourceInteractiveLoaderXML::Tag* ResourceInteractiveLoaderXML::parse_tag(bool
 				if (!reading_value && name.length()) {
 
 					reading_value=true;
-				} else if (reading_value && value.length()) {
+				} else if (reading_value && r_value.size()) {
 
-					tag.args[name]=value;
+					r_value.push_back(0);
+					tag.args[name].parse_utf8(r_value.get_data());
 					name="";
-					value="";
+					r_value.clear();
 					reading_value=false;
 				}
 
 			} else if (reading_value) {
 
-				value+=c;
+				r_value.push_back(c);
 			} else {
 
 				name+=c;
diff --git a/core/ustring.cpp b/core/ustring.cpp
index 336d8eea0a..b0f06c6ab6 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -2518,7 +2518,7 @@ bool String::begins_with(const char* p_string) const {
 		
 	}
 	
-	return true;
+	return *p_string == 0;
 	
 }
 
diff --git a/doc/engine_classes.xml b/doc/engine_classes.xml
index 8747aea601..fca2be0318 100644
--- a/doc/engine_classes.xml
+++ b/doc/engine_classes.xml
@@ -15046,6 +15046,13 @@
 			<description>
 			</description>
 		</method>
+		<method name="get_tiles_ids" qualifiers="const" >
+			<return type="Array">
+			</return>			
+			<description>
+			
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
diff --git a/drivers/webp/dec/decode_vp8.h b/drivers/webp/dec/decode_vp8.h
index 12c77bcbf6..c26a9fc891 100644
--- a/drivers/webp/dec/decode_vp8.h
+++ b/drivers/webp/dec/decode_vp8.h
@@ -12,7 +12,7 @@
 #ifndef WEBP_WEBP_DECODE_VP8_H_
 #define WEBP_WEBP_DECODE_VP8_H_
 
-#include "../webp/decode.h"
+#include "../decode.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/drivers/webp/dec/webp.c b/drivers/webp/dec/webp.c
index edd348cbe7..f44bc2b8ae 100644
--- a/drivers/webp/dec/webp.c
+++ b/drivers/webp/dec/webp.c
@@ -14,7 +14,7 @@
 #include "./vp8i.h"
 #include "./vp8li.h"
 #include "./webpi.h"
-#include "../webp/format_constants.h"
+#include "../format_constants.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/drivers/webp/mux/demux.c b/drivers/webp/mux/demux.c
index 4519f7d55b..501d08f41d 100644
--- a/drivers/webp/mux/demux.c
+++ b/drivers/webp/mux/demux.c
@@ -8,13 +8,13 @@
 //  WebP container demux.
 //
 
-#include "../webp/mux.h"
+#include "../mux.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "../webp/decode.h"  // WebPGetInfo
-#include "../webp/format_constants.h"
+#include "../decode.h"  // WebPGetInfo
+#include "../format_constants.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/drivers/webp/mux/muxi.h b/drivers/webp/mux/muxi.h
index edd8c368cd..2f06f3ed03 100644
--- a/drivers/webp/mux/muxi.h
+++ b/drivers/webp/mux/muxi.h
@@ -15,8 +15,8 @@
 #include <stdlib.h>
 #include "../dec/vp8i.h"
 #include "../dec/vp8li.h"
-#include "../webp/format_constants.h"
-#include "../webp/mux.h"
+#include "../format_constants.h"
+#include "../mux.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/platform/isim/SCsub b/platform/isim/SCsub
index 6fb568465e..e7de935b2e 100644
--- a/platform/isim/SCsub
+++ b/platform/isim/SCsub
@@ -5,11 +5,14 @@ iphone_lib = [
 	'#platform/iphone/os_iphone.cpp',
 	#'#platform/iphone/rasterizer_iphone.cpp',
 	'#platform/iphone/audio_driver_iphone.cpp',
+	'#platform/iphone/sem_iphone.cpp',
 	'#platform/iphone/gl_view.mm',
 	'#platform/iphone/main.m',
 	'#platform/iphone/app_delegate.mm',
 	'#platform/iphone/view_controller.mm',
-	'#platform/iphone/scoreloop_ios.mm',
+	'#platform/iphone/game_center.mm',
+	'#platform/iphone/in_app_store.mm',
+	'#platform/iphone/Appirater.m',
 ]
 
 
@@ -17,14 +20,25 @@ iphone_lib = [
 
 #iphone_lib = env.Library('iphone', iphone_lib)
 
-obj = env.Object('#platform/iphone/godot_iphone.cpp')
+env_ios = env.Clone();
+
+if env['ios_gles22_override'] == "yes":
+	env_ios.Append(CPPFLAGS=['-DGLES2_OVERRIDE'])
+
+if env['ios_GLES1_override'] == "yes":
+	env_ios.Append(CPPFLAGS=['-DGLES1_OVERRIDE'])
+
+if env['ios_appirater'] == "yes":
+	env_ios.Append(CPPFLAGS=['-DAPPIRATER_ENABLED'])
+
+obj = env_ios.Object('#platform/iphone/godot_iphone.cpp')
 
 prog = None
 if env["target"]=="release":
-	prog = env.Program('#bin/godot_iphone_opt', [obj] + iphone_lib)
+	prog = env_ios.Program('#bin/godot_opt', [obj] + iphone_lib)
 	#action = "dsymutil "+File(prog)[0].path+" -o ../build/script_exec/build/Debug-iphoneos/script_exec.app.dSYM"
 	#env.AddPostAction(prog, action)
 else:
-	prog = env.Program('#bin/godot', [obj] + iphone_lib)
+	prog = env_ios.Program('#bin/godot', [obj] + iphone_lib)
 	#action = "dsymutil "+File(prog)[0].path+" -o ../build/script_exec/build/Debug-iphoneos/script_exec.app.dSYM"
 	#env.AddPostAction(prog, action)
diff --git a/platform/isim/detect.py b/platform/isim/detect.py
index 8deabbf311..196d269deb 100644
--- a/platform/isim/detect.py
+++ b/platform/isim/detect.py
@@ -21,8 +21,14 @@ def get_opts():
 
 	return [
 		('ISIMPLATFORM', 'name of the iphone platform', 'iPhoneSimulator'),
-		('ISIMPATH', 'the path to iphone toolchain', '/Developer/Platforms/${ISIMPLATFORM}.platform'),
-		('ISIMSDK', 'path to the iphone SDK', '$ISIMPATH/Developer/SDKs/${ISIMPLATFORM}4.3.sdk'),
+		('ISIMPATH', 'the path to iphone toolchain', '/Applications/Xcode.app/Contents/Developer/Platforms/${ISIMPLATFORM}.platform'),
+		('ISIMSDK', 'path to the iphone SDK', '$ISIMPATH/Developer/SDKs/${ISIMPLATFORM}7.0.sdk'),
+		('game_center', 'Support for game center', 'yes'),
+		('store_kit', 'Support for in-app store', 'yes'),
+		('ios_gles22_override', 'Force GLES2.0 on iOS', 'yes'),
+		('ios_GLES1_override', 'Force legacy GLES (1.1) on iOS', 'no'),
+		('ios_appirater', 'Enable Appirater', 'no'),
+		('ios_exceptions', 'Use exceptions when compiling on playbook', 'no'),
 	]
 
 def get_flags():
@@ -31,6 +37,8 @@ def get_flags():
 		('lua', 'no'),
 		('tools', 'yes'),
 		('nedmalloc', 'no'),
+		('webp', 'yes'),
+		('module_FacebookScorer_ios_enabled', 'no'),
 	]
 
 
@@ -50,12 +58,12 @@ def configure(env):
 	env['AR'] = 'ar'
 
 	import string
-	env['CCFLAGS'] = string.split('-arch i386 -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fasm-blocks  -Wall -D__IPHONE_OS_VERSION_MIN_REQUIRED=40100 -isysroot $ISIMSDK -mmacosx-version-min=10.6 -DCUSTOM_MATRIX_TRANSFORM_H=\\\"build/iphone/matrix4_iphone.h\\\" -DCUSTOM_VECTOR3_TRANSFORM_H=\\\"build/iphone/vector3_iphone.h\\\"')
+	env['CCFLAGS'] = string.split('-arch i386 -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fasm-blocks  -Wall -D__IPHONE_OS_VERSION_MIN_REQUIRED=40100 -isysroot $ISIMSDK -mios-simulator-version-min=4.3 -DCUSTOM_MATRIX_TRANSFORM_H=\\\"build/iphone/matrix4_iphone.h\\\" -DCUSTOM_VECTOR3_TRANSFORM_H=\\\"build/iphone/vector3_iphone.h\\\"')
 
 	env.Append(LINKFLAGS=['-arch', 'i386',
-							#'-miphoneos-version-min=2.2.1',
+							'-mios-simulator-version-min=4.3',
 							'-isysroot', '$ISIMSDK',
-							'-mmacosx-version-min=10.6',
+							#'-mmacosx-version-min=10.6',
 							'-Xlinker',
 							'-objc_abi_version',
 							'-Xlinker', '2',
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 8dcba61c74..dda3527618 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -845,18 +845,17 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 	/*** OSX INITIALIZATION ***/
 	/*** OSX INITIALIZATION ***/
 	/*** OSX INITIALIZATION ***/
-
-	current_videomode=p_desired;
+    
 	window_delegate = [[GodotWindowDelegate alloc] init];
 
        // Don't use accumulation buffer support; it's not accelerated
        // Aux buffers probably aren't accelerated either
 
-	unsigned int styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | (current_videomode.resizable?NSResizableWindowMask:0);
+	unsigned int styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | (p_desired.resizable?NSResizableWindowMask:0);
 
 
 	window_object = [[GodotWindow alloc]
-	    initWithContentRect:NSMakeRect(0, 0, current_videomode.width,current_videomode.height)
+	    initWithContentRect:NSMakeRect(0, 0, p_desired.width, p_desired.height)
 		      styleMask:styleMask
 			backing:NSBackingStoreBuffered
 			  defer:NO];
@@ -865,6 +864,13 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 
 	window_view = [[GodotContentView alloc] init];
 
+	current_videomode = p_desired;
+
+	// Adjust for display density
+	const NSRect fbRect = convertRectToBacking(NSMakeRect(0, 0, p_desired.width, p_desired.height));
+	current_videomode.width = fbRect.size.width;
+	current_videomode.height = fbRect.size.height;
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
 	if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) {
 	    [window_view setWantsBestResolutionOpenGLSurface:YES];
diff --git a/platform/server/logo.h b/platform/server/logo.h
deleted file mode 100644
index bb383145f5..0000000000
--- a/platform/server/logo.h
+++ /dev/null
@@ -1,2 +0,0 @@
- /* AUTOGENERATED FILE, DO NOT EDIT */ 
- static const unsigned char _server_logo[]={0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0x73,0x7a,0x7a,0xf4,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x12,0x0,0x0,0xb,0x12,0x1,0xd2,0xdd,0x7e,0xfc,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdd,0x9,0x8,0x10,0x20,0x27,0x86,0x78,0xdd,0x76,0x0,0x0,0x7,0xff,0x49,0x44,0x41,0x54,0x58,0xc3,0xe5,0x97,0x5b,0x6c,0x5c,0xc5,0x19,0xc7,0x7f,0x67,0xe6,0xac,0xf7,0x7e,0xb1,0xbd,0x4e,0x7c,0x49,0xe2,0x24,0xb6,0x43,0x1c,0xc,0xa6,0x20,0x94,0x4,0xda,0x26,0x5,0x51,0x28,0xb4,0x5c,0x2a,0x55,0x50,0xb5,0x85,0xa6,0xea,0x13,0x8,0xa9,0xa5,0x2f,0x54,0xaa,0x8a,0xd4,0xdb,0x4b,0xdb,0x27,0xaa,0x88,0x16,0x1a,0x50,0x8a,0x84,0xd4,0xf6,0xa1,0x2,0x24,0x6e,0x89,0x80,0x8,0x8,0x71,0x2e,0x26,0xc1,0x71,0x12,0x27,0xbe,0x67,0xd7,0xb7,0xf5,0xae,0xd7,0xf6,0xee,0xd9,0x3d,0x7b,0x66,0xa6,0xf,0x6b,0x8c,0x93,0x42,0xc,0x42,0xed,0x4b,0x47,0x1a,0x9d,0xf3,0x30,0x33,0xdf,0xff,0xfb,0x7f,0xff,0x6f,0xe6,0xfb,0xe0,0xff,0x7d,0x58,0x9f,0x77,0xc3,0xbd,0xf7,0xdd,0xdf,0xf4,0xd8,0x63,0x8f,0xee,0xac,0xab,0xab,0xbb,0x49,0x79,0xaa,0xa1,0xe2,0x55,0xd2,0xe5,0x72,0x39,0x35,0x3f,0x3f,0x9f,0x4e,0xa5,0xd2,0xa9,0x43,0xef,0xbe,0x97,0xda,0xbf,0xef,0xe9,0x14,0x60,0xbe,0x30,0x80,0xef,0x3d,0xb8,0x67,0xdd,0xf,0x1f,0xfa,0xc1,0x8e,0x86,0x86,0xe4,0xce,0x40,0x4d,0xe0,0x26,0x21,0xe5,0x8e,0x78,0x3c,0x4a,0xc5,0xad,0x50,0x2a,0x97,0x50,0x9e,0x42,0x6b,0x85,0xa7,0x14,0x46,0x6b,0xb4,0xd6,0xb8,0xae,0xcb,0xc2,0xc2,0x22,0x8b,0x8b,0x8b,0xb8,0xae,0x9b,0xf1,0x94,0x97,0x5a,0x58,0x28,0xa4,0xa,0x85,0xe2,0xd3,0x3f,0xfd,0xc9,0xa3,0xff,0xba,0xdc,0x86,0xfd,0xd1,0xcf,0x9f,0xf6,0x3e,0x15,0xa,0x6,0x2,0x77,0x77,0x77,0x77,0x6f,0xf7,0x7,0xfc,0x3b,0x7d,0xb6,0xbd,0xbd,0xb6,0xb6,0x16,0x30,0x68,0x6d,0xd0,0xc6,0xa0,0x95,0xc2,0x71,0x1c,0x94,0x52,0x68,0xa5,0x51,0x5a,0xa1,0x95,0x42,0x79,0xa,0xa5,0x3c,0x5c,0xd7,0xc5,0xf3,0x3c,0x2a,0x95,0xa,0x42,0xa,0x4a,0x65,0x37,0xd9,0x73,0xa4,0x27,0xd9,0x77,0xfa,0x74,0x77,0x3a,0x95,0x7e,0xe5,0x93,0x9c,0x5c,0x6,0xb0,0x7e,0x5d,0x73,0x2c,0x3f,0x57,0x78,0x61,0x72,0x62,0x8a,0xc6,0xa6,0x35,0x84,0x6a,0x13,0xb8,0x6e,0x19,0xad,0x34,0x58,0x16,0x9e,0xe7,0xe1,0xb3,0xab,0xcb,0x8d,0x31,0x68,0xa3,0xd1,0x4a,0x61,0x8c,0x1,0xc,0x13,0x93,0x53,0x4c,0x4f,0xcf,0x30,0x3a,0x3a,0xc6,0xc9,0x93,0xbd,0x7c,0xd0,0xdb,0xcb,0xc8,0xc8,0x30,0xc1,0x60,0x98,0x58,0x2c,0x4e,0x20,0x10,0xf2,0xad,0x1a,0x82,0x7,0xee,0xff,0xb1,0x9,0x5,0x23,0x18,0xa3,0xb1,0x6d,0x1b,0x7f,0xc0,0x47,0x34,0x16,0x21,0x14,0xc,0x10,0x89,0x86,0xf0,0xf9,0x6c,0x42,0xe1,0x0,0xc1,0x80,0x9f,0xba,0xba,0x3a,0x36,0xb4,0x6e,0xe0,0xf8,0xb1,0x13,0xbc,0xfe,0xc6,0x1b,0xc,0x9c,0x3b,0xc7,0xc0,0xc0,0x59,0xb2,0xd9,0xec,0xf2,0x79,0x42,0x48,0x62,0xd1,0x18,0x9d,0x9d,0xd7,0x21,0xa5,0xec,0x7c,0xe7,0xdd,0x3,0x67,0x3f,0x95,0x1,0x0,0xaf,0xe2,0x22,0x22,0x2,0xa3,0x2d,0x94,0x56,0x14,0xa,0x1e,0x8b,0x5,0x7,0x8c,0xa9,0x7a,0xad,0xf5,0x92,0xc7,0x10,0xa,0x7,0x19,0x1f,0x1b,0xe0,0x95,0x57,0x5f,0xfe,0x44,0xfd,0xb4,0xb4,0xb4,0xd2,0xde,0xb6,0x15,0x21,0x24,0xd3,0xd3,0x13,0xb8,0x95,0xf2,0x5d,0xc0,0x95,0x1,0x54,0xbc,0x45,0x66,0x67,0xb,0xd8,0xb6,0xf,0x29,0x6d,0x22,0x91,0x38,0xb9,0xec,0x3c,0xe1,0x48,0xc,0xcb,0x18,0x8c,0x56,0x60,0x9,0x8c,0x31,0xa8,0x8a,0x62,0x72,0x72,0xea,0x92,0xc3,0xe2,0xf1,0x5a,0xb6,0x75,0x5e,0x83,0x14,0x92,0x91,0xf1,0x21,0x8e,0x1c,0x39,0x44,0x24,0x1a,0x23,0x91,0xa8,0x27,0xe0,0xf,0x9c,0xb8,0xa2,0x6,0x0,0x84,0xc,0x13,0x9,0x47,0x11,0x42,0x60,0xdb,0x92,0x52,0xa9,0x48,0xd1,0x99,0x67,0x2e,0x3f,0x43,0x7c,0xcb,0x97,0xd8,0x75,0xff,0xb7,0xc9,0x8c,0x5c,0xe4,0xec,0xb1,0x51,0xca,0xa5,0x1c,0x0,0x3e,0x9f,0x9f,0xab,0xb6,0x74,0x92,0x48,0x24,0xc8,0x64,0xa6,0x39,0xfc,0xfe,0xa1,0x6a,0x6c,0x2d,0x68,0x6d,0xed,0x60,0xe3,0xc6,0x76,0xa4,0x94,0xcc,0xcc,0x4c,0x25,0x57,0x5,0x30,0x9b,0x49,0x61,0x99,0xb5,0xd8,0x76,0x0,0x69,0xfb,0x10,0x96,0x20,0x1e,0x5f,0x3,0x18,0x4c,0x66,0x92,0x43,0x7b,0x9f,0x42,0xd6,0xaf,0xa5,0x36,0xba,0x16,0xaf,0xe5,0x5a,0x16,0x7,0x7,0x68,0x6b,0x2b,0x30,0x38,0x74,0xe,0xc7,0x71,0x0,0x90,0xd2,0xa6,0xbd,0xed,0x2a,0xea,0xeb,0x1b,0x98,0xcd,0x66,0x18,0x18,0x38,0x4d,0x34,0x1a,0x27,0x18,0xc,0x35,0xac,0xa,0xa0,0xa5,0x65,0x23,0xa0,0x11,0xd2,0x60,0x4b,0x8f,0xe1,0xe1,0x61,0xca,0x65,0x97,0x44,0xa2,0x9e,0x70,0x20,0x84,0x52,0x60,0xb9,0xa3,0x64,0xa7,0xc7,0xf1,0x7,0xfa,0x89,0xe6,0x7,0x39,0x71,0xb6,0x1f,0x80,0x70,0x38,0x4a,0x67,0x67,0x17,0x15,0xd7,0xe5,0xc2,0xe0,0x39,0x46,0xc7,0x86,0x8,0x87,0xa3,0x34,0xae,0x6d,0xa1,0xb9,0x79,0x3d,0xc5,0x52,0xf1,0xf0,0x6a,0x0,0x44,0xa1,0x50,0x24,0x10,0x8,0xe1,0x55,0x34,0x65,0x14,0xcd,0xcd,0x6d,0x48,0x29,0x28,0x14,0xe6,0x11,0xeb,0xb7,0xb0,0xeb,0xfb,0xf,0x30,0xb5,0xe0,0x31,0xfb,0xc1,0xc,0x73,0x73,0x13,0x94,0x2e,0xc,0xd1,0xd8,0xd8,0x4c,0x53,0x53,0xb,0xf3,0xf3,0x39,0x8e,0x1d,0x3b,0xbc,0x44,0xbf,0xc5,0xc6,0x8d,0x1d,0x34,0x35,0xb6,0xe0,0x38,0xe,0x93,0x53,0x69,0xc2,0xa1,0xc8,0xd7,0x80,0xde,0x2b,0x1,0xd0,0xc5,0x62,0x96,0x72,0x39,0x4f,0x30,0x18,0xc1,0x68,0xb,0x63,0x34,0x95,0x8a,0xc0,0xb2,0x6c,0xbc,0xf1,0xb,0x1c,0xfc,0xd5,0x13,0x68,0xe5,0xe1,0x8a,0x20,0xb5,0xeb,0xdb,0xa9,0xa9,0xa9,0xc1,0x71,0xa,0xf4,0xf6,0x1e,0x5d,0xce,0xea,0xd6,0xd6,0x4d,0xd4,0xd7,0x25,0xc9,0xe6,0x66,0x19,0x1e,0xb9,0x40,0x2c,0x9a,0xa0,0xa1,0xa1,0x11,0x9f,0xcf,0x3e,0xb8,0x1a,0x3,0xd2,0xb6,0xc3,0x24,0xe2,0x75,0x28,0x5d,0xc1,0x71,0x16,0x99,0x18,0xbf,0x88,0xb4,0x25,0x16,0x16,0xf1,0x96,0xcd,0x24,0x1a,0x1a,0xc8,0x8f,0x8e,0x52,0x23,0x1c,0x54,0x66,0x8,0x51,0x98,0x21,0x9f,0xcf,0x63,0x59,0x82,0xcd,0x9b,0xdb,0xf1,0xfb,0xfd,0x8c,0x8d,0x8d,0x30,0x35,0x99,0x26,0x12,0x8d,0xd3,0xd4,0xb4,0x8e,0x48,0x38,0x86,0x52,0x1e,0x42,0x88,0x5b,0x80,0x93,0x57,0x2,0xa0,0x8a,0xc5,0x79,0xa4,0x10,0x8,0xe9,0x43,0x4a,0x3f,0x6b,0xd6,0xac,0xc3,0xb2,0x2c,0x7c,0x3e,0x1f,0x4,0x42,0x6c,0xfe,0xea,0x2e,0x8a,0x75,0xad,0xa4,0x3f,0x2c,0x61,0x6a,0x34,0x3a,0xff,0x24,0x6d,0x9b,0xb3,0x60,0x59,0x8c,0x8d,0xd,0x57,0xaf,0x60,0x21,0x68,0xdd,0xd0,0x46,0x6d,0x6d,0x1d,0x45,0xa7,0x48,0xa1,0xb0,0x40,0x24,0x12,0xc3,0xf6,0xf9,0xd4,0xaa,0x22,0x8c,0x44,0x63,0xf8,0xfd,0x12,0x4b,0x68,0xfa,0x4f,0xf7,0x13,0x8,0x4,0xa9,0xab,0x4d,0x12,0x8,0x46,0xd0,0xc5,0x49,0x8e,0x3f,0xbf,0x1f,0xb4,0x46,0x6b,0xf,0x19,0x8,0xe3,0x65,0xd3,0xc,0xe,0x5d,0x58,0xde,0xdf,0xd4,0xd4,0x42,0x22,0x51,0xcb,0xdc,0xdc,0x1c,0x93,0x93,0x13,0x44,0xa3,0xb1,0xe5,0x3b,0xc5,0x96,0x36,0xab,0x8a,0xd0,0x29,0x96,0xd1,0xda,0x2,0x3,0x1d,0x5b,0xba,0x50,0x5e,0x85,0xc5,0xc5,0x79,0xe6,0x17,0x32,0x24,0xb6,0x6d,0x67,0xd7,0xdd,0xdf,0xa0,0xb7,0xa7,0x97,0xf4,0xf1,0x53,0xf8,0xdc,0xc,0x7e,0x5c,0x0,0x92,0xc9,0x6,0x62,0xb1,0x38,0x53,0x53,0x93,0x64,0xb3,0x59,0xa2,0x91,0x28,0xe1,0x70,0x14,0x69,0xdb,0x48,0xdb,0xc6,0x5e,0xfa,0xae,0xca,0x80,0x36,0xd5,0x67,0xd5,0x0,0x8e,0xe3,0x70,0xfe,0xc2,0x19,0x9c,0xe2,0x22,0xd7,0x74,0x5d,0x4f,0xf1,0xec,0x49,0x5e,0x1e,0x3b,0x4f,0xb2,0x7d,0x1b,0xf5,0x5b,0x77,0x53,0x5a,0xd3,0x4e,0xf1,0xc0,0x5f,0x68,0x6e,0x4e,0x91,0xcb,0xe5,0xc8,0x64,0x66,0x10,0x42,0x10,0xe,0x45,0x96,0xd,0x7f,0xe4,0xf9,0x67,0x65,0x0,0xad,0x34,0x5a,0x2b,0xb4,0x31,0x60,0xe0,0x3b,0xb7,0xda,0x68,0x13,0xa1,0x67,0xa0,0x82,0x6d,0x4b,0x28,0x16,0xc9,0x9c,0x3a,0xa,0xa6,0x87,0x80,0xdf,0x47,0x68,0x66,0x8a,0x33,0xe9,0xf4,0x25,0x8f,0xcf,0x4a,0xc3,0xb6,0x5c,0xc1,0x80,0x94,0xd6,0x65,0x8f,0x9f,0x1,0x10,0x97,0x0,0xd0,0x1a,0xa5,0x34,0x46,0x6b,0xdc,0x4a,0x99,0x2d,0xdb,0x1f,0xe3,0xce,0xef,0x3e,0x49,0x3a,0x35,0x8a,0xf6,0x14,0xda,0xa8,0xea,0x1a,0xa3,0xf1,0xb4,0x5,0x42,0x5c,0xea,0x4d,0xd5,0xd0,0xb2,0x61,0x69,0x7f,0xcc,0xc0,0x12,0x80,0x2b,0x33,0x50,0x2d,0x30,0x3c,0x34,0x90,0x4e,0x5f,0x64,0xcf,0x9e,0x3d,0x48,0x29,0x70,0x4a,0xb,0x28,0xad,0x30,0x1f,0x55,0x59,0xc6,0xa0,0xf5,0xa5,0xa2,0xb6,0x2c,0x81,0x6d,0xaf,0xf0,0x7a,0x25,0xfd,0xb6,0x4d,0xa5,0x52,0x9,0x3,0x21,0xa0,0x4,0xe8,0x65,0xd6,0x56,0x1e,0x62,0xb4,0x46,0x69,0x8d,0xe3,0xb8,0x1c,0x7e,0xc6,0xe5,0xbd,0x37,0xf7,0x57,0xaf,0xe8,0xa4,0xc2,0x75,0x4b,0x4b,0xc,0x29,0x94,0xae,0xce,0x95,0x8c,0x4a,0x29,0x90,0xd2,0x46,0xac,0xa0,0x5e,0x2e,0x31,0x12,0xc,0x45,0x48,0xd4,0xd7,0x45,0x81,0x75,0x40,0x1c,0xa8,0x59,0xda,0x6c,0x89,0xff,0x64,0x40,0x61,0x61,0xf8,0xe7,0xeb,0x1e,0xe1,0xdc,0x9f,0xf9,0xdd,0x6f,0x7e,0x4b,0xcf,0xb,0x16,0xdd,0x1d,0xe5,0x6a,0x29,0xa6,0x15,0x4a,0xe9,0x6a,0xa5,0xb4,0xf2,0x16,0x5b,0xe1,0xed,0x32,0xf5,0x42,0xb2,0xb5,0xab,0x9b,0x1b,0x77,0x5c,0xeb,0xbc,0xfd,0xe6,0x4b,0x47,0x81,0x24,0xd0,0xb8,0x4,0x42,0x0,0x66,0x39,0x4,0xc9,0xc6,0x66,0xa2,0x91,0x38,0xb,0x8b,0x79,0x84,0x25,0x78,0xe6,0xb5,0xf5,0xec,0x7d,0xa9,0x82,0x52,0xff,0x20,0x73,0x5a,0x70,0xf4,0xc,0xd8,0xbe,0xa5,0x12,0xec,0xb2,0x10,0x58,0x96,0x55,0xcd,0x77,0xbb,0x1a,0x7f,0xb,0x8b,0xe6,0xd,0x6d,0x6c,0xdf,0x71,0x3,0x5e,0x29,0x8f,0xf1,0xdc,0xe0,0x97,0xbf,0xb2,0xeb,0x9a,0xd1,0xd1,0xbf,0x4d,0x2,0x8b,0x40,0xe,0x50,0x97,0x68,0x20,0x33,0x99,0xd6,0x37,0xff,0xe8,0x67,0x0,0x5c,0x4c,0x8d,0x30,0x35,0x95,0x26,0x37,0x37,0x8b,0x5b,0xb6,0x78,0xeb,0x5c,0x2b,0x96,0x71,0x97,0x6a,0x40,0x30,0x18,0x94,0x56,0xcb,0x1,0x90,0x52,0x56,0xa7,0x25,0x88,0x26,0x92,0xdc,0x7a,0xdb,0xed,0xd4,0xc5,0x7c,0x68,0x77,0x81,0x1a,0x7f,0x70,0xe6,0xc5,0x97,0x5e,0xfc,0xf5,0xa1,0xb7,0xdf,0x3a,0x8,0x8c,0x0,0xc5,0x4f,0x15,0x61,0x47,0xe7,0x9a,0xbd,0xd3,0x53,0x33,0xf,0xd7,0x25,0xb7,0x32,0x3e,0x16,0x63,0x64,0x78,0x14,0xaf,0x54,0x60,0xe6,0x86,0x6f,0xe2,0x8,0x3f,0x35,0x83,0xef,0x13,0x9f,0x1d,0x41,0xb9,0x15,0xe6,0x17,0x16,0xb0,0xac,0x8f,0xd3,0xcf,0xf6,0xd5,0x70,0xf3,0xee,0x3b,0xd8,0xb6,0x75,0x13,0xaa,0x52,0xc2,0xf6,0x85,0x38,0x3f,0x70,0x7e,0xdf,0xbe,0x7d,0x4f,0xef,0x95,0x52,0xe,0x2,0x73,0xab,0x66,0x81,0x2d,0x7c,0xf,0xc7,0x63,0x31,0x2e,0x5e,0x1c,0xa7,0xb1,0x39,0x4e,0xe7,0xb6,0x5d,0xcc,0x66,0x73,0x4c,0x5c,0xec,0xe3,0xe4,0xd1,0x1e,0x46,0x88,0xd3,0xb1,0xa5,0x99,0x5b,0x77,0xef,0xe4,0x54,0xdf,0x0,0xef,0xbc,0xfd,0x16,0x0,0x5b,0xbb,0x6e,0xe4,0xb6,0xdb,0x6e,0x41,0xb9,0xb,0x8,0xcb,0xe0,0x54,0x54,0xcf,0x1f,0xff,0xf0,0xfb,0x5f,0x66,0x32,0x33,0xc7,0x81,0x8c,0x52,0xea,0x33,0x37,0x26,0xfe,0x67,0x9f,0xdb,0x7f,0xdf,0xa6,0xcd,0x9b,0xee,0x9,0xf8,0xfd,0x77,0xcd,0xe5,0xe6,0xa2,0x7d,0x7d,0x1f,0x92,0x4a,0xa7,0x88,0x44,0x22,0xa8,0x8a,0x22,0x9b,0x9b,0xe3,0xd4,0xa9,0x93,0x9c,0x39,0xd3,0xcf,0xd5,0x57,0x5f,0x4f,0xc7,0xb6,0x2e,0x82,0x76,0x85,0x40,0x20,0x40,0x38,0x1c,0xcd,0xf7,0xf4,0x1c,0xf9,0xc5,0x6b,0xaf,0xbd,0xf2,0xf7,0x3b,0xba,0x98,0x7e,0xb5,0xef,0xb,0x76,0x46,0xf,0x3e,0xb4,0x67,0xeb,0x1d,0xb7,0xdf,0x7e,0xaf,0xcf,0xe7,0xfb,0x96,0xe3,0x38,0x37,0xe5,0x72,0x59,0x86,0x86,0x87,0x28,0x97,0xca,0xb4,0x77,0xb4,0x23,0x2c,0x41,0x7f,0x7f,0x3f,0x6b,0xd7,0x36,0x91,0x4a,0xa5,0x9e,0x7d,0xee,0xb9,0xbf,0x3e,0x51,0x5b,0x5b,0x9b,0xca,0xe5,0x72,0xfa,0xbf,0xd1,0x1b,0x5a,0x8f,0x3f,0xfe,0xf3,0xaf,0xd7,0xd7,0x27,0xef,0xf1,0xfb,0xfd,0x77,0x5e,0x77,0x5d,0x77,0x6b,0x3e,0x9f,0xe7,0xe0,0xc1,0x37,0x8f,0x1f,0x38,0xf0,0xfa,0xc3,0x7d,0x7d,0x1f,0x9e,0x0,0xbc,0xff,0x49,0x47,0x2b,0xa5,0xc4,0xb2,0xec,0xc6,0x47,0x1e,0x79,0x74,0xf7,0xe5,0x3a,0xfa,0xbc,0xe3,0xdf,0x37,0xe9,0xbc,0x82,0x8a,0x4b,0xde,0x1,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82};
diff --git a/platform/windows/stream_peer_winsock.cpp b/platform/windows/stream_peer_winsock.cpp
index 2c3a8db7b1..eabfb30599 100644
--- a/platform/windows/stream_peer_winsock.cpp
+++ b/platform/windows/stream_peer_winsock.cpp
@@ -337,8 +337,9 @@ Error StreamPeerWinsock::connect(const IP_Address& p_host, uint16_t p_port) {
 };
 
 void StreamPeerWinsock::set_nodelay(bool p_enabled) {
-
-
+    ERR_FAIL_COND(!is_connected());
+    int flag=p_enabled?1:0;
+    setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int));
 }
 
 
diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp
index c85b470325..208ba5bb66 100644
--- a/scene/resources/tile_set.cpp
+++ b/scene/resources/tile_set.cpp
@@ -250,6 +250,17 @@ Array TileSet::_tile_get_shapes(int p_id) const{
 	return arr;
 }
 
+Array TileSet::_get_tiles_ids() const{
+	
+	Array arr;
+
+	for (Map<int, Data>::Element *E = tile_map.front(); E; E = E->next()) {
+		arr.push_back(E->key());		
+	}
+	
+	return arr;
+}
+
 void TileSet::get_tile_list(List<int> *p_tiles) const {
 
 	for(Map<int,Data>::Element *E=tile_map.front();E;E=E->next()) {
@@ -322,6 +333,7 @@ void TileSet::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("clear"),&TileSet::clear);
 	ObjectTypeDB::bind_method(_MD("get_last_unused_tile_id"),&TileSet::get_last_unused_tile_id);
 	ObjectTypeDB::bind_method(_MD("find_tile_by_name","name"),&TileSet::find_tile_by_name);
+	ObjectTypeDB::bind_method(_MD("get_tiles_ids", "name"), &TileSet::_get_tiles_ids);
 
 }
 
diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h
index 0550962362..ddbb1b59a6 100644
--- a/scene/resources/tile_set.h
+++ b/scene/resources/tile_set.h
@@ -57,6 +57,7 @@ protected:
 	void _get_property_list( List<PropertyInfo> *p_list) const;
 	void _tile_set_shapes(int p_id,const Array& p_shapes);
 	Array _tile_get_shapes(int p_id) const;
+	Array _get_tiles_ids() const;
 
 	static void _bind_methods();
 public:
diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp
index bf07b8ea8c..cbf5cffce6 100644
--- a/servers/physics_2d_server.cpp
+++ b/servers/physics_2d_server.cpp
@@ -288,8 +288,8 @@ void Physics2DServer::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("area_clear_shapes","area"),&Physics2DServer::area_clear_shapes);
 
 
-	ObjectTypeDB::bind_method(_MD("area_set_param","area","param","value"),&Physics2DServer::area_get_param);
-	ObjectTypeDB::bind_method(_MD("area_set_transform","area","transform"),&Physics2DServer::area_get_transform);
+	ObjectTypeDB::bind_method(_MD("area_set_param","area","param","value"),&Physics2DServer::area_set_param);
+	ObjectTypeDB::bind_method(_MD("area_set_transform","area","transform"),&Physics2DServer::area_set_transform);
 
 	ObjectTypeDB::bind_method(_MD("area_get_param","area","param"),&Physics2DServer::area_get_param);
 	ObjectTypeDB::bind_method(_MD("area_get_transform","area"),&Physics2DServer::area_get_transform);
diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp
index 070f8d1bad..192fcaa908 100644
--- a/tools/editor/project_export.cpp
+++ b/tools/editor/project_export.cpp
@@ -1057,7 +1057,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 
 	tree = memnew( Tree );
 	tree_vb->add_margin_child("Resources to Export:",tree,true);
-	sections->add_child(tree);
+
 	tree->set_v_size_flags(SIZE_EXPAND_FILL);
 	tree->connect("item_edited",this,"_tree_changed");
 	tree->set_columns(2);