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

17 files changed, 467 insertions, 470 deletions

diff --git a/platform/windows/SCsub b/platform/windows/SCsub
index a77428e954..1ad32e7989 100644
--- a/platform/windows/SCsub
+++ b/platform/windows/SCsub
@@ -12,3 +12,9 @@ common_win=[
 ]
 
 env.Program('#bin/godot',['godot_win.cpp']+common_win,PROGSUFFIX=env["PROGSUFFIX"])
+
+# Microsoft Visual Studio Project Generation			
+if (env['vsproj'])=="yes":
+	env.vs_srcs = env.vs_srcs + ["platform/windows/godot_win.cpp"]
+	for x in common_win:
+		env.vs_srcs = env.vs_srcs + ["platform/windows/" + x]
diff --git a/platform/windows/context_gl_win.cpp b/platform/windows/context_gl_win.cpp
index a8f74fde2c..5a9c8edc63 100644
--- a/platform/windows/context_gl_win.cpp
+++ b/platform/windows/context_gl_win.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/windows/context_gl_win.h b/platform/windows/context_gl_win.h
index 6e8d99a5f0..5397676c8e 100644
--- a/platform/windows/context_gl_win.h
+++ b/platform/windows/context_gl_win.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/windows/ctxgl_procaddr.cpp b/platform/windows/ctxgl_procaddr.cpp
index 9715784c32..6e5f53eb96 100644
--- a/platform/windows/ctxgl_procaddr.cpp
+++ b/platform/windows/ctxgl_procaddr.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -26,161 +26,161 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifdef OPENGL_ENABLED

-#include "ctxgl_procaddr.h"

-#include <GL/gl.h>

-#include <stdio.h>

-

-static PROC _gl_procs[]={

-	(PROC)glCullFace,

-	(PROC)glFrontFace,

-	(PROC)glHint,

-	(PROC)glLineWidth,

-	(PROC)glPointSize,

-	(PROC)glPolygonMode,

-	(PROC)glScissor,

-	(PROC)glTexParameterf,

-	(PROC)glTexParameterfv,

-	(PROC)glTexParameteri,

-	(PROC)glTexParameteriv,

-	(PROC)glTexImage1D,

-	(PROC)glTexImage2D,

-	(PROC)glDrawBuffer,

-	(PROC)glClear,

-	(PROC)glClearColor,

-	(PROC)glClearStencil,

-	(PROC)glClearDepth,

-	(PROC)glStencilMask,

-	(PROC)glColorMask,

-	(PROC)glDepthMask,

-	(PROC)glDisable,

-	(PROC)glEnable,

-	(PROC)glFinish,

-	(PROC)glFlush,

-	(PROC)glBlendFunc,

-	(PROC)glLogicOp,

-	(PROC)glStencilFunc,

-	(PROC)glStencilOp,

-	(PROC)glDepthFunc,

-	(PROC)glPixelStoref,

-	(PROC)glPixelStorei,

-	(PROC)glReadBuffer,

-	(PROC)glReadPixels,

-	(PROC)glGetBooleanv,

-	(PROC)glGetDoublev,

-	(PROC)glGetError,

-	(PROC)glGetFloatv,

-	(PROC)glGetIntegerv,

-	(PROC)glGetString,

-	(PROC)glGetTexImage,

-	(PROC)glGetTexParameterfv,

-	(PROC)glGetTexParameteriv,

-	(PROC)glGetTexLevelParameterfv,

-	(PROC)glGetTexLevelParameteriv,

-	(PROC)glIsEnabled,

-	(PROC)glDepthRange,

-	(PROC)glViewport,

-	/* not detected in ATI */

-	(PROC)glDrawArrays,

-	(PROC)glDrawElements,

-	(PROC)glGetPointerv,

-	(PROC)glPolygonOffset,

-	(PROC)glCopyTexImage1D,

-	(PROC)glCopyTexImage2D,

-	(PROC)glCopyTexSubImage1D,

-	(PROC)glCopyTexSubImage2D,

-	(PROC)glTexSubImage1D,

-	(PROC)glTexSubImage2D,

-	(PROC)glBindTexture,

-	(PROC)glDeleteTextures,

-	(PROC)glGenTextures,

-	(PROC)glIsTexture,

-

-	0

-};

-

-static const char* _gl_proc_names[]={

-	"glCullFace",

-	"glFrontFace",

-	"glHint",

-	"glLineWidth",

-	"glPointSize",

-	"glPolygonMode",

-	"glScissor",

-	"glTexParameterf",

-	"glTexParameterfv",

-	"glTexParameteri",

-	"glTexParameteriv",

-	"glTexImage1D",

-	"glTexImage2D",

-	"glDrawBuffer",

-	"glClear",

-	"glClearColor",

-	"glClearStencil",

-	"glClearDepth",

-	"glStencilMask",

-	"glColorMask",

-	"glDepthMask",

-	"glDisable",

-	"glEnable",

-	"glFinish",

-	"glFlush",

-	"glBlendFunc",

-	"glLogicOp",

-	"glStencilFunc",

-	"glStencilOp",

-	"glDepthFunc",

-	"glPixelStoref",

-	"glPixelStorei",

-	"glReadBuffer",

-	"glReadPixels",

-	"glGetBooleanv",

-	"glGetDoublev",

-	"glGetError",

-	"glGetFloatv",

-	"glGetIntegerv",

-	"glGetString",

-	"glGetTexImage",

-	"glGetTexParameterfv",

-	"glGetTexParameteriv",

-	"glGetTexLevelParameterfv",

-	"glGetTexLevelParameteriv",

-	"glIsEnabled",

-	"glDepthRange",

-	"glViewport",

-	/* not detected in ati */

-	"glDrawArrays",

-	"glDrawElements",

-	"glGetPointerv",

-	"glPolygonOffset",

-	"glCopyTexImage1D",

-	"glCopyTexImage2D",

-	"glCopyTexSubImage1D",

-	"glCopyTexSubImage2D",

-	"glTexSubImage1D",

-	"glTexSubImage2D",

-	"glBindTexture",

-	"glDeleteTextures",

-	"glGenTextures",

-	"glIsTexture",

-

-	0

-};

-

-PROC get_gl_proc_address(const char* p_address) {

-

-	PROC proc = wglGetProcAddress((const CHAR*)p_address);

-	if (!proc) {

-

-		int i=0;

-		while(_gl_procs[i]) {

-

-			if (strcmp(p_address,_gl_proc_names[i])==0) {

-				return _gl_procs[i];

-			}

-			i++;

-		}

-	}

-	return proc;

-}

-#endif

+#ifdef OPENGL_ENABLED
+#include "ctxgl_procaddr.h"
+#include <GL/gl.h>
+#include <stdio.h>
+
+static PROC _gl_procs[]={
+	(PROC)glCullFace,
+	(PROC)glFrontFace,
+	(PROC)glHint,
+	(PROC)glLineWidth,
+	(PROC)glPointSize,
+	(PROC)glPolygonMode,
+	(PROC)glScissor,
+	(PROC)glTexParameterf,
+	(PROC)glTexParameterfv,
+	(PROC)glTexParameteri,
+	(PROC)glTexParameteriv,
+	(PROC)glTexImage1D,
+	(PROC)glTexImage2D,
+	(PROC)glDrawBuffer,
+	(PROC)glClear,
+	(PROC)glClearColor,
+	(PROC)glClearStencil,
+	(PROC)glClearDepth,
+	(PROC)glStencilMask,
+	(PROC)glColorMask,
+	(PROC)glDepthMask,
+	(PROC)glDisable,
+	(PROC)glEnable,
+	(PROC)glFinish,
+	(PROC)glFlush,
+	(PROC)glBlendFunc,
+	(PROC)glLogicOp,
+	(PROC)glStencilFunc,
+	(PROC)glStencilOp,
+	(PROC)glDepthFunc,
+	(PROC)glPixelStoref,
+	(PROC)glPixelStorei,
+	(PROC)glReadBuffer,
+	(PROC)glReadPixels,
+	(PROC)glGetBooleanv,
+	(PROC)glGetDoublev,
+	(PROC)glGetError,
+	(PROC)glGetFloatv,
+	(PROC)glGetIntegerv,
+	(PROC)glGetString,
+	(PROC)glGetTexImage,
+	(PROC)glGetTexParameterfv,
+	(PROC)glGetTexParameteriv,
+	(PROC)glGetTexLevelParameterfv,
+	(PROC)glGetTexLevelParameteriv,
+	(PROC)glIsEnabled,
+	(PROC)glDepthRange,
+	(PROC)glViewport,
+	/* not detected in ATI */
+	(PROC)glDrawArrays,
+	(PROC)glDrawElements,
+	(PROC)glGetPointerv,
+	(PROC)glPolygonOffset,
+	(PROC)glCopyTexImage1D,
+	(PROC)glCopyTexImage2D,
+	(PROC)glCopyTexSubImage1D,
+	(PROC)glCopyTexSubImage2D,
+	(PROC)glTexSubImage1D,
+	(PROC)glTexSubImage2D,
+	(PROC)glBindTexture,
+	(PROC)glDeleteTextures,
+	(PROC)glGenTextures,
+	(PROC)glIsTexture,
+
+	0
+};
+
+static const char* _gl_proc_names[]={
+	"glCullFace",
+	"glFrontFace",
+	"glHint",
+	"glLineWidth",
+	"glPointSize",
+	"glPolygonMode",
+	"glScissor",
+	"glTexParameterf",
+	"glTexParameterfv",
+	"glTexParameteri",
+	"glTexParameteriv",
+	"glTexImage1D",
+	"glTexImage2D",
+	"glDrawBuffer",
+	"glClear",
+	"glClearColor",
+	"glClearStencil",
+	"glClearDepth",
+	"glStencilMask",
+	"glColorMask",
+	"glDepthMask",
+	"glDisable",
+	"glEnable",
+	"glFinish",
+	"glFlush",
+	"glBlendFunc",
+	"glLogicOp",
+	"glStencilFunc",
+	"glStencilOp",
+	"glDepthFunc",
+	"glPixelStoref",
+	"glPixelStorei",
+	"glReadBuffer",
+	"glReadPixels",
+	"glGetBooleanv",
+	"glGetDoublev",
+	"glGetError",
+	"glGetFloatv",
+	"glGetIntegerv",
+	"glGetString",
+	"glGetTexImage",
+	"glGetTexParameterfv",
+	"glGetTexParameteriv",
+	"glGetTexLevelParameterfv",
+	"glGetTexLevelParameteriv",
+	"glIsEnabled",
+	"glDepthRange",
+	"glViewport",
+	/* not detected in ati */
+	"glDrawArrays",
+	"glDrawElements",
+	"glGetPointerv",
+	"glPolygonOffset",
+	"glCopyTexImage1D",
+	"glCopyTexImage2D",
+	"glCopyTexSubImage1D",
+	"glCopyTexSubImage2D",
+	"glTexSubImage1D",
+	"glTexSubImage2D",
+	"glBindTexture",
+	"glDeleteTextures",
+	"glGenTextures",
+	"glIsTexture",
+
+	0
+};
+
+PROC get_gl_proc_address(const char* p_address) {
+
+	PROC proc = wglGetProcAddress((const CHAR*)p_address);
+	if (!proc) {
+
+		int i=0;
+		while(_gl_procs[i]) {
+
+			if (strcmp(p_address,_gl_proc_names[i])==0) {
+				return _gl_procs[i];
+			}
+			i++;
+		}
+	}
+	return proc;
+}
+#endif
diff --git a/platform/windows/ctxgl_procaddr.h b/platform/windows/ctxgl_procaddr.h
index d3ab20e82d..916b480639 100644
--- a/platform/windows/ctxgl_procaddr.h
+++ b/platform/windows/ctxgl_procaddr.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -26,13 +26,13 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef CTXGL_PROCADDR_H

-#define CTXGL_PROCADDR_H

-

-#ifdef OPENGL_ENABLED

-#include <windows.h>

-

-

-PROC get_gl_proc_address(const char* p_address);

-#endif

-#endif // CTXGL_PROCADDR_H

+#ifndef CTXGL_PROCADDR_H
+#define CTXGL_PROCADDR_H
+
+#ifdef OPENGL_ENABLED
+#include <windows.h>
+
+
+PROC get_gl_proc_address(const char* p_address);
+#endif
+#endif // CTXGL_PROCADDR_H
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 9cdf04797c..0fe4f9f3b5 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -201,10 +201,16 @@ def configure(env):
 

 			env.Append(CCFLAGS=['/O2','/DDEBUG_ENABLED'])

 			env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])

+		elif (env["target"]=="debug_release"):

+

+			env.Append(CCFLAGS=['/Zi','/Od'])

+			env.Append(LINKFLAGS=['/DEBUG'])

+			env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])

+			env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])

 

 		elif (env["target"]=="debug"):

 

-			env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DDEBUG_MEMORY_ENABLED','/DD3D_DEBUG_INFO','/O1'])

+			env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DDEBUG_MEMORY_ENABLED','/DD3D_DEBUG_INFO','/Od'])

 			env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])

 			env.Append(LINKFLAGS=['/DEBUG'])

 

diff --git a/platform/windows/godot_win.cpp b/platform/windows/godot_win.cpp
index fa573b9421..fe39051670 100644
--- a/platform/windows/godot_win.cpp
+++ b/platform/windows/godot_win.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -115,32 +115,32 @@ PCHAR*
         return argv;
     }
 
-char* mb_to_utf8(const char* mbs) {
-
-	int wlen = MultiByteToWideChar(CP_ACP,0,mbs,-1,NULL,0); // returns 0 if failed
-	wchar_t *wbuf = new wchar_t[wlen + 1];
-	MultiByteToWideChar(CP_ACP,0,mbs,-1,wbuf,wlen);
-	wbuf[wlen]=0;
-
-	int ulen = WideCharToMultiByte(CP_UTF8,0,wbuf,-1,NULL,0,NULL,NULL);
+char* wc_to_utf8(const wchar_t* wc) {
+	int ulen = WideCharToMultiByte(CP_UTF8,0,wc,-1,NULL,0,NULL,NULL);
 	char * ubuf = new char[ulen + 1];
-	WideCharToMultiByte(CP_UTF8,0,wbuf,-1,ubuf,ulen,NULL,NULL);
+	WideCharToMultiByte(CP_UTF8,0,wc,-1,ubuf,ulen,NULL,NULL);
 	ubuf[ulen] = 0;
 	return ubuf;
 }
 
-int main(int argc, char** argv) {
+int widechar_main(int argc, wchar_t** argv) {
 
 	OS_Windows os(NULL);
 
 	setlocale(LC_CTYPE, "");
 
 	char ** argv_utf8 = new char*[argc];
+
 	for(int i=0; i<argc; ++i) {
-		argv_utf8[i] = mb_to_utf8(argv[i]);
+		argv_utf8[i] = wc_to_utf8(argv[i]);
 	}
 
-	Main::setup(argv_utf8[0], argc - 1, &argv_utf8[1]);
+	Error err = Main::setup(argv_utf8[0], argc - 1, &argv_utf8[1]);
+
+	if (err!=OK)
+		return 255;
+
+
 	if (Main::start())
 		os.run();
 	Main::cleanup();
@@ -154,82 +154,30 @@ int main(int argc, char** argv) {
 	return os.get_exit_code();
 };
 
-HINSTANCE godot_hinstance = NULL;
-
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)	{
-
-    int    argc;
-    char** argv;
-
-    char*  arg;
-    int    index;
-    int    result;
+int main(int _argc, char** _argv) {
+	// _argc and _argv are ignored
+	// we are going to use the WideChar version of them instead
 
-    // count the arguments
+	LPWSTR *wc_argv;
+	int    argc;
+	int    result;
 
-    argc = 1;
-    arg  = lpCmdLine;
-
-    while (arg[0] != 0) {
-
-        while (arg[0] != 0 && arg[0] == ' ') {
-            arg++;
-        }
-
-        if (arg[0] != 0) {
-
-            argc++;
-
-            while (arg[0] != 0 && arg[0] != ' ') {
-                arg++;
-            }
-
-        }
-
-    }
+	wc_argv = CommandLineToArgvW(GetCommandLineW(), &argc);
 
-    // tokenize the arguments
-
-    argv = (char**)malloc(argc * sizeof(char*));
-
-    arg = lpCmdLine;
-    index = 1;
-
-    while (arg[0] != 0) {
-
-        while (arg[0] != 0 && arg[0] == ' ') {
-            arg++;
-        }
-
-        if (arg[0] != 0) {
-
-            argv[index] = arg;
-            index++;
-
-            while (arg[0] != 0 && arg[0] != ' ') {
-                arg++;
-            }
-
-            if (arg[0] != 0) {
-                arg[0] = 0;
-                arg++;
-            }
-
-        }
-
-    }
-
-    // put the program name into argv[0]
-
-    char filename[_MAX_PATH];
+	if( NULL == wc_argv )	{
+		wprintf(L"CommandLineToArgvW failed\n");
+		return 0;
+	}
 
-    GetModuleFileName(NULL, filename, _MAX_PATH);
-    argv[0] = filename;
+	result = widechar_main(argc, wc_argv);
 
-    // call the user specified main function
+	LocalFree(wc_argv);
+	return result;
+}
 
-    result = main(argc, argv);
+HINSTANCE godot_hinstance = NULL;
 
-    free(argv);
-    return result;
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)	{
+	godot_hinstance = hInstance;
+	return main(0,NULL); 
 }
diff --git a/platform/windows/key_mapping_win.cpp b/platform/windows/key_mapping_win.cpp
index bdf3b2a92f..f07b7c6eaa 100644
--- a/platform/windows/key_mapping_win.cpp
+++ b/platform/windows/key_mapping_win.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/windows/key_mapping_win.h b/platform/windows/key_mapping_win.h
index 3e351675b0..288fcdd8de 100644
--- a/platform/windows/key_mapping_win.h
+++ b/platform/windows/key_mapping_win.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -26,26 +26,26 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef KEY_MAPPING_WINDOWS_H

-#define KEY_MAPPING_WINDOWS_H

-

-

-#include "os/keyboard.h"

-

-#include <windows.h>

-

-#include <winuser.h>

-

-

-class KeyMappingWindows {

-

-	KeyMappingWindows() {};

-public:

-

-	static unsigned int get_keysym(unsigned int p_code);

-

-};

-

-

-

-#endif

+#ifndef KEY_MAPPING_WINDOWS_H
+#define KEY_MAPPING_WINDOWS_H
+
+
+#include "os/keyboard.h"
+
+#include <windows.h>
+
+#include <winuser.h>
+
+
+class KeyMappingWindows {
+
+	KeyMappingWindows() {};
+public:
+
+	static unsigned int get_keysym(unsigned int p_code);
+
+};
+
+
+
+#endif
diff --git a/platform/windows/lang_table.h b/platform/windows/lang_table.h
index 83f3fb52fd..bfdf2b6ebe 100644
--- a/platform/windows/lang_table.h
+++ b/platform/windows/lang_table.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 414c250bd4..ec9e17c4f0 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -423,6 +423,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd,UINT uMsg, WPARAM	wParam,	LPARAM	lParam) {
 		case WM_RBUTTONUP:
 		case WM_MOUSEWHEEL:
 		case WM_LBUTTONDBLCLK:
+		case WM_RBUTTONDBLCLK:
 		/*case WM_XBUTTONDOWN:
 		case WM_XBUTTONUP: */{
 
@@ -476,6 +477,12 @@ LRESULT OS_Windows::WndProc(HWND hWnd,UINT uMsg, WPARAM	wParam,	LPARAM	lParam) {
 					mb.button_index=1;
 					mb.doubleclick = true;
 				} break;
+				case WM_RBUTTONDBLCLK: {
+
+					mb.pressed=true;
+					mb.button_index=2;
+					mb.doubleclick = true;
+				} break;
 				case WM_MOUSEWHEEL: {
 
 					mb.pressed=true;
@@ -1170,7 +1177,7 @@ void OS_Windows::initialize(const VideoMode& p_desired,int p_video_driver,int p_
 	physics_server = memnew( PhysicsServerSW );
 	physics_server->init();
 
-	physics_2d_server = memnew( Physics2DServerSW );
+	physics_2d_server = Physics2DServerWrapMT::init_server<Physics2DServerSW>();
 	physics_2d_server->init();
 
 	if (!is_no_window_mode_enabled()) {
@@ -1368,6 +1375,9 @@ void OS_Windows::finalize() {
 	physics_2d_server->finish();
 	memdelete(physics_2d_server);
 
+	joystick_change_queue.clear();
+	monitor_info.clear();
+
 }
 void OS_Windows::finalize_core() {
 
@@ -1819,10 +1829,14 @@ String OS_Windows::get_name() {
 	return "Windows";
 }
 
-OS::Date OS_Windows::get_date() const {
+OS::Date OS_Windows::get_date(bool utc) const {
 
 	SYSTEMTIME systemtime;
-	GetSystemTime(&systemtime);
+	if (utc)
+		GetSystemTime(&systemtime);
+	else
+		GetLocalTime(&systemtime);
+
 	Date date;
 	date.day=systemtime.wDay;
 	date.month=Month(systemtime.wMonth);
@@ -1831,10 +1845,13 @@ OS::Date OS_Windows::get_date() const {
 	date.dst=false;
 	return date;
 }
-OS::Time OS_Windows::get_time() const {
+OS::Time OS_Windows::get_time(bool utc) const {
 
 	SYSTEMTIME systemtime;
-	GetLocalTime(&systemtime);
+	if (utc)
+		GetSystemTime(&systemtime);
+	else
+		GetLocalTime(&systemtime);
 
 	Time time;
 	time.hour=systemtime.wHour;
@@ -1843,6 +1860,23 @@ OS::Time OS_Windows::get_time() const {
 	return time;
 }
 
+OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
+	TIME_ZONE_INFORMATION info;
+	bool daylight = false;
+	if (GetTimeZoneInformation(&info) == TIME_ZONE_ID_DAYLIGHT)
+		daylight = true;
+
+	TimeZoneInfo ret;
+	if (daylight) {
+		ret.name = info.DaylightName;
+	} else {
+		ret.name = info.StandardName;
+	}
+
+	ret.bias = info.Bias;
+	return ret;
+}
+
 uint64_t OS_Windows::get_unix_time() const {
 
 	FILETIME ft;
@@ -2045,7 +2079,7 @@ String OS_Windows::get_executable_path() const {
 	wchar_t bufname[4096];
 	GetModuleFileNameW(NULL,bufname,4096);
 	String s= bufname;
-	print_line("EXEC PATHPó: "+s);
+	print_line("EXEC PATHP??: "+s);
 	return s;
 }
 
@@ -2110,12 +2144,13 @@ bool OS_Windows::has_environment(const String& p_var) const {
 
 String OS_Windows::get_environment(const String& p_var) const {
 
-	char* val = getenv(p_var.utf8().get_data());
-	if (val)
-		return val;
-
+	wchar_t wval[0x7Fff]; // MSDN says 32767 char is the maximum
+	int wlen = GetEnvironmentVariableW(p_var.c_str(),wval,0x7Fff);
+	if ( wlen > 0 ) {
+		return wval;
+	}
 	return "";
-};
+}
 
 String OS_Windows::get_stdin_string(bool p_block) {
 
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index 4995adc874..31e030d02e 100644
--- a/platform/windows/os_windows.h
+++ b/platform/windows/os_windows.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -45,6 +45,7 @@
 #include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h"
 #include "drivers/unix/ip_unix.h"
 #include "servers/physics_2d/physics_2d_server_sw.h"
+#include "servers/physics_2d/physics_2d_server_wrap_mt.h"
 
 
 #include <windows.h>
@@ -258,8 +259,9 @@ public:
 
 	virtual String get_name();
 	
-	virtual Date get_date() const;
-	virtual Time get_time() const;
+	virtual Date get_date(bool utc) const;
+	virtual Time get_time(bool utc) const;
+	virtual TimeZoneInfo get_time_zone_info() const;
 	virtual uint64_t get_unix_time() const;
 
 	virtual bool can_draw() const;
diff --git a/platform/windows/platform_config.h b/platform/windows/platform_config.h
index a7e7f9c370..e6b561552e 100644
--- a/platform/windows/platform_config.h
+++ b/platform/windows/platform_config.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/windows/stream_peer_winsock.cpp b/platform/windows/stream_peer_winsock.cpp
index eabfb30599..e8245c92e5 100644
--- a/platform/windows/stream_peer_winsock.cpp
+++ b/platform/windows/stream_peer_winsock.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/windows/stream_peer_winsock.h b/platform/windows/stream_peer_winsock.h
index 14dd5f0bb1..373b502d2c 100644
--- a/platform/windows/stream_peer_winsock.h
+++ b/platform/windows/stream_peer_winsock.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
diff --git a/platform/windows/tcp_server_winsock.cpp b/platform/windows/tcp_server_winsock.cpp
index e77ca6feaa..bf7e85aebb 100644
--- a/platform/windows/tcp_server_winsock.cpp
+++ b/platform/windows/tcp_server_winsock.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -26,144 +26,144 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "tcp_server_winsock.h"

-

-#include "stream_peer_winsock.h"

-

-#include <winsock2.h>

-

-extern int winsock_refcount;

-

-TCP_Server* TCPServerWinsock::_create() {

-

-	return memnew(TCPServerWinsock);

-};

-

-void TCPServerWinsock::make_default() {

-

-	TCP_Server::_create = TCPServerWinsock::_create;

-

-	if (winsock_refcount == 0) {

-		WSADATA data;

-		WSAStartup(MAKEWORD(2,2), &data);

-	};

-	++winsock_refcount;

-};

-

-void TCPServerWinsock::cleanup() {

-

-	--winsock_refcount;

-	if (winsock_refcount == 0) {

-

-		WSACleanup();

-	};

-};

-

-

-Error TCPServerWinsock::listen(uint16_t p_port,const List<String> *p_accepted_hosts) {

-

-	int sockfd;

-	sockfd = socket(AF_INET, SOCK_STREAM, 0);

-	ERR_FAIL_COND_V(sockfd == INVALID_SOCKET, FAILED);

-

-	unsigned long par = 1;

-	if (ioctlsocket(sockfd, FIONBIO, &par)) {

-		perror("setting non-block mode");

-		stop();

-		return FAILED;

-	};

-

-	struct sockaddr_in my_addr;

-	my_addr.sin_family = AF_INET;         // host byte order

-	my_addr.sin_port = htons(p_port);     // short, network byte order

-	my_addr.sin_addr.s_addr = INADDR_ANY; // automatically fill with my IP TODO: use p_accepted_hosts

-	memset(my_addr.sin_zero, '\0', sizeof my_addr.sin_zero);

-

-	if (bind(sockfd, (struct sockaddr *)&my_addr, sizeof my_addr) != SOCKET_ERROR) {

-

-		if (::listen(sockfd, SOMAXCONN) == SOCKET_ERROR) {

-

-			closesocket(sockfd);

-			ERR_FAIL_V(FAILED);

-		};

-	}

-	else {

-		return ERR_ALREADY_IN_USE;

-	};

-

-	if (listen_sockfd != INVALID_SOCKET) {

-

-		stop();

-	};

-

-	listen_sockfd = sockfd;

-

-	return OK;

-};

-

-bool TCPServerWinsock::is_connection_available() const {

-

-	if (listen_sockfd == -1) {

-		return false;

-	};

-

-	timeval timeout;

-	timeout.tv_sec = 0;

-	timeout.tv_usec = 0;

-

-	fd_set pfd;

-	FD_ZERO(&pfd);

-	FD_SET(listen_sockfd, &pfd);

-

-	int ret = select(listen_sockfd + 1, &pfd, NULL, NULL, &timeout);

-	ERR_FAIL_COND_V(ret < 0, 0);

-

-	if (ret && (FD_ISSET(listen_sockfd, &pfd))) {

-

-		return true;

-	};

-

-	return false;

-};

-

-

-Ref<StreamPeerTCP> TCPServerWinsock::take_connection() {

-

-	if (!is_connection_available()) {

-		return NULL;

-	};

-

-	struct sockaddr_in their_addr;

-	int sin_size = sizeof(their_addr);

-	int fd = accept(listen_sockfd, (struct sockaddr *)&their_addr, &sin_size);

-	ERR_FAIL_COND_V(fd == INVALID_SOCKET, NULL);

-

-	Ref<StreamPeerWinsock> conn = memnew(StreamPeerWinsock);

-	IP_Address ip;

-	ip.host = (uint32_t)their_addr.sin_addr.s_addr;

-

-	conn->set_socket(fd, ip, ntohs(their_addr.sin_port));

-

-	return conn;

-};

-

-void TCPServerWinsock::stop() {

-

-	if (listen_sockfd != INVALID_SOCKET) {

-		closesocket(listen_sockfd);

-	};

-

-	listen_sockfd = -1;

-};

-

-

-TCPServerWinsock::TCPServerWinsock() {

-

-	listen_sockfd = INVALID_SOCKET;

-};

-

-TCPServerWinsock::~TCPServerWinsock() {

-

-	stop();

-};

-

+#include "tcp_server_winsock.h"
+
+#include "stream_peer_winsock.h"
+
+#include <winsock2.h>
+
+extern int winsock_refcount;
+
+TCP_Server* TCPServerWinsock::_create() {
+
+	return memnew(TCPServerWinsock);
+};
+
+void TCPServerWinsock::make_default() {
+
+	TCP_Server::_create = TCPServerWinsock::_create;
+
+	if (winsock_refcount == 0) {
+		WSADATA data;
+		WSAStartup(MAKEWORD(2,2), &data);
+	};
+	++winsock_refcount;
+};
+
+void TCPServerWinsock::cleanup() {
+
+	--winsock_refcount;
+	if (winsock_refcount == 0) {
+
+		WSACleanup();
+	};
+};
+
+
+Error TCPServerWinsock::listen(uint16_t p_port,const List<String> *p_accepted_hosts) {
+
+	int sockfd;
+	sockfd = socket(AF_INET, SOCK_STREAM, 0);
+	ERR_FAIL_COND_V(sockfd == INVALID_SOCKET, FAILED);
+
+	unsigned long par = 1;
+	if (ioctlsocket(sockfd, FIONBIO, &par)) {
+		perror("setting non-block mode");
+		stop();
+		return FAILED;
+	};
+
+	struct sockaddr_in my_addr;
+	my_addr.sin_family = AF_INET;         // host byte order
+	my_addr.sin_port = htons(p_port);     // short, network byte order
+	my_addr.sin_addr.s_addr = INADDR_ANY; // automatically fill with my IP TODO: use p_accepted_hosts
+	memset(my_addr.sin_zero, '\0', sizeof my_addr.sin_zero);
+
+	if (bind(sockfd, (struct sockaddr *)&my_addr, sizeof my_addr) != SOCKET_ERROR) {
+
+		if (::listen(sockfd, SOMAXCONN) == SOCKET_ERROR) {
+
+			closesocket(sockfd);
+			ERR_FAIL_V(FAILED);
+		};
+	}
+	else {
+		return ERR_ALREADY_IN_USE;
+	};
+
+	if (listen_sockfd != INVALID_SOCKET) {
+
+		stop();
+	};
+
+	listen_sockfd = sockfd;
+
+	return OK;
+};
+
+bool TCPServerWinsock::is_connection_available() const {
+
+	if (listen_sockfd == -1) {
+		return false;
+	};
+
+	timeval timeout;
+	timeout.tv_sec = 0;
+	timeout.tv_usec = 0;
+
+	fd_set pfd;
+	FD_ZERO(&pfd);
+	FD_SET(listen_sockfd, &pfd);
+
+	int ret = select(listen_sockfd + 1, &pfd, NULL, NULL, &timeout);
+	ERR_FAIL_COND_V(ret < 0, 0);
+
+	if (ret && (FD_ISSET(listen_sockfd, &pfd))) {
+
+		return true;
+	};
+
+	return false;
+};
+
+
+Ref<StreamPeerTCP> TCPServerWinsock::take_connection() {
+
+	if (!is_connection_available()) {
+		return NULL;
+	};
+
+	struct sockaddr_in their_addr;
+	int sin_size = sizeof(their_addr);
+	int fd = accept(listen_sockfd, (struct sockaddr *)&their_addr, &sin_size);
+	ERR_FAIL_COND_V(fd == INVALID_SOCKET, NULL);
+
+	Ref<StreamPeerWinsock> conn = memnew(StreamPeerWinsock);
+	IP_Address ip;
+	ip.host = (uint32_t)their_addr.sin_addr.s_addr;
+
+	conn->set_socket(fd, ip, ntohs(their_addr.sin_port));
+
+	return conn;
+};
+
+void TCPServerWinsock::stop() {
+
+	if (listen_sockfd != INVALID_SOCKET) {
+		closesocket(listen_sockfd);
+	};
+
+	listen_sockfd = -1;
+};
+
+
+TCPServerWinsock::TCPServerWinsock() {
+
+	listen_sockfd = INVALID_SOCKET;
+};
+
+TCPServerWinsock::~TCPServerWinsock() {
+
+	stop();
+};
+
diff --git a/platform/windows/tcp_server_winsock.h b/platform/windows/tcp_server_winsock.h
index 2d54b6ce40..2516123908 100644
--- a/platform/windows/tcp_server_winsock.h
+++ b/platform/windows/tcp_server_winsock.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -26,30 +26,30 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef TCP_SERVER_WINSOCK_H

-#define TCP_SERVER_WINSOCK_H

-

-#include "core/io/tcp_server.h"

-

-class TCPServerWinsock : public TCP_Server {

-

-	int listen_sockfd;

-

-	static TCP_Server* _create();

-

-public:

-

-	virtual Error listen(uint16_t p_port,const List<String> *p_accepted_hosts=NULL);

-	virtual bool is_connection_available() const;

-	virtual Ref<StreamPeerTCP> take_connection();

-

-	virtual void stop(); //stop listening

-

-	static void make_default();

-	static void cleanup();

-

-	TCPServerWinsock();

-	~TCPServerWinsock();

-};

-

-#endif

+#ifndef TCP_SERVER_WINSOCK_H
+#define TCP_SERVER_WINSOCK_H
+
+#include "core/io/tcp_server.h"
+
+class TCPServerWinsock : public TCP_Server {
+
+	int listen_sockfd;
+
+	static TCP_Server* _create();
+
+public:
+
+	virtual Error listen(uint16_t p_port,const List<String> *p_accepted_hosts=NULL);
+	virtual bool is_connection_available() const;
+	virtual Ref<StreamPeerTCP> take_connection();
+
+	virtual void stop(); //stop listening
+
+	static void make_default();
+	static void cleanup();
+
+	TCPServerWinsock();
+	~TCPServerWinsock();
+};
+
+#endif