140 files changed, 1845 insertions, 1674 deletions

diff --git a/core/func_ref.cpp b/core/func_ref.cpp
index 644d8b5b6..ca890111b 100644
--- a/core/func_ref.cpp
+++ b/core/func_ref.cpp
@@ -61,11 +61,7 @@ void FuncRef::_bind_methods() {
 		MethodInfo mi;
 		mi.name="call_func";
 		Vector<Variant> defargs;
-		for(int i=0;i<10;i++) {
-			mi.arguments.push_back( PropertyInfo( Variant::NIL, "arg"+itos(i)));
-			defargs.push_back(Variant());
-		}
-		ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"call_func:Variant",&FuncRef::call_func,mi,defargs);
+		ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"call_func:Variant",&FuncRef::call_func,mi,defargs);
 
 	}
 
diff --git a/core/math/vector3.cpp b/core/math/vector3.cpp
index 8afd73f48..b4a13d8f6 100644
--- a/core/math/vector3.cpp
+++ b/core/math/vector3.cpp
@@ -65,13 +65,9 @@ int Vector3::max_axis() const {
 
 void Vector3::snap(float p_val) {
 
-	x+=p_val/2.0;
-	x-=Math::fmod(x,p_val);
-	y+=p_val/2.0;
-	y-=Math::fmod(y,p_val);
-	z+=p_val/2.0;
-	z-=Math::fmod(z,p_val);
-
+	x=Math::stepify(x,p_val);
+	y=Math::stepify(y,p_val);
+	z=Math::stepify(z,p_val);
 }
 Vector3 Vector3::snapped(float p_val) const {
 
diff --git a/core/method_bind.h b/core/method_bind.h
index 072953743..04ff5c22c 100644
--- a/core/method_bind.h
+++ b/core/method_bind.h
@@ -52,6 +52,7 @@ enum MethodFlags {
 	METHOD_FLAG_REVERSE=16, // used for events
 	METHOD_FLAG_VIRTUAL=32,
 	METHOD_FLAG_FROM_SCRIPT=64,
+	METHOD_FLAG_VARARG=128,
 	METHOD_FLAGS_DEFAULT=METHOD_FLAG_NORMAL,
 };
 
@@ -229,7 +230,7 @@ public:
 	Vector<StringName> get_argument_names() const;
 #endif
 	void set_hint_flags(uint32_t p_hint) { hint_flags=p_hint; }
-	uint32_t get_hint_flags() const { return hint_flags|(is_const()?METHOD_FLAG_CONST:0); }
+	uint32_t get_hint_flags() const { return hint_flags|(is_const()?METHOD_FLAG_CONST:0)|(is_vararg()?METHOD_FLAG_VARARG:0); }
 	virtual String get_instance_type() const=0;
 
 	_FORCE_INLINE_ int get_argument_count() const { return argument_count; };
@@ -267,7 +268,7 @@ public:
 	_FORCE_INLINE_ int get_method_id() const { return method_id; }
 	_FORCE_INLINE_ bool is_const() const { return _const; }
 	_FORCE_INLINE_ bool has_return() const { return _returns; }
-
+	virtual bool is_vararg() const { return false; }
 
 	void set_default_arguments(const Vector<Variant>& p_defargs);
 
@@ -277,7 +278,7 @@ public:
 
 
 template<class T>
-class MethodBindNative : public MethodBind {
+class MethodBindVarArg : public MethodBind {
 public:
 	typedef Variant (T::*NativeCall)(const Variant**,int ,Variant::CallError &);
 protected:
@@ -319,7 +320,9 @@ public:
 	}
 
 #ifdef PTRCALL_ENABLED
-	virtual void ptrcall(Object* p_object,const void** p_args,void* r_ret) {} //todo
+	virtual void ptrcall(Object* p_object,const void** p_args,void* r_ret) {
+		ERR_FAIL(); //can't call
+	} //todo
 #endif
 
 
@@ -327,14 +330,16 @@ public:
 	virtual bool is_const() const { return false; }
 	virtual String get_instance_type() const { return T::get_type_static(); }
 
-	MethodBindNative() { call_method=NULL; _set_returns(true);}
+	virtual bool is_vararg() const { return true; }
+
+	MethodBindVarArg() { call_method=NULL; _set_returns(true);}
 };
 
 
 template<class T   >
-MethodBind* create_native_method_bind( Variant (T::*p_method)(const Variant**,int ,Variant::CallError &), const MethodInfo& p_info ) {
+MethodBind* create_vararg_method_bind( Variant (T::*p_method)(const Variant**,int ,Variant::CallError &), const MethodInfo& p_info ) {
 
-	MethodBindNative<T   > * a = memnew( (MethodBindNative<T   >) );
+	MethodBindVarArg<T   > * a = memnew( (MethodBindVarArg<T   >) );
 	a->set_method(p_method);
 	a->set_method_info(p_info);
 	return a;
diff --git a/core/object.cpp b/core/object.cpp
index b036efa50..81fdc2a90 100644
--- a/core/object.cpp
+++ b/core/object.cpp
@@ -1693,42 +1693,26 @@ void Object::_bind_methods() {
 		MethodInfo mi;
 		mi.name="emit_signal";
 		mi.arguments.push_back( PropertyInfo( Variant::STRING, "signal"));
-		Vector<Variant> defargs;
-		for(int i=0;i<VARIANT_ARG_MAX;i++) {
-			mi.arguments.push_back( PropertyInfo( Variant::NIL, "arg"+itos(i)));
-			defargs.push_back(Variant());
-		}
-
 
-		ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"emit_signal",&Object::_emit_signal,mi,defargs);
+		ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"emit_signal",&Object::_emit_signal,mi);
 	}
 
 	{
 		MethodInfo mi;
 		mi.name="call";
 		mi.arguments.push_back( PropertyInfo( Variant::STRING, "method"));
-		Vector<Variant> defargs;
-		for(int i=0;i<10;i++) {
-			mi.arguments.push_back( PropertyInfo( Variant::NIL, "arg"+itos(i)));
-			defargs.push_back(Variant());
-		}
 
 
-		ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"call:Variant",&Object::_call_bind,mi,defargs);
+
+		ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"call:Variant",&Object::_call_bind,mi);
 	}
 
 	{
 		MethodInfo mi;
 		mi.name="call_deferred";
 		mi.arguments.push_back( PropertyInfo( Variant::STRING, "method"));
-		Vector<Variant> defargs;
-		for(int i=0;i<VARIANT_ARG_MAX;i++) {
-			mi.arguments.push_back( PropertyInfo( Variant::NIL, "arg"+itos(i)));
-			defargs.push_back(Variant());
-		}
-
 
-		ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"call_deferred",&Object::_call_deferred_bind,mi,defargs);
+		ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"call_deferred",&Object::_call_deferred_bind,mi);
 	}
 
 	ObjectTypeDB::bind_method(_MD("callv:Variant","method","arg_array"),&Object::callv);
diff --git a/core/object_type_db.h b/core/object_type_db.h
index 3fcd38aa3..725b424c9 100644
--- a/core/object_type_db.h
+++ b/core/object_type_db.h
@@ -415,13 +415,13 @@ public:
 
 #endif
 	template<class M>
-	static MethodBind* bind_native_method(uint32_t p_flags, StringName p_name, M p_method,const MethodInfo& p_info=MethodInfo(),const Vector<Variant>& p_default_args=Vector<Variant>()) {
+	static MethodBind* bind_vararg_method(uint32_t p_flags, StringName p_name, M p_method,const MethodInfo& p_info=MethodInfo(),const Vector<Variant>& p_default_args=Vector<Variant>()) {
 
 		GLOBAL_LOCK_FUNCTION;
 
 
 
-		MethodBind *bind = create_native_method_bind(p_method,p_info);
+		MethodBind *bind = create_vararg_method_bind(p_method,p_info);
 		ERR_FAIL_COND_V(!bind,NULL);
 
 		String rettype;
diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp
index 99d1e22c0..1ac090796 100644
--- a/core/script_debugger_remote.cpp
+++ b/core/script_debugger_remote.cpp
@@ -219,7 +219,8 @@ void ScriptDebuggerRemote::debug(ScriptLanguage *p_script,bool p_can_continue) {
 
 						if (F->get().get_type()==Variant::OBJECT) {
 							packet_peer_stream->put_var("*"+E->get());
-							packet_peer_stream->put_var(safe_get_instance_id(F->get()));
+							String pretty_print = F->get().operator String();
+							packet_peer_stream->put_var(pretty_print.ascii().get_data());
 						} else {
 							packet_peer_stream->put_var(E->get());
 							packet_peer_stream->put_var(F->get());
@@ -242,7 +243,8 @@ void ScriptDebuggerRemote::debug(ScriptLanguage *p_script,bool p_can_continue) {
 
 						if (F->get().get_type()==Variant::OBJECT) {
 							packet_peer_stream->put_var("*"+E->get());
-							packet_peer_stream->put_var(safe_get_instance_id(F->get()));
+							String pretty_print = F->get().operator String();
+							packet_peer_stream->put_var(pretty_print.ascii().get_data());
 						} else {
 							packet_peer_stream->put_var(E->get());
 							packet_peer_stream->put_var(F->get());
diff --git a/core/undo_redo.cpp b/core/undo_redo.cpp
index 99740b365..e8a71d499 100644
--- a/core/undo_redo.cpp
+++ b/core/undo_redo.cpp
@@ -490,13 +490,9 @@ void UndoRedo::_bind_methods() {
 		mi.name="add_do_method";
 		mi.arguments.push_back( PropertyInfo( Variant::OBJECT, "object"));
 		mi.arguments.push_back( PropertyInfo( Variant::STRING, "method"));
-		Vector<Variant> defargs;
-		for(int i=0;i<VARIANT_ARG_MAX;++i) {
-			mi.arguments.push_back( PropertyInfo( Variant::NIL, "arg"+itos(i)));
-			defargs.push_back(Variant());
-		}
 
-		ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"add_do_method",&UndoRedo::_add_do_method,mi,defargs);
+
+		ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"add_do_method",&UndoRedo::_add_do_method,mi);
 	}
 
 	{
@@ -504,13 +500,9 @@ void UndoRedo::_bind_methods() {
 		mi.name="add_undo_method";
 		mi.arguments.push_back( PropertyInfo( Variant::OBJECT, "object"));
 		mi.arguments.push_back( PropertyInfo( Variant::STRING, "method"));
-		Vector<Variant> defargs;
-		for(int i=0;i<VARIANT_ARG_MAX;++i) {
-			mi.arguments.push_back( PropertyInfo( Variant::NIL, "arg"+itos(i)));
-			defargs.push_back(Variant());
-		}
 
-		ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"add_undo_method",&UndoRedo::_add_undo_method,mi,defargs);
+
+		ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"add_undo_method",&UndoRedo::_add_undo_method,mi);
 	}
 
 	ObjectTypeDB::bind_method(_MD("add_do_property","object", "property", "value:Variant"),&UndoRedo::add_do_property);
diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 07fd9980e..1b54a70be 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -10871,7 +10871,7 @@
 			</return>
 			<description>
 				Initialise the stream used to list all files and directories using the [method get_next] function, closing the current opened stream if needed. Once the stream has been processed, it should typically be closed with [method list_dir_end].
-				Return false if the stream could not be initialised.
+				Return true if the stream could not be initialised.
 			</description>
 		</method>
 		<method name="list_dir_end">
@@ -14465,6 +14465,8 @@
 		</theme_item>
 		<theme_item name="comment" type="StyleBox">
 		</theme_item>
+		<theme_item name="commentfocus" type="StyleBox">
+		</theme_item>
 		<theme_item name="defaultfocus" type="StyleBox">
 		</theme_item>
 		<theme_item name="defaultframe" type="StyleBox">
@@ -16023,6 +16025,8 @@
 			</argument>
 			<argument index="2" name="radius" type="float">
 			</argument>
+			<argument index="3" name="add_uv" type="bool" default="true">
+			</argument>
 			<description>
 				Simple helper to draw an uvsphere, with given latitudes, longitude and radius.
 			</description>
@@ -16124,7 +16128,7 @@
 				Add a new mapping entry (in SDL2 format) to the mapping database. Optionally update already connected devices.
 			</description>
 		</method>
-		<method name="get_accelerometer">
+		<method name="get_accelerometer" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
@@ -16138,14 +16142,14 @@
 				Returns an [Array] containing the device IDs of all currently connected joysticks.
 			</description>
 		</method>
-		<method name="get_gyroscope">
+		<method name="get_gyroscope" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
 				If the device has a gyroscope, this will return the rate of rotation in rad/s around a device's x, y, and z axis.
 			</description>
 		</method>
-		<method name="get_joy_axis">
+		<method name="get_joy_axis" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="device" type="int">
@@ -16192,7 +16196,7 @@
 				Returns the strength of the joystick vibration: x is the strength of the weak motor, and y is the strength of the strong motor.
 			</description>
 		</method>
-		<method name="get_magnetometer">
+		<method name="get_magnetometer" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
@@ -16220,7 +16224,23 @@
 				Returns the mouse speed for the last time the cursor was moved, and this until the next frame where the mouse moves. This means that even if the mouse is not moving, this function will still return the value of the last motion.
 			</description>
 		</method>
-		<method name="is_action_pressed">
+		<method name="is_action_just_pressed" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="action" type="String">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="is_action_just_released" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="action" type="String">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="is_action_pressed" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="action" type="String">
@@ -16229,7 +16249,7 @@
 				Returns true or false depending on whether the action event is pressed. Actions and their events can be set in the Project Settings / Input Map tab. Or be set with [InputMap].
 			</description>
 		</method>
-		<method name="is_joy_button_pressed">
+		<method name="is_joy_button_pressed" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="device" type="int">
@@ -16249,7 +16269,7 @@
 				Returns if the specified device is known by the system. This means that it sets all button and axis indices exactly as defined in the JOY_* constants (see [@Global Scope]). Unknown joysticks are not expected to match these constants, but you can still retrieve events from them.
 			</description>
 		</method>
-		<method name="is_key_pressed">
+		<method name="is_key_pressed" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="scancode" type="int">
@@ -16258,7 +16278,7 @@
 				Returns true or false depending on whether the key is pressed or not. You can pass KEY_*, which are pre-defined constants listed in [@Global Scope].
 			</description>
 		</method>
-		<method name="is_mouse_button_pressed">
+		<method name="is_mouse_button_pressed" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="button" type="int">
@@ -17920,6 +17940,15 @@
 				Return tooltip hint for specified item index.
 			</description>
 		</method>
+		<method name="is_item_tooltip_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<description>
+				Returns whether the tooptip is enabled for specified item index.
+			</description>
+		</method>
 		<method name="get_max_columns" qualifiers="const">
 			<return type="int">
 			</return>
@@ -18101,6 +18130,15 @@
 				Sets tooltip hint for item at specified index.
 			</description>
 		</method>
+		<method name="set_item_tooltip_enabled">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="enable" type="bool">
+			</argument>
+			<description>
+				Sets whether the tooltip is enabled for specified item index.
+			</description>
+		</method>
 		<method name="set_max_columns">
 			<argument index="0" name="amount" type="int">
 			</argument>
@@ -18606,7 +18644,9 @@
 			</argument>
 			<argument index="1" name="floor_normal" type="Vector2" default="Vector2(0, 0)">
 			</argument>
-			<argument index="2" name="max_bounces" type="int" default="4">
+			<argument index="2" name="slope_stop_min_velocity" type="float" default="5">
+			</argument>
+			<argument index="3" name="max_bounces" type="int" default="4">
 			</argument>
 			<description>
 			</description>
@@ -18635,10 +18675,12 @@
 		<method name="test_move">
 			<return type="bool">
 			</return>
-			<argument index="0" name="rel_vec" type="Vector2">
+			<argument index="0" name="from" type="Matrix32">
+			</argument>
+			<argument index="1" name="rel_vec" type="Vector2">
 			</argument>
 			<description>
-				Return true if there would be a collision if the body moved in the given direction.
+				Return true if there would be a collision if the body moved from the given point in the given direction.
 			</description>
 		</method>
 	</methods>
@@ -19436,7 +19478,7 @@
 			</description>
 		</method>
 		<method name="cursor_set_blink_enabled">
-			<argument index="0" name="enable" type="bool">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
 				Set the line edit caret to blink.
@@ -19462,6 +19504,12 @@
 				Return the cursor position inside the [LineEdit].
 			</description>
 		</method>
+		<method name="get_expand_to_text_length" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="get_max_length" qualifiers="const">
 			<return type="int">
 			</return>
@@ -19547,6 +19595,12 @@
 				Set the [i]editable[/i] status of the [LineEdit]. When disabled, existing text can't be modified and new text can't be added.
 			</description>
 		</method>
+		<method name="set_expand_to_text_length">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="set_max_length">
 			<argument index="0" name="chars" type="int">
 			</argument>
@@ -27280,14 +27334,16 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="motion" type="Vector2">
+			<argument index="1" name="from" type="Matrix32">
 			</argument>
-			<argument index="2" name="margin" type="float" default="0.08">
+			<argument index="2" name="motion" type="Vector2">
 			</argument>
-			<argument index="3" name="result" type="Physics2DTestMotionResult" default="NULL">
+			<argument index="3" name="margin" type="float" default="0.08">
+			</argument>
+			<argument index="4" name="result" type="Physics2DTestMotionResult" default="NULL">
 			</argument>
 			<description>
-				Return whether a body can move in a given direction. Apart from the boolean return value, a [Physics2DTestMotionResult] can be passed to return additional information in.
+				Return whether a body can move from a given point in a given direction. Apart from the boolean return value, a [Physics2DTestMotionResult] can be passed to return additional information in.
 			</description>
 		</method>
 		<method name="damped_spring_joint_create">
@@ -31484,6 +31540,12 @@
 				Returns the collision point in which the ray intersects the closest object.
 			</description>
 		</method>
+		<method name="get_exclude_parent_body" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="get_layer_mask" qualifiers="const">
 			<return type="int">
 			</return>
@@ -31538,6 +31600,12 @@
 				Enables the RayCast2D. Only enabled raycasts will be able to query the space and report collisions.
 			</description>
 		</method>
+		<method name="set_exclude_parent_body">
+			<argument index="0" name="mask" type="bool">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="set_layer_mask">
 			<argument index="0" name="mask" type="int">
 			</argument>
@@ -46156,6 +46224,40 @@ do_property].
 	<constants>
 	</constants>
 </class>
+<class name="VisualScriptBasicTypeConstant" inherits="VisualScriptNode" category="Core">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<methods>
+		<method name="get_basic_type" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_basic_type_constant" qualifiers="const">
+			<return type="String">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="set_basic_type">
+			<argument index="0" name="name" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_basic_type_constant">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<description>
+			</description>
+		</method>
+	</methods>
+	<constants>
+	</constants>
+</class>
 <class name="VisualScriptBuiltinFunc" inherits="VisualScriptNode" category="Core">
 	<brief_description>
 	</brief_description>
@@ -46178,6 +46280,40 @@ do_property].
 	<constants>
 	</constants>
 </class>
+<class name="VisualScriptClassConstant" inherits="VisualScriptNode" category="Core">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<methods>
+		<method name="get_base_type">
+			<return type="String">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_class_constant">
+			<return type="String">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="set_base_type">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_class_constant">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<description>
+			</description>
+		</method>
+	</methods>
+	<constants>
+	</constants>
+</class>
 <class name="VisualScriptComment" inherits="VisualScriptNode" category="Core">
 	<brief_description>
 	</brief_description>
@@ -46506,6 +46642,16 @@ do_property].
 	<constants>
 	</constants>
 </class>
+<class name="VisualScriptExpression" inherits="VisualScriptNode" category="Core">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<methods>
+	</methods>
+	<constants>
+	</constants>
+</class>
 <class name="VisualScriptFunction" inherits="VisualScriptNode" category="Core">
 	<brief_description>
 	</brief_description>
@@ -46576,6 +46722,12 @@ do_property].
 			<description>
 			</description>
 		</method>
+		<method name="get_validate" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="set_base_path">
 			<argument index="0" name="base_path" type="NodePath">
 			</argument>
@@ -46630,6 +46782,12 @@ do_property].
 			<description>
 			</description>
 		</method>
+		<method name="set_validate">
+			<argument index="0" name="enable" type="bool">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 		<constant name="CALL_MODE_SELF" value="0">
@@ -46724,12 +46882,24 @@ do_property].
 	<description>
 	</description>
 	<methods>
+		<method name="get_action_mode" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="get_action_name" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="set_action_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="set_action_name">
 			<argument index="0" name="name" type="String">
 			</argument>
@@ -46750,16 +46920,6 @@ do_property].
 	<constants>
 	</constants>
 </class>
-<class name="VisualScriptInputSelector" inherits="VisualScriptNode" category="Core">
-	<brief_description>
-	</brief_description>
-	<description>
-	</description>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
 <class name="VisualScriptIterator" inherits="VisualScriptNode" category="Core">
 	<brief_description>
 	</brief_description>
@@ -47290,6 +47450,16 @@ do_property].
 	<constants>
 	</constants>
 </class>
+<class name="VisualScriptSwitch" inherits="VisualScriptNode" category="Core">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<methods>
+	</methods>
+	<constants>
+	</constants>
+</class>
 <class name="VisualScriptTypeCast" inherits="VisualScriptNode" category="Core">
 	<brief_description>
 	</brief_description>
diff --git a/main/input_default.cpp b/main/input_default.cpp
index e5d853373..150aca2ba 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -655,7 +655,7 @@ static const char *s_ControllerMappings [] =
 	"030000004f04000015b3000010010000,Thrustmaster Dual Analog 4,a:b0,b:b2,x:b1,y:b3,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,",
 	"030000004f04000020b3000010010000,Thrustmaster 2 in 1 DT,a:b0,b:b2,y:b3,x:b1,start:b9,guide:,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,",
 	"030000004f04000023b3000000010000,Thrustmaster Dual Trigger 3-in-1,x:b0,a:b1,b:b2,y:b3,back:b8,start:b9,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a5,",
-	"030000005e0400001907000000010000,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
+	"030000005e0400001907000000010000,X360 Wireless Controller,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:b10,rightshoulder:b5,rightx:a3,start:b7,righty:a4,dpleft:h0.8,lefttrigger:a2,x:b2,dpup:h0.1,back:b6,leftstick:b9,leftshoulder:b4,y:b3,a:b0,dpright:h0.2,righttrigger:a5,b:b1,",
 	"030000005e0400008902000021010000,Microsoft X-Box pad v2 (US),x:b3,a:b0,b:b1,y:b4,back:b6,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:a2,rightshoulder:b2,righttrigger:a5,leftstick:b8,rightstick:b9,leftx:a0,lefty:a1,rightx:a3,righty:a4,",
 	"030000005e0400008e02000001000000,Microsoft X-Box 360 pad,leftstick:b9,leftx:a0,lefty:a1,dpdown:h0.1,rightstick:b10,rightshoulder:b5,rightx:a3,start:b7,righty:a4,dpleft:h0.2,lefttrigger:a2,x:b2,dpup:h0.4,back:b6,leftshoulder:b4,y:b3,a:b0,dpright:h0.8,righttrigger:a5,b:b1,",
 	"030000005e0400008e02000004010000,Microsoft X-Box 360 pad,a:b0,b:b1,x:b2,y:b3,back:b6,start:b7,guide:b8,leftshoulder:b4,rightshoulder:b5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,",
diff --git a/modules/gdscript/gd_function.cpp b/modules/gdscript/gd_function.cpp
index b2cc6341c..094e21bb4 100644
--- a/modules/gdscript/gd_function.cpp
+++ b/modules/gdscript/gd_function.cpp
@@ -1437,7 +1437,7 @@ void GDFunctionState::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("resume:Variant","arg"),&GDFunctionState::resume,DEFVAL(Variant()));
 	ObjectTypeDB::bind_method(_MD("is_valid"),&GDFunctionState::is_valid);
-	ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"_signal_callback",&GDFunctionState::_signal_callback,MethodInfo("_signal_callback"));
+	ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"_signal_callback",&GDFunctionState::_signal_callback,MethodInfo("_signal_callback"));
 
 }
 
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index b97a0fcbb..0ea10950d 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -751,7 +751,7 @@ void GDScript::_get_property_list(List<PropertyInfo> *p_properties) const {
 
 void GDScript::_bind_methods() {
 
-	ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"new",&GDScript::_new,MethodInfo(Variant::OBJECT,"new"));
+	ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"new",&GDScript::_new,MethodInfo(Variant::OBJECT,"new"));
 
 	ObjectTypeDB::bind_method(_MD("get_as_byte_code"),&GDScript::get_as_byte_code);
 
diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp
index 4de593760..bd042c898 100644
--- a/modules/visual_script/visual_script.cpp
+++ b/modules/visual_script/visual_script.cpp
@@ -1130,6 +1130,7 @@ void VisualScript::get_script_property_list(List<PropertyInfo> *p_list) const {
 	}
 }
 
+#ifdef TOOLS_ENABLED
 bool VisualScript::are_subnodes_edited() const {
 
 	for(const Map<StringName,Function>::Element *E=functions.front();E;E=E->next()) {
@@ -1143,7 +1144,7 @@ bool VisualScript::are_subnodes_edited() const {
 
 	return false;
 }
-
+#endif
 
 void VisualScript::_set_data(const Dictionary& p_data) {
 
@@ -1416,7 +1417,8 @@ bool VisualScriptInstance::get(const StringName& p_name, Variant &r_ret) const {
 	if (!E)
 		return false;
 
-	return E->get();
+	r_ret=E->get();
+	return true;
 }
 void VisualScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const{
 
@@ -2437,7 +2439,7 @@ void VisualScriptFunctionState::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("connect_to_signal","obj","signals","args"),&VisualScriptFunctionState::connect_to_signal);
 	ObjectTypeDB::bind_method(_MD("resume:Array","args"),&VisualScriptFunctionState::resume,DEFVAL(Variant()));
 	ObjectTypeDB::bind_method(_MD("is_valid"),&VisualScriptFunctionState::is_valid);
-	ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"_signal_callback",&VisualScriptFunctionState::_signal_callback,MethodInfo("_signal_callback"));
+	ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"_signal_callback",&VisualScriptFunctionState::_signal_callback,MethodInfo("_signal_callback"));
 }
 
 VisualScriptFunctionState::VisualScriptFunctionState() {
diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h
index 794230d69..63b018b0c 100644
--- a/modules/visual_script/visual_script.h
+++ b/modules/visual_script/visual_script.h
@@ -344,7 +344,9 @@ public:
 
 	virtual void get_script_property_list(List<PropertyInfo> *p_list) const;
 
+#ifdef TOOLS_ENABLED
 	virtual bool are_subnodes_edited() const;
+#endif
 
 	VisualScript();
 	~VisualScript();
diff --git a/modules/visual_script/visual_script_builtin_funcs.cpp b/modules/visual_script/visual_script_builtin_funcs.cpp
index 1d0bca0b3..24a44d350 100644
--- a/modules/visual_script/visual_script_builtin_funcs.cpp
+++ b/modules/visual_script/visual_script_builtin_funcs.cpp
@@ -65,6 +65,21 @@ const char* VisualScriptBuiltinFunc::func_name[VisualScriptBuiltinFunc::FUNC_MAX
 	"bytes2var",
 };
 
+VisualScriptBuiltinFunc::BuiltinFunc VisualScriptBuiltinFunc::find_function(const String& p_string) {
+
+	for(int i=0;i<FUNC_MAX;i++) {
+		if (p_string==func_name[i])
+			return BuiltinFunc(i);
+	}
+
+	return FUNC_MAX;
+}
+
+String VisualScriptBuiltinFunc::get_func_name(BuiltinFunc p_func) {
+
+	ERR_FAIL_INDEX_V(p_func,FUNC_MAX,String());
+	return func_name[p_func];
+}
 
 
 int VisualScriptBuiltinFunc::get_output_sequence_port_count() const {
@@ -88,10 +103,10 @@ bool VisualScriptBuiltinFunc::has_input_sequence_port() const{
 
 }
 
-int VisualScriptBuiltinFunc::get_input_value_port_count() const{
+int VisualScriptBuiltinFunc::get_func_argument_count(BuiltinFunc p_func) {
 
 
-	switch(func) {
+	switch(p_func) {
 
 		case MATH_RANDOMIZE:
 		case MATH_RAND:
@@ -157,6 +172,11 @@ int VisualScriptBuiltinFunc::get_input_value_port_count() const{
 	}
 	return 0;
 }
+
+int VisualScriptBuiltinFunc::get_input_value_port_count() const{
+
+	return get_func_argument_count(func);
+}
 int VisualScriptBuiltinFunc::get_output_value_port_count() const{
 
 	switch(func) {
@@ -560,118 +580,124 @@ VisualScriptBuiltinFunc::BuiltinFunc VisualScriptBuiltinFunc::get_func() {
 		r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;\
 		r_error.argument=m_arg;\
 		r_error.expected=Variant::REAL;\
-		return 0;\
+		return;\
 	}
 
-class VisualScriptNodeInstanceBuiltinFunc : public VisualScriptNodeInstance {
-public:
 
-	VisualScriptBuiltinFunc *node;
-	VisualScriptInstance *instance;
+void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func,const Variant** p_inputs,Variant* r_return,Variant::CallError& r_error,String& r_error_str) {
 
-	VisualScriptBuiltinFunc::BuiltinFunc func;
+	switch(p_func) {
+		case VisualScriptBuiltinFunc::MATH_SIN: {
 
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::sin(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_COS: {
 
-	//virtual int get_working_memory_size() const { return 0; }
-	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
-	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::cos(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_TAN: {
 
-	virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::tan(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_SINH: {
 
-		switch(func) {
-			case VisualScriptBuiltinFunc::MATH_SIN: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::sinh(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_COSH: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::sin(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_COS: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::cosh(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_TANH: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::cos(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_TAN: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::tanh(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_ASIN: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::tan(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_SINH: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::asin(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_ACOS: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::sinh(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_COSH: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::acos(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_ATAN: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::cosh(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_TANH: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::atan(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_ATAN2: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::tanh(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_ASIN: {
+			VALIDATE_ARG_NUM(0);
+			VALIDATE_ARG_NUM(1);
+			*r_return=Math::atan2(*p_inputs[0],*p_inputs[1]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_SQRT: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::asin(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_ACOS: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::sqrt(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_FMOD: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::acos(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_ATAN: {
+			VALIDATE_ARG_NUM(0);
+			VALIDATE_ARG_NUM(1);
+			*r_return=Math::fmod(*p_inputs[0],*p_inputs[1]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_FPOSMOD: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::atan(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_ATAN2: {
+			VALIDATE_ARG_NUM(0);
+			VALIDATE_ARG_NUM(1);
+			*r_return=Math::fposmod(*p_inputs[0],*p_inputs[1]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_FLOOR: {
 
-				VALIDATE_ARG_NUM(0);
-				VALIDATE_ARG_NUM(1);
-				*p_outputs[0]=Math::atan2(*p_inputs[0],*p_inputs[1]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_SQRT: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::floor(*p_inputs[0]);
+		  } break;
+		case VisualScriptBuiltinFunc::MATH_CEIL: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::sqrt(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_FMOD: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::ceil(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_ROUND: {
 
-				VALIDATE_ARG_NUM(0);
-				VALIDATE_ARG_NUM(1);
-				*p_outputs[0]=Math::fmod(*p_inputs[0],*p_inputs[1]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_FPOSMOD: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::round(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_ABS: {
 
-				VALIDATE_ARG_NUM(0);
-				VALIDATE_ARG_NUM(1);
-				*p_outputs[0]=Math::fposmod(*p_inputs[0],*p_inputs[1]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_FLOOR: {
+			if (p_inputs[0]->get_type()==Variant::INT) {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::floor(*p_inputs[0]);
-			  } break;
-			case VisualScriptBuiltinFunc::MATH_CEIL: {
+				int64_t i = *p_inputs[0];
+				*r_return=ABS(i);
+			} else if (p_inputs[0]->get_type()==Variant::REAL) {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::ceil(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_ROUND: {
+				real_t r = *p_inputs[0];
+				*r_return=Math::abs(r);
+			} else {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::round(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_ABS: {
+				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.argument=0;
+				r_error.expected=Variant::REAL;
+
+			}
+		} break;
+		case VisualScriptBuiltinFunc::MATH_SIGN: {
 
 				if (p_inputs[0]->get_type()==Variant::INT) {
 
 					int64_t i = *p_inputs[0];
-					*p_outputs[0]=ABS(i);
+					*r_return= i < 0 ? -1 : ( i > 0 ? +1 : 0);
 				} else if (p_inputs[0]->get_type()==Variant::REAL) {
 
 					real_t r = *p_inputs[0];
-					*p_outputs[0]=Math::abs(r);
+					*r_return= r < 0.0 ? -1.0 : ( r > 0.0 ? +1.0 : 0.0);
 				} else {
 
 					r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
@@ -679,410 +705,412 @@ public:
 					r_error.expected=Variant::REAL;
 
 				}
-			} break;
-			case VisualScriptBuiltinFunc::MATH_SIGN: {
+		} break;
+		case VisualScriptBuiltinFunc::MATH_POW: {
 
-					if (p_inputs[0]->get_type()==Variant::INT) {
+			VALIDATE_ARG_NUM(0);
+			VALIDATE_ARG_NUM(1);
+			*r_return=Math::pow(*p_inputs[0],*p_inputs[1]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_LOG: {
 
-						int64_t i = *p_inputs[0];
-						*p_outputs[0]= i < 0 ? -1 : ( i > 0 ? +1 : 0);
-					} else if (p_inputs[0]->get_type()==Variant::REAL) {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::log(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_EXP: {
 
-						real_t r = *p_inputs[0];
-						*p_outputs[0]= r < 0.0 ? -1.0 : ( r > 0.0 ? +1.0 : 0.0);
-					} else {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::exp(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_ISNAN: {
 
-						r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-						r_error.argument=0;
-						r_error.expected=Variant::REAL;
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::is_nan(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_ISINF: {
 
-					}
-			} break;
-			case VisualScriptBuiltinFunc::MATH_POW: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::is_inf(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_EASE: {
 
-				VALIDATE_ARG_NUM(0);
-				VALIDATE_ARG_NUM(1);
-				*p_outputs[0]=Math::pow(*p_inputs[0],*p_inputs[1]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_LOG: {
+			VALIDATE_ARG_NUM(0);
+			VALIDATE_ARG_NUM(1);
+			*r_return=Math::ease(*p_inputs[0],*p_inputs[1]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_DECIMALS: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::log(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_EXP: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::step_decimals(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_STEPIFY: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::exp(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_ISNAN: {
+			VALIDATE_ARG_NUM(0);
+			VALIDATE_ARG_NUM(1);
+			*r_return=Math::stepify(*p_inputs[0],*p_inputs[1]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_LERP: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::is_nan(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_ISINF: {
+			VALIDATE_ARG_NUM(0);
+			VALIDATE_ARG_NUM(1);
+			VALIDATE_ARG_NUM(2);
+			*r_return=Math::lerp(*p_inputs[0],*p_inputs[1],*p_inputs[2]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_DECTIME: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::is_inf(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_EASE: {
+			VALIDATE_ARG_NUM(0);
+			VALIDATE_ARG_NUM(1);
+			VALIDATE_ARG_NUM(2);
+			*r_return=Math::dectime(*p_inputs[0],*p_inputs[1],*p_inputs[2]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_RANDOMIZE: {
+			Math::randomize();
 
-				VALIDATE_ARG_NUM(0);
-				VALIDATE_ARG_NUM(1);
-				*p_outputs[0]=Math::ease(*p_inputs[0],*p_inputs[1]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_DECIMALS: {
+		} break;
+		case VisualScriptBuiltinFunc::MATH_RAND: {
+			*r_return=Math::rand();
+		} break;
+		case VisualScriptBuiltinFunc::MATH_RANDF: {
+			*r_return=Math::randf();
+		} break;
+		case VisualScriptBuiltinFunc::MATH_RANDOM: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::step_decimals(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_STEPIFY: {
+			VALIDATE_ARG_NUM(0);
+			VALIDATE_ARG_NUM(1);
+			*r_return=Math::random(*p_inputs[0],*p_inputs[1]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_SEED: {
 
-				VALIDATE_ARG_NUM(0);
-				VALIDATE_ARG_NUM(1);
-				*p_outputs[0]=Math::stepify(*p_inputs[0],*p_inputs[1]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_LERP: {
+			VALIDATE_ARG_NUM(0);
+			uint32_t seed=*p_inputs[0];
+			Math::seed(seed);
 
-				VALIDATE_ARG_NUM(0);
-				VALIDATE_ARG_NUM(1);
-				VALIDATE_ARG_NUM(2);
-				*p_outputs[0]=Math::lerp(*p_inputs[0],*p_inputs[1],*p_inputs[2]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_DECTIME: {
+		} break;
+		case VisualScriptBuiltinFunc::MATH_RANDSEED: {
 
-				VALIDATE_ARG_NUM(0);
-				VALIDATE_ARG_NUM(1);
-				VALIDATE_ARG_NUM(2);
-				*p_outputs[0]=Math::dectime(*p_inputs[0],*p_inputs[1],*p_inputs[2]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_RANDOMIZE: {
-				Math::randomize();
+			VALIDATE_ARG_NUM(0);
+			uint32_t seed=*p_inputs[0];
+			int ret = Math::rand_from_seed(&seed);
+			Array reta;
+			reta.push_back(ret);
+			reta.push_back(seed);
+			*r_return=reta;
 
-			} break;
-			case VisualScriptBuiltinFunc::MATH_RAND: {
-				*p_outputs[0]=Math::rand();
-			} break;
-			case VisualScriptBuiltinFunc::MATH_RANDF: {
-				*p_outputs[0]=Math::randf();
-			} break;
-			case VisualScriptBuiltinFunc::MATH_RANDOM: {
+		} break;
+		case VisualScriptBuiltinFunc::MATH_DEG2RAD: {
 
-				VALIDATE_ARG_NUM(0);
-				VALIDATE_ARG_NUM(1);
-				*p_outputs[0]=Math::random(*p_inputs[0],*p_inputs[1]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_SEED: {
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::deg2rad(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_RAD2DEG: {
 
-				VALIDATE_ARG_NUM(0);
-				uint32_t seed=*p_inputs[0];
-				Math::seed(seed);
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::rad2deg(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_LINEAR2DB: {
+
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::linear2db(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::MATH_DB2LINEAR: {
+
+			VALIDATE_ARG_NUM(0);
+			*r_return=Math::db2linear(*p_inputs[0]);
+		} break;
+		case VisualScriptBuiltinFunc::LOGIC_MAX: {
 
-			} break;
-			case VisualScriptBuiltinFunc::MATH_RANDSEED: {
+			if (p_inputs[0]->get_type()==Variant::INT && p_inputs[1]->get_type()==Variant::INT) {
 
+				int64_t a = *p_inputs[0];
+				int64_t b = *p_inputs[1];
+				*r_return=MAX(a,b);
+			} else {
 				VALIDATE_ARG_NUM(0);
-				uint32_t seed=*p_inputs[0];
-				int ret = Math::rand_from_seed(&seed);
-				Array reta;
-				reta.push_back(ret);
-				reta.push_back(seed);
-				*p_outputs[0]=reta;
+				VALIDATE_ARG_NUM(1);
 
-			} break;
-			case VisualScriptBuiltinFunc::MATH_DEG2RAD: {
+				real_t a = *p_inputs[0];
+				real_t b = *p_inputs[1];
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::deg2rad(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_RAD2DEG: {
+				*r_return=MAX(a,b);
+			}
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::rad2deg(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_LINEAR2DB: {
+		} break;
+		case VisualScriptBuiltinFunc::LOGIC_MIN: {
 
-				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::linear2db(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::MATH_DB2LINEAR: {
+			if (p_inputs[0]->get_type()==Variant::INT && p_inputs[1]->get_type()==Variant::INT) {
 
+				int64_t a = *p_inputs[0];
+				int64_t b = *p_inputs[1];
+				*r_return=MIN(a,b);
+			} else {
 				VALIDATE_ARG_NUM(0);
-				*p_outputs[0]=Math::db2linear(*p_inputs[0]);
-			} break;
-			case VisualScriptBuiltinFunc::LOGIC_MAX: {
+				VALIDATE_ARG_NUM(1);
 
-				if (p_inputs[0]->get_type()==Variant::INT && p_inputs[1]->get_type()==Variant::INT) {
+				real_t a = *p_inputs[0];
+				real_t b = *p_inputs[1];
 
-					int64_t a = *p_inputs[0];
-					int64_t b = *p_inputs[1];
-					*p_outputs[0]=MAX(a,b);
-				} else {
-					VALIDATE_ARG_NUM(0);
-					VALIDATE_ARG_NUM(1);
+				*r_return=MIN(a,b);
+			}
+		} break;
+		case VisualScriptBuiltinFunc::LOGIC_CLAMP: {
 
-					real_t a = *p_inputs[0];
-					real_t b = *p_inputs[1];
+			if (p_inputs[0]->get_type()==Variant::INT && p_inputs[1]->get_type()==Variant::INT && p_inputs[2]->get_type()==Variant::INT) {
 
-					*p_outputs[0]=MAX(a,b);
-				}
+				int64_t a = *p_inputs[0];
+				int64_t b = *p_inputs[1];
+				int64_t c = *p_inputs[2];
+				*r_return=CLAMP(a,b,c);
+			} else {
+				VALIDATE_ARG_NUM(0);
+				VALIDATE_ARG_NUM(1);
+				VALIDATE_ARG_NUM(2);
 
-			} break;
-			case VisualScriptBuiltinFunc::LOGIC_MIN: {
+				real_t a = *p_inputs[0];
+				real_t b = *p_inputs[1];
+				real_t c = *p_inputs[2];
 
-				if (p_inputs[0]->get_type()==Variant::INT && p_inputs[1]->get_type()==Variant::INT) {
+				*r_return=CLAMP(a,b,c);
+			}
+		} break;
+		case VisualScriptBuiltinFunc::LOGIC_NEAREST_PO2: {
 
-					int64_t a = *p_inputs[0];
-					int64_t b = *p_inputs[1];
-					*p_outputs[0]=MIN(a,b);
-				} else {
-					VALIDATE_ARG_NUM(0);
-					VALIDATE_ARG_NUM(1);
+			VALIDATE_ARG_NUM(0);
+			int64_t num = *p_inputs[0];
+			*r_return = nearest_power_of_2(num);
+		} break;
+		case VisualScriptBuiltinFunc::OBJ_WEAKREF: {
 
-					real_t a = *p_inputs[0];
-					real_t b = *p_inputs[1];
+			if (p_inputs[0]->get_type()!=Variant::OBJECT) {
 
-					*p_outputs[0]=MIN(a,b);
-				}
-			} break;
-			case VisualScriptBuiltinFunc::LOGIC_CLAMP: {
+				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.argument=0;
+				r_error.expected=Variant::OBJECT;
 
-				if (p_inputs[0]->get_type()==Variant::INT && p_inputs[1]->get_type()==Variant::INT && p_inputs[2]->get_type()==Variant::INT) {
+				return;
 
-					int64_t a = *p_inputs[0];
-					int64_t b = *p_inputs[1];
-					int64_t c = *p_inputs[2];
-					*p_outputs[0]=CLAMP(a,b,c);
-				} else {
-					VALIDATE_ARG_NUM(0);
-					VALIDATE_ARG_NUM(1);
-					VALIDATE_ARG_NUM(2);
+			}
 
-					real_t a = *p_inputs[0];
-					real_t b = *p_inputs[1];
-					real_t c = *p_inputs[2];
+			if (p_inputs[0]->is_ref()) {
 
-					*p_outputs[0]=CLAMP(a,b,c);
+				REF r = *p_inputs[0];
+				if (!r.is_valid()) {
+
+					return;
 				}
-			} break;
-			case VisualScriptBuiltinFunc::LOGIC_NEAREST_PO2: {
 
-				VALIDATE_ARG_NUM(0);
-				int64_t num = *p_inputs[0];
-				*p_outputs[0] = nearest_power_of_2(num);
-			} break;
-			case VisualScriptBuiltinFunc::OBJ_WEAKREF: {
+				Ref<WeakRef> wref = memnew( WeakRef );
+				wref->set_ref(r);
+				*r_return=wref;
+			} else {
+				Object *obj = *p_inputs[0];
+				if (!obj) {
 
-				if (p_inputs[0]->get_type()!=Variant::OBJECT) {
+					return;
+				}
+				Ref<WeakRef> wref = memnew( WeakRef );
+				wref->set_obj(obj);
+				*r_return=wref;
+			}
 
-					r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-					r_error.argument=0;
-					r_error.expected=Variant::OBJECT;
 
-					return 0;
 
-				}
 
-				if (p_inputs[0]->is_ref()) {
+		} break;
+		case VisualScriptBuiltinFunc::FUNC_FUNCREF: {
 
-					REF r = *p_inputs[0];
-					if (!r.is_valid()) {
+			if (p_inputs[0]->get_type()!=Variant::OBJECT) {
 
-						return 0;
-					}
+				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.argument=0;
+				r_error.expected=Variant::OBJECT;
 
-					Ref<WeakRef> wref = memnew( WeakRef );
-					wref->set_ref(r);
-					*p_outputs[0]=wref;
-				} else {
-					Object *obj = *p_inputs[0];
-					if (!obj) {
+				return;
 
-						return 0;
-					}
-					Ref<WeakRef> wref = memnew( WeakRef );
-					wref->set_obj(obj);
-					*p_outputs[0]=wref;
-				}
+			}
+			if (p_inputs[1]->get_type()!=Variant::STRING && p_inputs[1]->get_type()!=Variant::NODE_PATH) {
 
+				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.argument=1;
+				r_error.expected=Variant::STRING;
 
+				return;
 
+			}
 
-			} break;
-			case VisualScriptBuiltinFunc::FUNC_FUNCREF: {
+			Ref<FuncRef> fr = memnew( FuncRef);
 
-				if (p_inputs[0]->get_type()!=Variant::OBJECT) {
+			fr->set_instance(*p_inputs[0]);
+			fr->set_function(*p_inputs[1]);
 
-					r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-					r_error.argument=0;
-					r_error.expected=Variant::OBJECT;
+			*r_return=fr;
 
-					return 0;
+		} break;
+		case VisualScriptBuiltinFunc::TYPE_CONVERT: {
 
-				}
-				if (p_inputs[1]->get_type()!=Variant::STRING && p_inputs[1]->get_type()!=Variant::NODE_PATH) {
+			VALIDATE_ARG_NUM(1);
+			int type=*p_inputs[1];
+			if (type<0 || type>=Variant::VARIANT_MAX) {
 
-					r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-					r_error.argument=1;
-					r_error.expected=Variant::STRING;
+				r_error_str=RTR("Invalid type argument to convert(), use TYPE_* constants.");
+				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.argument=0;
+				r_error.expected=Variant::INT;
+				return;
 
-					return 0;
+			} else {
 
-				}
 
-				Ref<FuncRef> fr = memnew( FuncRef);
+				*r_return=Variant::construct(Variant::Type(type),p_inputs,1,r_error);
+			}
+		} break;
+		case VisualScriptBuiltinFunc::TYPE_OF: {
 
-				fr->set_instance(*p_inputs[0]);
-				fr->set_function(*p_inputs[1]);
 
-				*p_outputs[0]=fr;
+			*r_return = p_inputs[0]->get_type();
 
-			} break;
-			case VisualScriptBuiltinFunc::TYPE_CONVERT: {
+		} break;
+		case VisualScriptBuiltinFunc::TYPE_EXISTS: {
 
-				VALIDATE_ARG_NUM(1);
-				int type=*p_inputs[1];
-				if (type<0 || type>=Variant::VARIANT_MAX) {
 
-					*p_outputs[0]=RTR("Invalid type argument to convert(), use TYPE_* constants.");
-					r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-					r_error.argument=0;
-					r_error.expected=Variant::INT;
-					return 0;
+			*r_return = ObjectTypeDB::type_exists(*p_inputs[0]);
 
-				} else {
+		} break;
+		case VisualScriptBuiltinFunc::TEXT_STR: {
 
+			String str = *p_inputs[0];
 
-					*p_outputs[0]=Variant::construct(Variant::Type(type),p_inputs,1,r_error);
-				}
-			} break;
-			case VisualScriptBuiltinFunc::TYPE_OF: {
+			*r_return=str;
 
+		} break;
+		case VisualScriptBuiltinFunc::TEXT_PRINT: {
 
-				*p_outputs[0] = p_inputs[0]->get_type();
+			String str = *p_inputs[0];
+			print_line(str);
 
-			} break;
-			case VisualScriptBuiltinFunc::TYPE_EXISTS: {
 
+		} break;
 
-				*p_outputs[0] = ObjectTypeDB::type_exists(*p_inputs[0]);
+		case VisualScriptBuiltinFunc::TEXT_PRINTERR: {
 
-			} break;
-			case VisualScriptBuiltinFunc::TEXT_STR: {
+			String str = *p_inputs[0];
 
-				String str = *p_inputs[0];
+			//str+="\n";
+			OS::get_singleton()->printerr("%s\n",str.utf8().get_data());
 
-				*p_outputs[0]=str;
 
-			} break;
-			case VisualScriptBuiltinFunc::TEXT_PRINT: {
+		} break;
+		case VisualScriptBuiltinFunc::TEXT_PRINTRAW: {
+			String str = *p_inputs[0];
 
-				String str = *p_inputs[0];
-				print_line(str);
+			//str+="\n";
+			OS::get_singleton()->print("%s",str.utf8().get_data());
 
 
-			} break;
+		} break;
+		case VisualScriptBuiltinFunc::VAR_TO_STR: {
 
-			case VisualScriptBuiltinFunc::TEXT_PRINTERR: {
+			String vars;
+			VariantWriter::write_to_string(*p_inputs[0],vars);
+			*r_return=vars;
+		} break;
+		case VisualScriptBuiltinFunc::STR_TO_VAR: {
 
-				String str = *p_inputs[0];
+			if (p_inputs[0]->get_type()!=Variant::STRING) {
+				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.argument=0;
+				r_error.expected=Variant::STRING;
 
-				//str+="\n";
-				OS::get_singleton()->printerr("%s\n",str.utf8().get_data());
+				return;
+			}
 
+			VariantParser::StreamString ss;
+			ss.s=*p_inputs[0];
 
-			} break;
-			case VisualScriptBuiltinFunc::TEXT_PRINTRAW: {
-				String str = *p_inputs[0];
+			String errs;
+			int line;
+			Error err = VariantParser::parse(&ss,*r_return,errs,line);
 
-				//str+="\n";
-				OS::get_singleton()->print("%s",str.utf8().get_data());
+			if (err!=OK) {
+				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.argument=0;
+				r_error.expected=Variant::STRING;
+				*r_return="Parse error at line "+itos(line)+": "+errs;
+				return;
+			}
 
+		} break;
+		case VisualScriptBuiltinFunc::VAR_TO_BYTES: {
 
-			} break;
-			case VisualScriptBuiltinFunc::VAR_TO_STR: {
 
-				String vars;
-				VariantWriter::write_to_string(*p_inputs[0],vars);
-				*p_outputs[0]=vars;
-			} break;
-			case VisualScriptBuiltinFunc::STR_TO_VAR: {
+			ByteArray barr;
+			int len;
+			Error err = encode_variant(*p_inputs[0],NULL,len);
+			if (err) {
+				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.argument=0;
+				r_error.expected=Variant::NIL;
+				r_error_str="Unexpected error encoding variable to bytes, likely unserializable type found (Object or RID).";
+				return;
+			}
 
-				if (p_inputs[0]->get_type()!=Variant::STRING) {
-					r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-					r_error.argument=0;
-					r_error.expected=Variant::STRING;
+			barr.resize(len);
+			{
+				ByteArray::Write w = barr.write();
+				encode_variant(*p_inputs[0],w.ptr(),len);
 
-					return 0;
-				}
+			}
+			*r_return=barr;
+		} break;
+		case VisualScriptBuiltinFunc::BYTES_TO_VAR: {
 
-				VariantParser::StreamString ss;
-				ss.s=*p_inputs[0];
+			if (p_inputs[0]->get_type()!=Variant::RAW_ARRAY) {
+				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.argument=0;
+				r_error.expected=Variant::RAW_ARRAY;
 
-				String errs;
-				int line;
-				Error err = VariantParser::parse(&ss,*p_outputs[0],errs,line);
+				return;
+			}
 
+			ByteArray varr=*p_inputs[0];
+			Variant ret;
+			{
+				ByteArray::Read r=varr.read();
+				Error err = decode_variant(ret,r.ptr(),varr.size(),NULL);
 				if (err!=OK) {
+					r_error_str=RTR("Not enough bytes for decoding bytes, or invalid format.");
 					r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
 					r_error.argument=0;
-					r_error.expected=Variant::STRING;
-					*p_outputs[0]="Parse error at line "+itos(line)+": "+errs;
-					return 0;
+					r_error.expected=Variant::RAW_ARRAY;
+					return;
 				}
 
-			} break;
-			case VisualScriptBuiltinFunc::VAR_TO_BYTES: {
+			}
 
+			*r_return=ret;
 
-				ByteArray barr;
-				int len;
-				Error err = encode_variant(*p_inputs[0],NULL,len);
-				if (err) {
-					r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-					r_error.argument=0;
-					r_error.expected=Variant::NIL;
-					*p_outputs[0]="Unexpected error encoding variable to bytes, likely unserializable type found (Object or RID).";
-					return 0;
-				}
+		} break;
+		default: {}
+	}
 
-				barr.resize(len);
-				{
-					ByteArray::Write w = barr.write();
-					encode_variant(*p_inputs[0],w.ptr(),len);
+}
 
-				}
-				*p_outputs[0]=barr;
-			} break;
-			case VisualScriptBuiltinFunc::BYTES_TO_VAR: {
 
-				if (p_inputs[0]->get_type()!=Variant::RAW_ARRAY) {
-					r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-					r_error.argument=0;
-					r_error.expected=Variant::RAW_ARRAY;
+class VisualScriptNodeInstanceBuiltinFunc : public VisualScriptNodeInstance {
+public:
 
-					return 0;
-				}
+	VisualScriptBuiltinFunc *node;
+	VisualScriptInstance *instance;
 
-				ByteArray varr=*p_inputs[0];
-				Variant ret;
-				{
-					ByteArray::Read r=varr.read();
-					Error err = decode_variant(ret,r.ptr(),varr.size(),NULL);
-					if (err!=OK) {
-						*p_outputs[0]=RTR("Not enough bytes for decoding bytes, or invalid format.");
-						r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-						r_error.argument=0;
-						r_error.expected=Variant::RAW_ARRAY;
-						return 0;
-					}
+	VisualScriptBuiltinFunc::BuiltinFunc func;
 
-				}
 
-				*p_outputs[0]=ret;
+	//virtual int get_working_memory_size() const { return 0; }
+	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
+	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
+
+	virtual int step(const Variant** p_inputs,Variant** p_outputs,StartMode p_start_mode,Variant* p_working_mem,Variant::CallError& r_error,String& r_error_str) {
 
-			} break;
-			default: {}
-		}
+		VisualScriptBuiltinFunc::exec_func(func,p_inputs,p_outputs[0],r_error,r_error_str);
 		return 0;
 	}
 
diff --git a/modules/visual_script/visual_script_builtin_funcs.h b/modules/visual_script/visual_script_builtin_funcs.h
index ebf227a19..000230d84 100644
--- a/modules/visual_script/visual_script_builtin_funcs.h
+++ b/modules/visual_script/visual_script_builtin_funcs.h
@@ -68,6 +68,11 @@ public:
 		FUNC_MAX
 	};
 
+	static int get_func_argument_count(BuiltinFunc p_func);
+	static String get_func_name(BuiltinFunc p_func);
+	static void exec_func(BuiltinFunc p_func, const Variant** p_inputs, Variant* r_return, Variant::CallError& r_error, String& r_error_str);
+	static BuiltinFunc find_function(const String& p_string);
+
 private:
 	static const char* func_name[FUNC_MAX];
 	BuiltinFunc func;
diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp
index 14708799a..76f6f47ad 100644
--- a/modules/visual_script/visual_script_editor.cpp
+++ b/modules/visual_script/visual_script_editor.cpp
@@ -331,7 +331,7 @@ static Color _color_from_type(Variant::Type p_type) {
 		case Variant::QUAT: color = Color::html("ec69a3"); break;
 		case Variant::_AABB: color = Color::html("ee7991"); break;
 		case Variant::MATRIX3: color = Color::html("e3ec69"); break;
-		case Variant::TRANSFORM: color = Color::html("ecd669"); break;
+		case Variant::TRANSFORM: color = Color::html("f6a86e"); break;
 
 		case Variant::COLOR: color = Color::html("9dff70"); break;
 		case Variant::IMAGE: color = Color::html("93f1b9"); break;
@@ -503,13 +503,21 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 		}
 
 
-		Label *text = memnew( Label );
-		text->set_text(node->get_text());
-		gnode->add_child(text);
 		if (node->cast_to<VisualScriptExpression>()) {
-			text->add_font_override("font",get_font("source","EditorFonts"));
+
+			LineEdit *line_edit = memnew( LineEdit );
+			line_edit->set_text(node->get_text());
+			line_edit->set_expand_to_text_length(true);
+			line_edit->add_font_override("font",get_font("source","EditorFonts"));
+			gnode->add_child(line_edit);
+			line_edit->connect("text_changed",this,"_expression_text_changed",varray(E->get()));
+		} else {
+			Label *text = memnew( Label );
+			text->set_text(node->get_text());
+			gnode->add_child(text);
 		}
 
+
 		if (node->cast_to<VisualScriptComment>()) {
 			Ref<VisualScriptComment> vsc=node;
 			gnode->set_comment(true);
@@ -1201,6 +1209,30 @@ void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_butt
 	}
 }
 
+void VisualScriptEditor::_expression_text_changed(const String& p_text,int p_id) {
+
+	Ref<VisualScriptExpression> vse = script->get_node(edited_func,p_id);
+	if (!vse.is_valid())
+		return;
+
+
+	updating_graph=true;
+
+	undo_redo->create_action(TTR("Change Expression"),UndoRedo::MERGE_ENDS);
+	undo_redo->add_do_property(vse.ptr(),"expression",p_text);
+	undo_redo->add_undo_property(vse.ptr(),"expression",vse->get("expression"));
+	undo_redo->add_do_method(this,"_update_graph",p_id);
+	undo_redo->add_undo_method(this,"_update_graph",p_id);
+	undo_redo->commit_action();
+
+	Node *node = graph->get_node(itos(p_id));
+	if (node->cast_to<Control>())
+		node->cast_to<Control>()->set_size(Vector2(1,1)); //shrink if text is smaller
+
+	updating_graph=false;
+
+}
+
 void VisualScriptEditor::_available_node_doubleclicked() {
 
 	TreeItem *item = nodes->get_selected();
@@ -3224,6 +3256,7 @@ void VisualScriptEditor::_bind_methods() {
 	ObjectTypeDB::bind_method("_button_resource_previewed",&VisualScriptEditor::_button_resource_previewed);
 	ObjectTypeDB::bind_method("_port_action_menu",&VisualScriptEditor::_port_action_menu);
 	ObjectTypeDB::bind_method("_selected_connect_node_method_or_setget",&VisualScriptEditor::_selected_connect_node_method_or_setget);
+	ObjectTypeDB::bind_method("_expression_text_changed",&VisualScriptEditor::_expression_text_changed);
 
 
 
diff --git a/modules/visual_script/visual_script_editor.h b/modules/visual_script/visual_script_editor.h
index 5191ed540..483ae1644 100644
--- a/modules/visual_script/visual_script_editor.h
+++ b/modules/visual_script/visual_script_editor.h
@@ -168,6 +168,7 @@ class VisualScriptEditor : public ScriptEditorBase {
 
 	void _member_button(Object *p_item, int p_column, int p_button);
 
+	void _expression_text_changed(const String& p_text,int p_id);
 
 
 	String revert_on_drag;
diff --git a/modules/visual_script/visual_script_expression.cpp b/modules/visual_script/visual_script_expression.cpp
index 3cfb1c154..cc3b5f217 100644
--- a/modules/visual_script/visual_script_expression.cpp
+++ b/modules/visual_script/visual_script_expression.cpp
@@ -120,7 +120,7 @@ void VisualScriptExpression::_get_property_list( List<PropertyInfo> *p_list) con
 		argt+=","+Variant::get_type_name(Variant::Type(i));
 	}
 
-	p_list->push_back(PropertyInfo(Variant::STRING,"expression"));
+	p_list->push_back(PropertyInfo(Variant::STRING,"expression",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR));
 	p_list->push_back(PropertyInfo(Variant::INT,"out_type",PROPERTY_HINT_ENUM,argt));
 	p_list->push_back(PropertyInfo(Variant::INT,"input_count",PROPERTY_HINT_RANGE,"0,64,1"));
 	p_list->push_back(PropertyInfo(Variant::BOOL,"sequenced"));
@@ -577,6 +577,13 @@ Error VisualScriptExpression::_get_token(Token& r_token) {
 							}
 						}
 
+						VisualScriptBuiltinFunc::BuiltinFunc bifunc = VisualScriptBuiltinFunc::find_function(id);
+						if (bifunc!=VisualScriptBuiltinFunc::FUNC_MAX) {
+							r_token.type=TK_BUILTIN_FUNC;
+							r_token.value=bifunc;
+							return OK;
+						}
+
 						r_token.type=TK_IDENTIFIER;
 						r_token.value=id;
 					}
@@ -603,6 +610,7 @@ const char* VisualScriptExpression::token_name[TK_MAX]={
 "PARENTHESIS OPEN",
 "PARENTHESIS CLOSE",
 "IDENTIFIER",
+"BUILTIN FUNC",
 "SELF",
 "CONSTANT",
 "BASIC TYPE",
@@ -814,6 +822,53 @@ VisualScriptExpression::ENode* VisualScriptExpression::_parse_expression() {
 				expr=constructor;
 
 			} break;
+			case TK_BUILTIN_FUNC: {
+				//builtin function
+
+				Variant::Type bt = Variant::Type(int(tk.value));
+				_get_token(tk);
+				if (tk.type!=TK_PARENTHESIS_OPEN) {
+					_set_error("Expected '('");
+					return NULL;
+				}
+
+				BuiltinFuncNode *bifunc = alloc_node<BuiltinFuncNode>();
+				bifunc->func=VisualScriptBuiltinFunc::BuiltinFunc(int(tk.value));
+
+				while(true) {
+
+					int cofs=str_ofs;
+					_get_token(tk);
+					if (tk.type==TK_PARENTHESIS_CLOSE) {
+						break;
+					}
+					str_ofs=cofs; //revert
+					//parse an expression
+					ENode* expr=_parse_expression();
+					if (!expr)
+						return NULL;
+
+					bifunc->arguments.push_back(expr);
+
+					cofs=str_ofs;
+					_get_token(tk);
+					if (tk.type==TK_COMMA) {
+						//all good
+					} else if (tk.type==TK_PARENTHESIS_CLOSE) {
+						str_ofs=cofs;
+					} else {
+						_set_error("Expected ',' or ')'");
+					}
+				}
+
+				int expected_args = VisualScriptBuiltinFunc::get_func_argument_count(bifunc->func);
+				if (bifunc->arguments.size() != expected_args) {
+					_set_error("Builtin func '"+VisualScriptBuiltinFunc::get_func_name(bifunc->func)+"' expects "+itos(expected_args)+" arguments.");
+				}
+
+				expr=bifunc;
+
+			} break;
 			case TK_OP_SUB: {
 
 				Expression e;
@@ -1338,6 +1393,34 @@ public:
 
 
 			} break;
+			case VisualScriptExpression::ENode::TYPE_BUILTIN_FUNC:  {
+
+				const VisualScriptExpression::BuiltinFuncNode *bifunc = static_cast<const VisualScriptExpression::BuiltinFuncNode*>(p_node);
+
+				Vector<Variant> arr;
+				Vector<const Variant*> argp;
+				arr.resize(bifunc->arguments.size());
+				argp.resize(bifunc->arguments.size());
+
+				for (int i=0;i<bifunc->arguments.size();i++) {
+
+					Variant value;
+					bool ret = _execute(p_inputs,bifunc->arguments[i],value,r_error_str,ce);
+					if (ret)
+						return true;
+					arr[i]=value;
+					argp[i]=&arr[i];
+				}
+
+
+				VisualScriptBuiltinFunc::exec_func(bifunc->func,argp.ptr(),&r_ret,ce,r_error_str);
+
+				if (ce.error!=Variant::CallError::CALL_OK) {
+					r_error_str="Builtin Call Failed. "+r_error_str;
+					return true;
+				}
+
+			} break;
 			case VisualScriptExpression::ENode::TYPE_CALL:  {
 
 				const VisualScriptExpression::CallNode *call = static_cast<const VisualScriptExpression::CallNode*>(p_node);
@@ -1396,8 +1479,8 @@ public:
 			r_error_str+="Can't convert expression result from "+Variant::get_type_name(p_outputs[0]->get_type())+" to "+Variant::get_type_name(expression->output_type)+".";
 			r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD;
 
-#endif
 		}
+#endif
 
 		return 0;
 	}
diff --git a/modules/visual_script/visual_script_expression.h b/modules/visual_script/visual_script_expression.h
index 90b955b5d..4edae133c 100644
--- a/modules/visual_script/visual_script_expression.h
+++ b/modules/visual_script/visual_script_expression.h
@@ -2,6 +2,7 @@
 #define VISUALSCRIPTEXPRESSION_H
 
 #include "visual_script.h"
+#include "visual_script_builtin_funcs.h"
 
 class VisualScriptExpression : public VisualScriptNode {
 
@@ -35,6 +36,7 @@ friend class VisualScriptNodeInstanceExpression;
 		TK_PARENTHESIS_OPEN,
 		TK_PARENTHESIS_CLOSE,
 		TK_IDENTIFIER,
+		TK_BUILTIN_FUNC,
 		TK_SELF,
 		TK_CONSTANT,
 		TK_BASIC_TYPE,
@@ -101,6 +103,7 @@ friend class VisualScriptNodeInstanceExpression;
 			TYPE_ARRAY,
 			TYPE_DICTIONARY,
 			TYPE_CONSTRUCTOR,
+			TYPE_BUILTIN_FUNC,
 			TYPE_CALL
 		};
 
@@ -214,6 +217,14 @@ friend class VisualScriptNodeInstanceExpression;
 
 	};
 
+	struct BuiltinFuncNode : public ENode {
+		VisualScriptBuiltinFunc::BuiltinFunc func;
+		Vector<ENode*> arguments;
+		BuiltinFuncNode() {
+			type=TYPE_BUILTIN_FUNC;
+		}
+	};
+
 	template<class T>
 	T* alloc_node() {
 		T* node = memnew(T);
diff --git a/modules/visual_script/visual_script_func_nodes.cpp b/modules/visual_script/visual_script_func_nodes.cpp
index de99beaca..5a21cb40e 100644
--- a/modules/visual_script/visual_script_func_nodes.cpp
+++ b/modules/visual_script/visual_script_func_nodes.cpp
@@ -417,6 +417,14 @@ void VisualScriptFunctionCall::_update_method_cache() {
 
 		method_cache.return_val = mb->get_argument_info(-1);
 #endif
+
+		if (mb->is_vararg()) {
+			//for vararg just give it 10 arguments (should be enough for most use cases)
+			for(int i=0;i<10;i++) {
+				method_cache.arguments.push_back(PropertyInfo(Variant::NIL,"arg"+itos(i)));
+				use_default_args++;
+			}
+		}
 	} else if (script.is_valid() && script->has_method(function)) {
 
 		method_cache = script->get_method_info(function);
diff --git a/platform/android/build.gradle.template b/platform/android/build.gradle.template
index 24951b921..873eef056 100644
--- a/platform/android/build.gradle.template
+++ b/platform/android/build.gradle.template
@@ -67,7 +67,6 @@ android {
 				$$GRADLE_ASSET_DIRS$$
 			]
 			jniLibs.srcDirs = [
-				'libs'
 				$$GRADLE_JNI_DIRS$$
 			]
 		}
diff --git a/platform/osx/SCsub b/platform/osx/SCsub
index 3785eb3fb..416979551 100644
--- a/platform/osx/SCsub
+++ b/platform/osx/SCsub
@@ -7,6 +7,7 @@ files = [
 	'sem_osx.cpp',
 #	'context_gl_osx.cpp',
 	'dir_access_osx.mm',
+	'joystick_osx.cpp',
 	]
 
 env.Program('#bin/godot',files)
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 1982beb10..01ea09fa2 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -92,7 +92,7 @@ def configure(env):
 	env.Append(LIBS=['pthread'])
 	#env.Append(CPPFLAGS=['-F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-mmacosx-version-min=10.4'])
 	#env.Append(LINKFLAGS=['-mmacosx-version-min=10.4', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk'])
-	env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit','-lz'])
+	env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit','-lz', '-framework', 'IOKit', '-framework', 'ForceFeedback'])
 
 	if (env["CXX"]=="clang++"):
 		env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
diff --git a/platform/osx/joystick_osx.cpp b/platform/osx/joystick_osx.cpp
new file mode 100644
index 000000000..ffb6ac326
--- /dev/null
+++ b/platform/osx/joystick_osx.cpp
@@ -0,0 +1,623 @@
+/*************************************************************************/
+/*  joystick_osx.cpp                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 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       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "joystick_osx.h"
+#include <machine/endian.h>
+
+#define GODOT_JOY_LOOP_RUN_MODE CFSTR("GodotJoystick")
+
+static JoystickOSX* self = NULL;
+
+joystick::joystick() {
+	device_ref = NULL;
+	ff_device = NULL;
+	ff_axes = NULL;
+	ff_directions = NULL;
+	ffservice = 0;
+	ff_timestamp = 0;
+	id = 0;
+
+	ff_constant_force.lMagnitude = 10000;
+	ff_effect.dwDuration = 0;
+	ff_effect.dwSamplePeriod = 0;
+	ff_effect.dwGain = 10000;
+	ff_effect.dwFlags = FFEFF_OBJECTOFFSETS;
+	ff_effect.dwTriggerButton = FFEB_NOTRIGGER;
+	ff_effect.dwStartDelay = 0;
+	ff_effect.dwTriggerRepeatInterval = 0;
+	ff_effect.lpEnvelope = NULL;
+	ff_effect.cbTypeSpecificParams = sizeof(FFCONSTANTFORCE);
+	ff_effect.lpvTypeSpecificParams = &ff_constant_force;
+	ff_effect.dwSize = sizeof(ff_effect);
+}
+
+void joystick::free() {
+	if (device_ref) {
+		IOHIDDeviceUnscheduleFromRunLoop(device_ref, CFRunLoopGetCurrent(), GODOT_JOY_LOOP_RUN_MODE);
+	}
+	if (ff_device) {
+		FFDeviceReleaseEffect(ff_device, ff_object);
+		FFReleaseDevice(ff_device);
+		memfree(ff_axes);
+		memfree(ff_directions);
+	}
+}
+
+bool joystick::has_element(IOHIDElementCookie p_cookie, Vector<rec_element> *p_list) const {
+	for (int i = 0; i < p_list->size(); i++) {
+		if (p_cookie == p_list->get(i).cookie) {
+			return true;
+		}
+	}
+	return false;
+}
+
+int joystick::get_hid_element_state(rec_element *p_element) const {
+	int value = 0;
+	if (p_element && p_element->ref) {
+		IOHIDValueRef valueRef;
+		if (IOHIDDeviceGetValue(device_ref, p_element->ref, &valueRef) == kIOReturnSuccess) {
+			value = (SInt32) IOHIDValueGetIntegerValue(valueRef);
+
+			/* record min and max for auto calibration */
+			if (value < p_element->min) {
+				p_element->min = value;
+			}
+			if (value > p_element->max) {
+				p_element->max = value;
+			}
+		}
+	}
+	return value;
+}
+void joystick::add_hid_element(IOHIDElementRef p_element) {
+	const CFTypeID elementTypeID = p_element ? CFGetTypeID(p_element) : 0;
+
+	if (p_element && (elementTypeID == IOHIDElementGetTypeID())) {
+		const IOHIDElementCookie cookie = IOHIDElementGetCookie(p_element);
+		const uint32_t usagePage = IOHIDElementGetUsagePage(p_element);
+		const uint32_t usage = IOHIDElementGetUsage(p_element);
+		Vector<rec_element> *list = NULL;
+
+		switch (IOHIDElementGetType(p_element)) {
+		case kIOHIDElementTypeInput_Misc:
+		case kIOHIDElementTypeInput_Button:
+		case kIOHIDElementTypeInput_Axis: {
+			switch (usagePage) {
+			case kHIDPage_GenericDesktop:
+				switch (usage) {
+				case kHIDUsage_GD_X:
+				case kHIDUsage_GD_Y:
+				case kHIDUsage_GD_Z:
+				case kHIDUsage_GD_Rx:
+				case kHIDUsage_GD_Ry:
+				case kHIDUsage_GD_Rz:
+				case kHIDUsage_GD_Slider:
+				case kHIDUsage_GD_Dial:
+				case kHIDUsage_GD_Wheel:
+					if (!has_element(cookie, &axis_elements)) {
+						list = &axis_elements;
+					}
+					break;
+
+				case kHIDUsage_GD_Hatswitch:
+					if (!has_element(cookie, &hat_elements)) {
+						list = &hat_elements;
+					}
+					break;
+				case kHIDUsage_GD_DPadUp:
+				case kHIDUsage_GD_DPadDown:
+				case kHIDUsage_GD_DPadRight:
+				case kHIDUsage_GD_DPadLeft:
+				case kHIDUsage_GD_Start:
+				case kHIDUsage_GD_Select:
+					if (!has_element(cookie, &button_elements)) {
+						list = &button_elements;
+					}
+					break;
+				}
+				break;
+
+			case kHIDPage_Simulation:
+				switch (usage) {
+				case kHIDUsage_Sim_Rudder:
+				case kHIDUsage_Sim_Throttle:
+					if (!has_element(cookie, &axis_elements)) {
+						list = &axis_elements;
+					}
+					break;
+
+				default:
+					break;
+				}
+				break;
+
+			case kHIDPage_Button:
+			case kHIDPage_Consumer:
+				if (!has_element(cookie, &button_elements)) {
+					list = &button_elements;
+				}
+				break;
+
+			default:
+				break;
+			}
+		}
+			break;
+
+		case kIOHIDElementTypeCollection: {
+			CFArrayRef array = IOHIDElementGetChildren(p_element);
+			if (array) {
+				add_hid_elements(array);
+			}
+		}
+			break;
+
+		default:
+			break;
+		}
+
+		if (list) {       /* add to list */
+			rec_element element;
+
+			element.ref = p_element;
+			element.usage = usage;
+
+			element.min = (SInt32) IOHIDElementGetLogicalMin(p_element);
+			element.max = (SInt32) IOHIDElementGetLogicalMax(p_element);
+			element.cookie = IOHIDElementGetCookie(p_element);
+			list->push_back(element);
+			list->sort_custom<rec_element::Comparator>();
+		}
+	}
+}
+
+static void hid_element_added(const void *p_value, void *p_parameter) {
+	joystick *joy = (joystick*) p_parameter;
+	joy->add_hid_element((IOHIDElementRef) p_value);
+}
+
+void joystick::add_hid_elements(CFArrayRef p_array) {
+	CFRange range = { 0, CFArrayGetCount(p_array) };
+	CFArrayApplyFunction(p_array, range,hid_element_added,this);
+}
+
+static void joystick_removed_callback(void *ctx, IOReturn result, void *sender) {
+	int id = (intptr_t) ctx;
+	self->_device_removed(id);
+}
+
+
+static void joystick_added_callback(void *ctx, IOReturn res, void *sender, IOHIDDeviceRef ioHIDDeviceObject) {
+	self->_device_added(res, ioHIDDeviceObject);
+}
+
+static bool is_joystick(IOHIDDeviceRef p_device_ref) {
+	CFTypeRef refCF = NULL;
+	int usage_page = 0;
+	int usage = 0;
+	refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDPrimaryUsagePageKey));
+	if (refCF) {
+		CFNumberGetValue((CFNumberRef) refCF, kCFNumberSInt32Type, &usage_page);
+	}
+	if (usage_page != kHIDPage_GenericDesktop) {
+		return false;
+	}
+
+	refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDPrimaryUsageKey));
+	if (refCF) {
+		CFNumberGetValue((CFNumberRef) refCF, kCFNumberSInt32Type, &usage);
+	}
+	if ((usage != kHIDUsage_GD_Joystick &&
+		 usage != kHIDUsage_GD_GamePad &&
+		 usage != kHIDUsage_GD_MultiAxisController)) {
+		return false;
+	}
+	return true;
+}
+
+void JoystickOSX::_device_added(IOReturn p_res, IOHIDDeviceRef p_device) {
+
+	if (p_res != kIOReturnSuccess || have_device(p_device)) {
+		return;
+	}
+
+	joystick new_joystick;
+	if (is_joystick(p_device)) {
+		configure_joystick(p_device, &new_joystick);
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+		if (IOHIDDeviceGetService != NULL) {
+#endif
+			const io_service_t ioservice = IOHIDDeviceGetService(p_device);
+			if ((ioservice) && (FFIsForceFeedback(ioservice) == FF_OK) && new_joystick.config_force_feedback(ioservice))  {
+				new_joystick.ffservice = ioservice;
+			}
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+		}
+#endif
+		device_list.push_back(new_joystick);
+	}
+	IOHIDDeviceRegisterRemovalCallback(p_device, joystick_removed_callback, (void*) (intptr_t) new_joystick.id);
+	IOHIDDeviceScheduleWithRunLoop(p_device, CFRunLoopGetCurrent(), GODOT_JOY_LOOP_RUN_MODE);
+}
+
+void JoystickOSX::_device_removed(int p_id) {
+
+	int device = get_joy_index(p_id);
+	ERR_FAIL_COND(device == -1);
+
+	input->joy_connection_changed(p_id, false, "");
+	device_list[device].free();
+	device_list.remove(device);
+	attached_devices[p_id] = false;
+}
+
+static String _hex_str(uint8_t p_byte) {
+
+	static const char* dict = "0123456789abcdef";
+	char ret[3];
+	ret[2] = 0;
+
+	ret[0] = dict[p_byte>>4];
+	ret[1] = dict[p_byte & 0xF];
+
+	return ret;
+}
+
+bool JoystickOSX::configure_joystick(IOHIDDeviceRef p_device_ref, joystick* p_joy) {
+
+	CFTypeRef refCF = NULL;
+
+	p_joy->device_ref = p_device_ref;
+	/* get device name */
+	String name;
+	char c_name[256];
+	refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDProductKey));
+	if (!refCF) {
+		refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDManufacturerKey));
+	}
+	if ((!refCF) || (!CFStringGetCString((CFStringRef) refCF, c_name, sizeof (c_name), kCFStringEncodingUTF8))) {
+		name = "Unidentified Joystick";
+	}
+	name = c_name;
+
+	int id = get_free_joy_id();
+	ERR_FAIL_COND_V(id == -1, false);
+	p_joy->id = id;
+	int vendor = 0;
+	refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDVendorIDKey));
+	if (refCF) {
+		CFNumberGetValue((CFNumberRef)refCF, kCFNumberSInt32Type, &vendor);
+	}
+
+	int product_id = 0;
+	refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDProductIDKey));
+	if (refCF) {
+		CFNumberGetValue((CFNumberRef)refCF, kCFNumberSInt32Type, &product_id);
+	}
+	if (vendor && product_id) {
+		char uid[128];
+		sprintf(uid, "%04x%08x%04x%08x", OSSwapHostToBigInt32(vendor),0, OSSwapHostToBigInt32(product_id), 0);
+		input->joy_connection_changed(id, true, name, uid);
+	}
+	else {
+		//bluetooth device
+		String guid = "05000000";
+		for (int i = 0; i < 12; i++) {
+			if (i < name.size()) guid += _hex_str(name[i]);
+			else guid += "00";
+		}
+		input->joy_connection_changed(id, true, name, guid);
+	}
+
+	CFArrayRef array = NULL;
+	array = IOHIDDeviceCopyMatchingElements(p_device_ref, NULL, kIOHIDOptionsTypeNone);
+	if (array) {
+		p_joy->add_hid_elements(array);
+		CFRelease(array);
+	}
+	return true;
+}
+
+#define FF_ERR() { if (ret != FF_OK) { FFReleaseDevice(ff_device); return false; } }
+bool joystick::config_force_feedback(io_service_t p_service) {
+
+	HRESULT ret = FFCreateDevice(p_service, &ff_device);
+	ERR_FAIL_COND_V(ret != FF_OK, false);
+
+	ret = FFDeviceSendForceFeedbackCommand(ff_device, FFSFFC_RESET);
+	FF_ERR();
+
+	ret = FFDeviceSendForceFeedbackCommand(ff_device, FFSFFC_SETACTUATORSON);
+	FF_ERR();
+
+	if (check_ff_features()) {
+		ret = FFDeviceCreateEffect(ff_device, kFFEffectType_ConstantForce_ID, &ff_effect, &ff_object);
+		FF_ERR();
+		return true;
+	}
+	FFReleaseDevice(ff_device);
+	return false;
+}
+#undef FF_ERR
+
+#define TEST_FF(ff) (features.supportedEffects & (ff))
+bool joystick::check_ff_features() {
+
+	FFCAPABILITIES features;
+	HRESULT ret = FFDeviceGetForceFeedbackCapabilities(ff_device, &features);
+	if (ret == FF_OK && (features.supportedEffects & FFCAP_ET_CONSTANTFORCE)) {
+		uint32_t val;
+		ret = FFDeviceGetForceFeedbackProperty(ff_device, FFPROP_FFGAIN, &val, sizeof(val));
+		if (ret != FF_OK) return false;
+		int num_axes = features.numFfAxes;
+		ff_axes = (DWORD*) memalloc(sizeof(DWORD) * num_axes);
+		ff_directions = (LONG*) memalloc(sizeof(LONG) * num_axes);
+
+		for (int i = 0; i < num_axes; i++) {
+			ff_axes[i] = features.ffAxes[i];
+			ff_directions[i] = 0;
+		}
+
+		ff_effect.cAxes = num_axes;
+		ff_effect.rgdwAxes = ff_axes;
+		ff_effect.rglDirection = ff_directions;
+		return true;
+	}
+	return false;
+}
+
+static int process_hat_value(int p_min, int p_max, int p_value) {
+	int range = (p_max - p_min + 1);
+	int value = p_value - p_min;
+	int hat_value = InputDefault::HAT_MASK_CENTER;
+	if (range == 4) {
+		value *= 2;
+	}
+
+	switch (value) {
+	case 0:
+		hat_value = InputDefault::HAT_MASK_UP;
+		break;
+	case 1:
+		hat_value = InputDefault::HAT_MASK_UP | InputDefault::HAT_MASK_RIGHT;
+		break;
+	case 2:
+		hat_value = InputDefault::HAT_MASK_RIGHT;
+		break;
+	case 3:
+		hat_value = InputDefault::HAT_MASK_DOWN | InputDefault::HAT_MASK_RIGHT;
+		break;
+	case 4:
+		hat_value = InputDefault::HAT_MASK_DOWN;
+		break;
+	case 5:
+		hat_value = InputDefault::HAT_MASK_DOWN | InputDefault::HAT_MASK_LEFT;
+		break;
+	case 6:
+		hat_value = InputDefault::HAT_MASK_LEFT;
+		break;
+	case 7:
+		hat_value = InputDefault::HAT_MASK_UP | InputDefault::HAT_MASK_LEFT;
+		break;
+	default:
+		hat_value = InputDefault::HAT_MASK_CENTER;
+		break;
+	}
+	return hat_value;
+}
+
+void JoystickOSX::poll_joysticks() const {
+	while (CFRunLoopRunInMode(GODOT_JOY_LOOP_RUN_MODE,0,TRUE) == kCFRunLoopRunHandledSource) {
+		/* no-op. Pending callbacks will fire. */
+	}
+}
+
+static const InputDefault::JoyAxis axis_correct(int p_value, int p_min, int p_max) {
+	InputDefault::JoyAxis jx;
+	if (p_min < 0) {
+		jx.min = -1;
+		if (p_value < 0) {
+			jx.value = (float) -p_value / p_min;
+		}
+		else jx.value = (float) p_value / p_max;
+	}
+	if (p_min == 0) {
+		jx.min = 0;
+		jx.value = 0.0f + (float) p_value / p_max;
+	}
+	return jx;
+}
+
+uint32_t JoystickOSX::process_joysticks(uint32_t p_last_id){
+	poll_joysticks();
+
+	for (int i = 0; i < device_list.size(); i++) {
+		joystick &joy = device_list[i];
+
+		for (int j = 0; j < joy.axis_elements.size(); j++) {
+			rec_element &elem = joy.axis_elements[j];
+			int value = joy.get_hid_element_state(&elem);
+			p_last_id = input->joy_axis(p_last_id, joy.id, j, axis_correct(value, elem.min, elem.max));
+		}
+		for (int j = 0; j < joy.button_elements.size(); j++) {
+			int value = joy.get_hid_element_state(&joy.button_elements[j]);
+			p_last_id = input->joy_button(p_last_id, joy.id, j, (value>=1));
+		}
+		for (int j = 0; j < joy.hat_elements.size(); j++) {
+			rec_element &elem = joy.hat_elements[j];
+			int value = joy.get_hid_element_state(&elem);
+			int hat_value = process_hat_value(elem.min, elem.max, value);
+			p_last_id = input->joy_hat(p_last_id, joy.id, hat_value);
+		}
+
+		if (joy.ffservice) {
+			uint64_t timestamp = input->get_joy_vibration_timestamp(joy.id);
+			if (timestamp > joy.ff_timestamp) {
+				Vector2 strength = input->get_joy_vibration_strength(joy.id);
+				float duration = input->get_joy_vibration_duration(joy.id);
+				if (strength.x == 0 && strength.y == 0) {
+					joystick_vibration_stop(joy.id, timestamp);
+				}
+				else {
+					float gain = MAX(strength.x, strength.y);
+					joystick_vibration_start(joy.id, gain, duration, timestamp);
+				}
+			}
+		}
+	}
+	return p_last_id;
+}
+
+void JoystickOSX::joystick_vibration_start(int p_id, float p_magnitude, float p_duration, uint64_t p_timestamp) {
+	joystick *joy = &device_list[get_joy_index(p_id)];
+	joy->ff_timestamp = p_timestamp;
+	joy->ff_effect.dwDuration = p_duration * FF_SECONDS;
+	joy->ff_effect.dwGain = p_magnitude * FF_FFNOMINALMAX;
+	FFEffectSetParameters(joy->ff_object, &joy->ff_effect, FFEP_DURATION | FFEP_GAIN);
+	FFEffectStart(joy->ff_object, 1, 0);
+}
+
+void JoystickOSX::joystick_vibration_stop(int p_id, uint64_t p_timestamp) {
+	joystick* joy = &device_list[get_joy_index(p_id)];
+	joy->ff_timestamp = p_timestamp;
+	FFEffectStop(joy->ff_object);
+}
+
+int JoystickOSX::get_free_joy_id() {
+	for (int i = 0; i < JOYSTICKS_MAX; i++) {
+		if (!attached_devices[i]) {
+			attached_devices[i] = true;
+			return i;
+		}
+	}
+	return -1;
+}
+
+int JoystickOSX::get_joy_index(int p_id) const {
+	for (int i = 0; i < device_list.size(); i++) {
+		if (device_list[i].id == p_id) return i;
+	}
+	return -1;
+}
+
+bool JoystickOSX::have_device(IOHIDDeviceRef p_device) const {
+	for (int i = 0; i < device_list.size(); i++) {
+		if (device_list[i].device_ref == p_device) {
+			return true;
+		}
+	}
+	return false;
+}
+
+static CFDictionaryRef create_match_dictionary(const UInt32 page, const UInt32 usage, int *okay)
+{
+	CFDictionaryRef retval = NULL;
+	CFNumberRef pageNumRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &page);
+	CFNumberRef usageNumRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &usage);
+	const void *keys[2] = { (void *) CFSTR(kIOHIDDeviceUsagePageKey), (void *) CFSTR(kIOHIDDeviceUsageKey) };
+	const void *vals[2] = { (void *) pageNumRef, (void *) usageNumRef };
+
+	if (pageNumRef && usageNumRef) {
+		retval = CFDictionaryCreate(kCFAllocatorDefault, keys, vals, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+	}
+
+	if (pageNumRef) {
+		CFRelease(pageNumRef);
+	}
+	if (usageNumRef) {
+		CFRelease(usageNumRef);
+	}
+
+	if (!retval) {
+		*okay = 0;
+	}
+
+	return retval;
+}
+
+void JoystickOSX::config_hid_manager(CFArrayRef p_matching_array) const {
+
+	CFRunLoopRef runloop = CFRunLoopGetCurrent();
+	IOReturn ret = IOHIDManagerOpen(hid_manager, kIOHIDOptionsTypeNone);
+	ERR_FAIL_COND(ret != kIOReturnSuccess);
+
+	IOHIDManagerSetDeviceMatchingMultiple(hid_manager, p_matching_array);
+	IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, joystick_added_callback, NULL);
+	IOHIDManagerScheduleWithRunLoop(hid_manager, runloop, GODOT_JOY_LOOP_RUN_MODE);
+
+	while (CFRunLoopRunInMode(GODOT_JOY_LOOP_RUN_MODE,0,TRUE) == kCFRunLoopRunHandledSource) {
+		/* no-op. Callback fires once per existing device. */
+	}
+}
+
+JoystickOSX::JoystickOSX()
+{
+	self = this;
+	input = (InputDefault*)Input::get_singleton();
+
+	for (int i = 0; i < JOYSTICKS_MAX; i++) {
+		attached_devices[i] = false;
+	}
+
+	int okay = 1;
+	const void *vals[] = {
+		(void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick, &okay),
+		(void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad, &okay),
+		(void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_MultiAxisController, &okay),
+	};
+	const size_t n_elements = sizeof(vals)/sizeof(vals[0]);
+	CFArrayRef array = okay ? CFArrayCreate(kCFAllocatorDefault, vals, n_elements, &kCFTypeArrayCallBacks) : NULL;
+
+	for (int i = 0; i < n_elements; i++) {
+		if (vals[i]) {
+			CFRelease((CFTypeRef) vals[i]);
+		}
+	}
+
+	if (array) {
+		hid_manager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone);
+		if (hid_manager != NULL) {
+			config_hid_manager(array);
+		}
+		CFRelease(array);
+	}
+}
+
+JoystickOSX::~JoystickOSX() {
+
+	for (int i = 0; i < device_list.size(); i++) {
+		device_list[i].free();
+	}
+
+	IOHIDManagerUnscheduleFromRunLoop(hid_manager, CFRunLoopGetCurrent(), GODOT_JOY_LOOP_RUN_MODE);
+	IOHIDManagerClose(hid_manager, kIOHIDOptionsTypeNone);
+	CFRelease(hid_manager);
+	hid_manager = NULL;
+}
+
diff --git a/platform/osx/joystick_osx.h b/platform/osx/joystick_osx.h
new file mode 100644
index 000000000..38a4e3b1d
--- /dev/null
+++ b/platform/osx/joystick_osx.h
@@ -0,0 +1,125 @@
+/*************************************************************************/
+/*  joystick_osx.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 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       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#ifndef JOYSTICKOSX_H
+#define JOYSTICKOSX_H
+
+#ifdef MACOS_10_0_4
+#include <IOKit/hidsystem/IOHIDUsageTables.h>
+#else
+#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
+#endif
+#include <IOKit/hid/IOHIDLib.h>
+#include <ForceFeedback/ForceFeedback.h>
+#include <ForceFeedback/ForceFeedbackConstants.h>
+
+#include "main/input_default.h"
+
+struct rec_element {
+	IOHIDElementRef ref;
+	IOHIDElementCookie cookie;
+
+	uint32_t usage;
+
+	int min;
+	int max;
+
+	struct Comparator {
+		bool operator()(const rec_element p_a, const rec_element p_b) const { return p_a.usage < p_b.usage; }
+	};
+};
+
+struct joystick {
+	IOHIDDeviceRef device_ref;
+
+	Vector<rec_element> axis_elements;
+	Vector<rec_element> button_elements;
+	Vector<rec_element> hat_elements;
+
+	int id;
+
+	io_service_t ffservice;     /* Interface for force feedback, 0 = no ff */
+	FFCONSTANTFORCE ff_constant_force;
+	FFDeviceObjectReference ff_device;
+	FFEffectObjectReference ff_object;
+	uint64_t ff_timestamp;
+	LONG *ff_directions;
+	FFEFFECT ff_effect;
+	DWORD *ff_axes;
+
+	void add_hid_elements(CFArrayRef p_array);
+	void add_hid_element(IOHIDElementRef p_element);
+
+	bool has_element(IOHIDElementCookie p_cookie, Vector<rec_element> *p_list) const;
+	bool config_force_feedback(io_service_t p_service);
+	bool check_ff_features();
+
+	int get_hid_element_state(rec_element *p_element) const;
+
+	void free();
+	joystick();
+};
+
+class JoystickOSX {
+
+	enum {
+		JOYSTICKS_MAX = 16,
+	};
+
+private:
+	InputDefault *input;
+	IOHIDManagerRef hid_manager;
+
+	bool attached_devices[JOYSTICKS_MAX];
+	Vector<joystick> device_list;
+
+	bool have_device(IOHIDDeviceRef p_device) const;
+	bool configure_joystick(IOHIDDeviceRef p_device_ref, joystick *p_joy);
+
+
+	int get_free_joy_id();
+	int get_joy_index(int p_id) const;
+
+	void poll_joysticks() const;
+	void setup_joystick_objects();
+	void config_hid_manager(CFArrayRef p_matching_array) const;
+
+	void joystick_vibration_start(int p_id, float p_magnitude, float p_duration, uint64_t p_timestamp);
+	void joystick_vibration_stop(int p_id, uint64_t p_timestamp);
+
+public:
+	uint32_t process_joysticks(uint32_t p_last_id);
+
+	void _device_added(IOReturn p_res, IOHIDDeviceRef p_device);
+	void _device_removed(int p_id);
+
+	JoystickOSX();
+	~JoystickOSX();
+};
+
+#endif // JOYSTICKOSX_H
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index 8f89695a6..e23ae49a3 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -31,6 +31,7 @@
 
 
 #include "os/input.h"
+#include "joystick_osx.h"
 #include "drivers/unix/os_unix.h"
 #include "main/input_default.h"
 #include "servers/visual_server.h"
@@ -76,6 +77,7 @@ public:
 	SpatialSound2DServerSW *spatial_sound_2d_server;
 
 	InputDefault *input;
+	JoystickOSX *joystick_osx;
 
 	/* objc */
 
@@ -203,6 +205,7 @@ public:
 	virtual void set_window_maximized(bool p_enabled);
 	virtual bool is_window_maximized() const;
 	virtual void request_attention();
+	virtual String get_joy_guid(int p_device) const;
 
 	void run();
 
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index b084a08ec..cc893cc7a 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -1123,6 +1123,7 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 	physics_2d_server->init();
 
 	input = memnew( InputDefault );
+	joystick_osx = memnew( JoystickOSX );
 
 	_ensure_data_dir();
 
@@ -1165,7 +1166,7 @@ void OS_OSX::finalize() {
 	spatial_sound_2d_server->finish();
 	memdelete(spatial_sound_2d_server);
 
-
+	memdelete(joystick_osx);
 	memdelete(input);
 
 	memdelete(sample_manager);
@@ -1738,7 +1739,7 @@ void OS_OSX::run() {
 	while (!force_quit) {
 
 		process_events(); // get rid of pending events
-//		process_joysticks();
+		last_id = joystick_osx->process_joysticks(last_id);
 		if (Main::iteration()==true)
 			break;
 	};
@@ -1773,6 +1774,10 @@ OS::MouseMode OS_OSX::get_mouse_mode() const {
     return mouse_mode;
 }
 
+String OS_OSX::get_joy_guid(int p_device) const {
+	return input->get_joy_guid_remapped(p_device);
+}
+
 OS_OSX* OS_OSX::singleton=NULL;
 
 OS_OSX::OS_OSX() {
diff --git a/scene/3d/immediate_geometry.cpp b/scene/3d/immediate_geometry.cpp
index e83fa69b4..c9319904b 100644
--- a/scene/3d/immediate_geometry.cpp
+++ b/scene/3d/immediate_geometry.cpp
@@ -102,7 +102,7 @@ DVector<Face3> ImmediateGeometry::get_faces(uint32_t p_usage_flags) const {
 
 
 
-void ImmediateGeometry::add_sphere(int p_lats,int p_lons,float p_radius) {
+void ImmediateGeometry::add_sphere(int p_lats, int p_lons, float p_radius, bool p_add_uv) {
 
 	for(int i = 1; i <= p_lats; i++) {
 		double lat0 = Math_PI * (-0.5 + (double) (i - 1) / p_lats);
@@ -132,6 +132,10 @@ void ImmediateGeometry::add_sphere(int p_lats,int p_lons,float p_radius) {
 			};
 
 #define ADD_POINT(m_idx)\
+	if (p_add_uv) {\
+		set_uv(Vector2(Math::atan2(v[m_idx].x,v[m_idx].z)/Math_PI * 0.5+0.5,v[m_idx].y*0.5+0.5));\
+		set_tangent(Plane(Vector3(-v[m_idx].z,v[m_idx].y,v[m_idx].x),1));		\
+	}\
 	set_normal(v[m_idx]);\
 	add_vertex(v[m_idx]*p_radius);
 
@@ -156,7 +160,7 @@ void ImmediateGeometry::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_uv","uv"),&ImmediateGeometry::set_uv);
 	ObjectTypeDB::bind_method(_MD("set_uv2","uv"),&ImmediateGeometry::set_uv2);
 	ObjectTypeDB::bind_method(_MD("add_vertex","pos"),&ImmediateGeometry::add_vertex);
-	ObjectTypeDB::bind_method(_MD("add_sphere","lats","lons","radius"),&ImmediateGeometry::add_sphere);
+	ObjectTypeDB::bind_method(_MD("add_sphere","lats","lons","radius","add_uv"),&ImmediateGeometry::add_sphere,DEFVAL(true));
 	ObjectTypeDB::bind_method(_MD("end"),&ImmediateGeometry::end);
 	ObjectTypeDB::bind_method(_MD("clear"),&ImmediateGeometry::clear);
 
diff --git a/scene/3d/immediate_geometry.h b/scene/3d/immediate_geometry.h
index c1cc4f87d..fc7f4de63 100644
--- a/scene/3d/immediate_geometry.h
+++ b/scene/3d/immediate_geometry.h
@@ -62,7 +62,7 @@ public:
 	void clear();
 
 
-	void add_sphere(int p_lats,int p_lons,float p_radius);
+	void add_sphere(int p_lats,int p_lons,float p_radius,bool p_add_uv=true);
 
 
 
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index 4dbc10683..93e46da82 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -399,8 +399,6 @@ AcceptDialog::AcceptDialog() {
 	add_child(label);
 
 	hbc = memnew( HBoxContainer );
-	hbc->set_area_as_parent_rect(margin);
-	hbc->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,button_margin);
 	add_child(hbc);
 
 	hbc->add_spacer();
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index 8b03dbbc2..0de6add8c 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -360,7 +360,8 @@ bool GraphEdit::_filter_input(const Point2& p_point) {
 
 	Ref<Texture> port =get_icon("port","GraphNode");
 
-	float grab_r=port->get_width()*0.5;
+	float grab_r_extend = 2.0;
+	float grab_r=port->get_width()*0.5*grab_r_extend;
 	for(int i=get_child_count()-1;i>=0;i--) {
 
 		GraphNode *gn=get_child(i)->cast_to<GraphNode>();
@@ -379,8 +380,9 @@ bool GraphEdit::_filter_input(const Point2& p_point) {
 		for(int j=0;j<gn->get_connection_input_count();j++) {
 
 			Vector2 pos = gn->get_connection_input_pos(j)+gn->get_pos();
-			if (pos.distance_to(p_point)<grab_r)
+			if (pos.distance_to(p_point)<grab_r) {
 				return true;
+			}
 
 
 		}
@@ -392,11 +394,13 @@ bool GraphEdit::_filter_input(const Point2& p_point) {
 
 void GraphEdit::_top_layer_input(const InputEvent& p_ev) {
 
+
+	float grab_r_extend = 2.0;
 	if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.button_index==BUTTON_LEFT && p_ev.mouse_button.pressed) {
 
 		Ref<Texture> port =get_icon("port","GraphNode");
 		Vector2 mpos(p_ev.mouse_button.x,p_ev.mouse_button.y);
-		float grab_r=port->get_width()*0.5;
+		float grab_r=port->get_width()*0.5*grab_r_extend;
 		for(int i=get_child_count()-1;i>=0;i--) {
 
 			GraphNode *gn=get_child(i)->cast_to<GraphNode>();
@@ -517,7 +521,7 @@ void GraphEdit::_top_layer_input(const InputEvent& p_ev) {
 
 		Ref<Texture> port =get_icon("port","GraphNode");
 		Vector2 mpos(p_ev.mouse_button.x,p_ev.mouse_button.y);
-		float grab_r=port->get_width()*0.5;
+		float grab_r=port->get_width()*0.5*grab_r_extend;
 		for(int i=get_child_count()-1;i>=0;i--) {
 
 			GraphNode *gn=get_child(i)->cast_to<GraphNode>();
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index 105d91933..63902ef81 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -40,6 +40,7 @@ void ItemList::add_item(const String& p_item,const Ref<Texture>& p_texture,bool
 	item.selectable=p_selectable;
 	item.selected=false;
 	item.disabled=false;
+	item.tooltip_enabled=true;
 	item.custom_bg=Color(0,0,0,0);
 	items.push_back(item);
 
@@ -57,6 +58,7 @@ void ItemList::add_icon_item(const Ref<Texture>& p_item,bool p_selectable){
 	item.selectable=p_selectable;
 	item.selected=false;
 	item.disabled=false;
+	item.tooltip_enabled=true;
 	item.custom_bg=Color(0,0,0,0);
 	items.push_back(item);
 
@@ -82,6 +84,16 @@ String ItemList::get_item_text(int p_idx) const{
 
 }
 
+void ItemList::set_item_tooltip_enabled(int p_idx, const bool p_enabled) {
+	ERR_FAIL_INDEX(p_idx,items.size());
+	items[p_idx].tooltip_enabled = p_enabled;
+}
+
+bool ItemList::is_item_tooltip_enabled(int p_idx) const {
+	ERR_FAIL_INDEX_V(p_idx,items.size(), false);
+	return items[p_idx].tooltip_enabled;
+}
+
 void ItemList::set_item_tooltip(int p_idx,const String& p_tooltip){
 
 	ERR_FAIL_INDEX(p_idx,items.size());
@@ -1198,6 +1210,9 @@ String ItemList::get_tooltip(const Point2& p_pos) const {
 	int closest = get_item_at_pos(p_pos);
 
 	if (closest!=-1) {
+		if (!items[closest].tooltip_enabled) {
+			return "";
+		}
 		if (items[closest].tooltip!="") {
 			return items[closest].tooltip;
 		}
@@ -1294,6 +1309,9 @@ void ItemList::_bind_methods(){
 	ObjectTypeDB::bind_method(_MD("set_item_custom_bg_color","idx","custom_bg_color"),&ItemList::set_item_custom_bg_color);
 	ObjectTypeDB::bind_method(_MD("get_item_custom_bg_color","idx"),&ItemList::get_item_custom_bg_color);
 
+	ObjectTypeDB::bind_method(_MD("set_item_tooltip_enabled","idx","enable"),&ItemList::set_item_tooltip_enabled);
+	ObjectTypeDB::bind_method(_MD("is_item_tooltip_enabled","idx"),&ItemList::is_item_tooltip_enabled);
+
 	ObjectTypeDB::bind_method(_MD("set_item_tooltip","idx","tooltip"),&ItemList::set_item_tooltip);
 	ObjectTypeDB::bind_method(_MD("get_item_tooltip","idx"),&ItemList::get_item_tooltip);
 
diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h
index e1902d1c1..91c74b529 100644
--- a/scene/gui/item_list.h
+++ b/scene/gui/item_list.h
@@ -56,6 +56,7 @@ private:
 		bool selectable;
 		bool selected;
 		bool disabled;
+		bool tooltip_enabled;
 		Variant metadata;
 		String tooltip;
 		Color custom_bg;
@@ -135,6 +136,9 @@ public:
 	void set_item_tag_icon(int p_idx,const Ref<Texture>& p_tag_icon);
 	Ref<Texture> get_item_tag_icon(int p_idx) const;
 
+	void set_item_tooltip_enabled(int p_idx, const bool p_enabled);
+	bool is_item_tooltip_enabled(int p_idx) const;
+
 	void set_item_tooltip(int p_idx,const String& p_tooltip);
 	String get_item_tooltip(int p_idx) const;
 
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 778e4cfa2..90a8af923 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -193,8 +193,8 @@ void LineEdit::_input_event(InputEvent p_event) {
 							}
 
 							set_cursor_pos(0);
-							emit_signal("text_changed",text);
-							_change_notify("text");
+							_text_changed();
+
 						}
 
 
@@ -215,8 +215,7 @@ void LineEdit::_input_event(InputEvent p_event) {
 							selection_clear();
 							undo_text = text;
 							text = text.substr(0,cursor_pos);
-							emit_signal("text_changed",text);
-							_change_notify("text");
+							_text_changed();
 						}
 
 					} break;
@@ -475,9 +474,7 @@ void LineEdit::_input_event(InputEvent p_event) {
 							selection_delete();
 							CharType ucodestr[2]={(CharType)k.unicode,0};
 							append_at_cursor(ucodestr);
-							emit_signal("text_changed",text);
-							_change_notify("text");
-
+							_text_changed();
 							accept_event();
 						}
 
@@ -725,8 +722,7 @@ void LineEdit::paste_text() {
 		if(selection.enabled) selection_delete();
 		append_at_cursor(paste_buffer);
 
-		emit_signal("text_changed",text);
-		_change_notify("text");
+		_text_changed();
 	}
 
 
@@ -750,9 +746,7 @@ void LineEdit::undo() {
 		set_cursor_pos(old_cursor_pos);
 	}
 
-	emit_signal("text_changed",text);
-	_change_notify("text");
-
+	_text_changed();
 }
 
 void LineEdit::shift_selection_check_pre(bool p_shift) {
@@ -881,8 +875,7 @@ void LineEdit::delete_char() {
 	//	set_window_pos(cursor_pos-get_window_length());
 	}
 
-	emit_signal("text_changed",text);
-	_change_notify("text");
+	_text_changed();
 }
 
 void LineEdit::delete_text(int p_from_column, int p_to_column) {
@@ -914,8 +907,7 @@ void LineEdit::delete_text(int p_from_column, int p_to_column) {
 		window_pos=cursor_pos;
 	}
 
-	emit_signal("text_changed",text);
-	_change_notify("text");
+	_text_changed();
 }
 
 void LineEdit::set_text(String p_text) {
@@ -930,8 +922,7 @@ void LineEdit::set_text(String p_text) {
 void LineEdit::clear() {
 
 	clear_internal();
-	emit_signal("text_changed",text);
-	_change_notify("text");
+	_text_changed();
 }
 
 String LineEdit::get_text() const {
@@ -1070,7 +1061,17 @@ Size2 LineEdit::get_minimum_size() const {
 
 	Size2 min=style->get_minimum_size();
 	min.height+=font->get_height();
-	min.width+=get_constant("minimum_spaces")*font->get_char_size(' ').x;
+
+	//minimum size of text
+	int space_size = font->get_char_size(' ').x;
+	int mstext = get_constant("minimum_spaces")*space_size;
+
+	if (expand_to_text_length) {
+		mstext=MAX(mstext,font->get_string_size(text).x+space_size); //add a spce because some fonts are too exact
+	}
+
+	min.width+=mstext;
+
 	return min;
 }
 
@@ -1226,6 +1227,29 @@ PopupMenu *LineEdit::get_menu() const {
 	}
 #endif
 
+
+void LineEdit::set_expand_to_text_length(bool p_enabled) {
+
+	expand_to_text_length = p_enabled;
+	minimum_size_changed();
+}
+
+bool LineEdit::get_expand_to_text_length() const{
+
+	return expand_to_text_length;
+}
+
+
+void LineEdit::_text_changed() {
+
+	if (expand_to_text_length)
+		minimum_size_changed();
+
+	emit_signal("text_changed",text);
+	_change_notify("text");
+
+}
+
 void LineEdit::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_toggle_draw_caret"),&LineEdit::_toggle_draw_caret);
@@ -1248,7 +1272,9 @@ void LineEdit::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_placeholder_alpha"),&LineEdit::get_placeholder_alpha);
 	ObjectTypeDB::bind_method(_MD("set_cursor_pos","pos"),&LineEdit::set_cursor_pos);
 	ObjectTypeDB::bind_method(_MD("get_cursor_pos"),&LineEdit::get_cursor_pos);
-	ObjectTypeDB::bind_method(_MD("cursor_set_blink_enabled", "enable"),&LineEdit::cursor_set_blink_enabled);
+	ObjectTypeDB::bind_method(_MD("set_expand_to_text_length","enabled"),&LineEdit::set_expand_to_text_length);
+	ObjectTypeDB::bind_method(_MD("get_expand_to_text_length"),&LineEdit::get_expand_to_text_length);
+	ObjectTypeDB::bind_method(_MD("cursor_set_blink_enabled", "enabled"),&LineEdit::cursor_set_blink_enabled);
 	ObjectTypeDB::bind_method(_MD("cursor_get_blink_enabled"),&LineEdit::cursor_get_blink_enabled);
 	ObjectTypeDB::bind_method(_MD("cursor_set_blink_speed", "blink_speed"),&LineEdit::cursor_set_blink_speed);
 	ObjectTypeDB::bind_method(_MD("cursor_get_blink_speed"),&LineEdit::cursor_get_blink_speed);
@@ -1286,6 +1312,7 @@ void LineEdit::_bind_methods() {
 	ADD_PROPERTYNZ( PropertyInfo( Variant::INT, "max_length" ), _SCS("set_max_length"),_SCS("get_max_length") );
 	ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "editable" ), _SCS("set_editable"),_SCS("is_editable") );
 	ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "secret" ), _SCS("set_secret"),_SCS("is_secret") );
+	ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "expand_to_len" ), _SCS("set_expand_to_text_length"),_SCS("get_expand_to_text_length") );
 	ADD_PROPERTY( PropertyInfo( Variant::INT,"focus_mode", PROPERTY_HINT_ENUM, "None,Click,All" ), _SCS("set_focus_mode"), _SCS("get_focus_mode") );
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret/caret_blink"), _SCS("cursor_set_blink_enabled"), _SCS("cursor_get_blink_enabled"));;
 	ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "caret/caret_blink_speed",PROPERTY_HINT_RANGE,"0.1,10,0.1"), _SCS("cursor_set_blink_speed"),_SCS("cursor_get_blink_speed") );
@@ -1327,7 +1354,7 @@ LineEdit::LineEdit() {
 	menu->add_separator();
 	menu->add_item(TTR("Undo"),MENU_UNDO,KEY_MASK_CMD|KEY_Z);
 	menu->connect("item_pressed",this,"menu_option");
-
+	expand_to_text_length=false;
 
 
 }
diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h
index 112e4ad55..47d5706bb 100644
--- a/scene/gui/line_edit.h
+++ b/scene/gui/line_edit.h
@@ -90,6 +90,11 @@ private:
 	} selection;
 
 	Timer *caret_blink_timer;
+
+
+	void _text_changed();
+	bool expand_to_text_length;
+
 	bool caret_blink_enabled;
 	bool draw_caret;
 	bool window_has_focus;
@@ -169,6 +174,9 @@ public:
 
 	virtual Size2 get_minimum_size() const;
 
+	void set_expand_to_text_length(bool p_len);
+	bool get_expand_to_text_length() const;
+
 	virtual bool is_text_field() const;
 	LineEdit();
 	~LineEdit();
diff --git a/scene/gui/texture_progress.cpp b/scene/gui/texture_progress.cpp
index 923a35031..2c576b6ba 100644
--- a/scene/gui/texture_progress.cpp
+++ b/scene/gui/texture_progress.cpp
@@ -297,6 +297,7 @@ void TextureProgress::_bind_methods() {
 TextureProgress::TextureProgress()
 {
 	mode=FILL_LEFT_TO_RIGHT;
+	rad_init_angle=0;
 	rad_center_off=Point2();
 	rad_max_degrees=360;
 }
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 086b69c1c..189224042 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -2903,16 +2903,16 @@ void Node::_bind_methods() {
 
 
 		mi.name="rpc";
-		ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"rpc",&Node::_rpc_bind,mi);
+		ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"rpc",&Node::_rpc_bind,mi);
 		mi.name="rpc_unreliable";
-		ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"rpc_unreliable",&Node::_rpc_unreliable_bind,mi);
+		ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"rpc_unreliable",&Node::_rpc_unreliable_bind,mi);
 
-		mi.arguments.push_front( PropertyInfo( Variant::INT, "peer_") );
+		mi.arguments.push_front( PropertyInfo( Variant::INT, "peer_id") );
 
 		mi.name="rpc_id";
-		ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"rpc_id",&Node::_rpc_id_bind,mi);
+		ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"rpc_id",&Node::_rpc_id_bind,mi);
 		mi.name="rpc_unreliable_id";
-		ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"rpc_unreliable_id",&Node::_rpc_unreliable_id_bind,mi);
+		ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"rpc_unreliable_id",&Node::_rpc_unreliable_id_bind,mi);
 
 
 	}
diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp
index 4c7b7c139..e3472c074 100644
--- a/scene/main/scene_main_loop.cpp
+++ b/scene/main/scene_main_loop.cpp
@@ -2200,13 +2200,9 @@ void SceneTree::_bind_methods() {
 	mi.arguments.push_back( PropertyInfo( Variant::INT, "flags"));
 	mi.arguments.push_back( PropertyInfo( Variant::STRING, "group"));
 	mi.arguments.push_back( PropertyInfo( Variant::STRING, "method"));
-	Vector<Variant> defargs;
-	for(int i=0;i<VARIANT_ARG_MAX;i++) {
-		mi.arguments.push_back( PropertyInfo( Variant::NIL, "arg"+itos(i)));
-		defargs.push_back(Variant());
-	}
 
-	ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"call_group",&SceneTree::_call_group,mi,defargs);
+
+	ObjectTypeDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"call_group",&SceneTree::_call_group,mi);
 
 	ObjectTypeDB::bind_method(_MD("set_current_scene","child_node:Node"),&SceneTree::set_current_scene);
 	ObjectTypeDB::bind_method(_MD("get_current_scene:Node"),&SceneTree::get_current_scene);
diff --git a/tools/SCsub b/tools/SCsub
index f6c14a13f..aaebab724 100644
--- a/tools/SCsub
+++ b/tools/SCsub
@@ -115,10 +115,7 @@ if (env["tools"]!="no"):
 	env.Command('#tools/editor/builtin_fonts.h',flist,make_fonts_header)
 
 	SConscript('editor/SCsub');
-	#SConscript('scintilla/SCsub');
 	SConscript('collada/SCsub');
-	SConscript('docdump/SCsub');
-	#SConscript('freetype/SCsub');
 	SConscript('doc/SCsub')
 	SConscript('pck/SCsub')
 
diff --git a/tools/addheader/files b/tools/addheader/files
deleted file mode 100644
index 7b0968236..000000000
--- a/tools/addheader/files
+++ /dev/null
@@ -1,158 +0,0 @@
-./scene/*.h
-./scene/*.cpp
-./scene/io/*.h
-./scene/io/*.cpp
-./scene/main/*.h
-./scene/main/*.cpp
-./scene/resources/*.h
-./scene/resources/*.cpp
-./scene/gui/*.h
-./scene/gui/*.cpp
-./scene/audio/*.h
-./scene/audio/*.cpp
-./scene/3d/*.h
-./scene/3d/*.cpp
-./scene/2d/*.h
-./scene/2d/*.cpp
-./scene/animation/*.h
-./scene/animation/*.cpp
-./bin/tests/*.h
-./bin/tests/*.cpp
-./main/*.h
-./main/*.cpp
-./modules/gridmap/*.h
-./modules/gridmap/*.cpp
-./servers/*.h
-./servers/*.cpp
-./servers/physics_2d/*.h
-./servers/physics_2d/*.cpp
-./servers/physics/*.h
-./servers/physics/*.cpp
-./servers/visual/*.h
-./servers/visual/*.cpp
-./servers/spatial_sound_2d/*.h
-./servers/spatial_sound_2d/*.cpp
-./servers/audio/*.h
-./servers/audio/*.cpp
-./tools/doc/doc_data.h
-./tools/doc/doc_data.cpp
-./tools/collada/collada.h
-./tools/collada/collada.cpp
-./tools/editor/*.h
-./tools/editor/*.cpp
-./tools/editor/plugins/*.h
-./tools/editor/plugins/*.cpp
-./tools/editor/io_plugins/*.h
-./tools/editor/io_plugins/*.cpp
-./tools/docdump/doc_dump.h
-./tools/docdump/doc_dump.cpp
-./core/*.h
-./core/*.cpp
-./core/io/object_format_binary.h
-./core/io/file_access_buffered_fa.h
-./core/io/file_access_buffered.h
-./core/io/resource_saver.h
-./core/io/file_access_compressed.cpp
-./core/io/object_format_xml.cpp
-./core/io/http_client.h
-./core/io/object_format_xml.h
-./core/io/compression.h
-./core/io/ip_address.h
-./core/io/file_access_pack.h
-./core/io/ip.h
-./core/io/tcp_server.h
-./core/io/tcp_server.cpp
-./core/io/packet_peer.cpp
-./core/io/marshalls.h
-./core/io/stream_peer.cpp
-./core/io/resource_loader.cpp
-./core/io/stream_peer_tcp.h
-./core/io/stream_peer_tcp.cpp
-./core/io/translation_loader_po.h
-./core/io/zip_io.h
-./core/io/ip_address.cpp
-./core/io/object_saver_base.cpp
-./core/io/object_loader.cpp
-./core/io/xml_parser.h
-./core/io/file_access_network.cpp
-./core/io/resource_loader.h
-./core/io/packet_peer.h
-./core/io/stream_peer.h
-./core/io/marshalls.cpp
-./core/io/config_file.h
-./core/io/ip.cpp
-./core/io/file_access_zip.cpp
-./core/io/resource_format_binary.h
-./core/io/image_loader.h
-./core/io/file_access_zip.h
-./core/io/http_client.cpp
-./core/io/file_access_memory.h
-./core/io/xml_parser.cpp
-./core/io/object_saver_base.h
-./core/io/object_saver.cpp
-./core/io/compression.cpp
-./core/io/resource_format_xml.cpp
-./core/io/object_format_binary.cpp
-./core/io/file_access_compressed.h
-./core/io/json.h
-./core/io/file_access_pack.cpp
-./core/io/resource_format_binary.cpp
-./core/io/object_loader.h
-./core/io/object_saver.h
-./core/io/json.cpp
-./core/io/file_access_network.h
-./core/io/resource_saver.cpp
-./core/io/file_access_memory.cpp
-./core/io/image_loader.cpp
-./core/io/resource_format_xml.h
-./core/io/file_access_buffered.cpp
-./core/io/config_file.cpp
-./core/io/translation_loader_po.cpp
-./core/os/*.h
-./core/os/*.cpp
-./core/math/*.h
-./core/math/*.cpp
-./script/gdscript/*.h
-./script/gdscript/*.cpp
-./script/multiscript/multi_script.cpp
-./script/multiscript/multi_script.h
-./script/register_script_types.h
-./platform/android/*.h
-./platform/android/*.cpp
-./platform/android/java/src/com/android/godot/*.java
-./platform/server/*.h
-./platform/server/*.cpp
-./platform/bb10/*.h
-./platform/bb10/*.cpp
-./platform/javascript/*.h
-./platform/javascript/*.cpp
-./platform/javascript/export/export.h
-./platform/javascript/export/export.cpp
-./platform/iphone/*.h
-./platform/iphone/*.cpp
-./platform/iphone/*.mm
-./platform/windows/*.h
-./platform/windows/*.cpp
-./platform/osx/*.h
-./platform/osx/*.cpp
-./platform/osx/*.mm
-./platform/x11/*.h
-./platform/x11/*.cpp
-./drivers/unix/*.h
-./drivers/unix/*.cpp
-./drivers/gles2/*.h
-./drivers/gles2/*.cpp
-./drivers/chibi/*.h
-./drivers/chibi/*.cpp
-./drivers/png/resource_saver_png.cpp
-./drivers/png/image_loader_png.cpp
-./drivers/png/image_loader_png.h
-./drivers/vorbis/audio_stream_ogg_vorbis.h
-./drivers/vorbis/audio_stream_ogg_vorbis.cpp
-./drivers/gl_context/context_gl.h
-./drivers/gles1/*.h
-./drivers/gles1/*.cpp
-./drivers/windows/*.h
-./drivers/windows/*.cpp
-./drivers/alsa/audio_driver_alsa.h
-./drivers/alsa/audio_driver_alsa.cpp
diff --git a/tools/addheader/header.txt b/tools/addheader/header.txt
deleted file mode 100644
index e4efb2dcf..000000000
--- a/tools/addheader/header.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/*************************************************/
-/*  $filename                                    */
-/*************************************************/
-/*            This file is part of:              */
-/*                GODOT ENGINE                   */
-/*************************************************/
-/*       Source code within this file is:        */
-/*  (c) 2007-2016 Juan Linietsky, Ariel Manzur   */
-/*             All Rights Reserved.              */
-/*************************************************/
-
-
diff --git a/tools/buildstuff/zlib_freetype231_jpeg_libpng-bin-win32-vs81.zip b/tools/buildstuff/zlib_freetype231_jpeg_libpng-bin-win32-vs81.zip
deleted file mode 100644
index 4adf30ea2..000000000
--- a/tools/buildstuff/zlib_freetype231_jpeg_libpng-bin-win32-vs81.zip
+++ /dev/null
diff --git a/tools/docker/Dockerfile b/tools/dist/docker/Dockerfile
index 428de9d1a..428de9d1a 100644
--- a/tools/docker/Dockerfile
+++ b/tools/dist/docker/Dockerfile
diff --git a/tools/docker/README.md b/tools/dist/docker/README.md
index 7f10b46ad..7f10b46ad 100644
--- a/tools/docker/README.md
+++ b/tools/dist/docker/README.md
diff --git a/tools/docker/scripts/install-android-tools b/tools/dist/docker/scripts/install-android-tools
index 8a617d994..8a617d994 100644
--- a/tools/docker/scripts/install-android-tools
+++ b/tools/dist/docker/scripts/install-android-tools
diff --git a/tools/html_fs/godot.html b/tools/dist/html_fs/godot.html
index c354826e1..c354826e1 100644
--- a/tools/html_fs/godot.html
+++ b/tools/dist/html_fs/godot.html
diff --git a/tools/html_fs/godotfs.js b/tools/dist/html_fs/godotfs.js
index 2c59344cf..2c59344cf 100644
--- a/tools/html_fs/godotfs.js
+++ b/tools/dist/html_fs/godotfs.js
diff --git a/platform/iphone/xcode/godot_xcode/data.pck b/tools/dist/ios_xcode/godot_xcode/data.pck
index e69de29bb..e69de29bb 100644
--- a/platform/iphone/xcode/godot_xcode/data.pck
+++ b/tools/dist/ios_xcode/godot_xcode/data.pck
diff --git a/platform/iphone/xcode/godot_xcode/godot_debug.iphone b/tools/dist/ios_xcode/godot_xcode/godot_debug.iphone
index e69de29bb..e69de29bb 100755
--- a/platform/iphone/xcode/godot_xcode/godot_debug.iphone
+++ b/tools/dist/ios_xcode/godot_xcode/godot_debug.iphone
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios.xcodeproj/project.pbxproj b/tools/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.pbxproj
index bdba8488c..bdba8488c 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios.xcodeproj/project.pbxproj
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.pbxproj
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tools/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 3c9ba38bb..3c9ba38bb 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png
index 1d5e47266..1d5e47266 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-667h.png
index b13a399c8..b13a399c8 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-667h.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h@2x.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-667h@2x.png
index b51598fed..b51598fed 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h@2x.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-667h@2x.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-736h.png
index 8c44edbcc..8c44edbcc 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-736h.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h@3x.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-736h@3x.png
index 33847ac13..33847ac13 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h@3x.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-736h@3x.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape-736h.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape-736h.png
index 2a025b745..2a025b745 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape-736h.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape-736h.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png
index 7099f3e18..7099f3e18 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png
index 4a761c339..4a761c339 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png
index b09cf2118..b09cf2118 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png
index fa698eb70..fa698eb70 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default@2x~iphone.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default@2x~iphone.png
index ddf2861f4..ddf2861f4 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default@2x~iphone.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default@2x~iphone.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default~iphone.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default~iphone.png
index c485a33b0..c485a33b0 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default~iphone.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Default~iphone.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Contents.json b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Contents.json
index a458b6787..a458b6787 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png
index 165f4423b..165f4423b 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png
index 2e205e920..2e205e920 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png
index 6245f83f4..6245f83f4 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png
index 7b24e01bc..7b24e01bc 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png
index 344b470fa..344b470fa 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png
index 0dcebbc3f..0dcebbc3f 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png
index 9ae94e9aa..9ae94e9aa 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png
index 569f24df9..569f24df9 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png
index 9e69ed312..9e69ed312 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png
index b970fa306..b970fa306 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png
index 6097a6c73..6097a6c73 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png
index 21b9622eb..21b9622eb 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png
index 34dea8e6a..34dea8e6a 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png
index f72eb0b34..f72eb0b34 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png
index 793c9b1f5..793c9b1f5 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png
index 7cd0e054a..7cd0e054a 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png
index e9b242975..e9b242975 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/sizes b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/sizes
index e328a62cb..e328a62cb 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/sizes
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/sizes
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/en.lproj/InfoPlist.strings b/tools/dist/ios_xcode/godot_xcode/godot_ios/en.lproj/InfoPlist.strings
index 477b28ff8..477b28ff8 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/en.lproj/InfoPlist.strings
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/en.lproj/InfoPlist.strings
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/godot_ios-Info.plist b/tools/dist/ios_xcode/godot_xcode/godot_ios/godot_ios-Info.plist
index f97b0fca3..f97b0fca3 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/godot_ios-Info.plist
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/godot_ios-Info.plist
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/main.m b/tools/dist/ios_xcode/godot_xcode/godot_ios/main.m
index 3e4ea5e12..3e4ea5e12 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/main.m
+++ b/tools/dist/ios_xcode/godot_xcode/godot_ios/main.m
diff --git a/platform/iphone/xcode/godot_xcode/godot_opt.iphone b/tools/dist/ios_xcode/godot_xcode/godot_opt.iphone
index e69de29bb..e69de29bb 100755
--- a/platform/iphone/xcode/godot_xcode/godot_opt.iphone
+++ b/tools/dist/ios_xcode/godot_xcode/godot_opt.iphone
diff --git a/tools/osx_template.app/Contents/Info.plist b/tools/dist/osx_template.app/Contents/Info.plist
index 5146c875b..5146c875b 100755
--- a/tools/osx_template.app/Contents/Info.plist
+++ b/tools/dist/osx_template.app/Contents/Info.plist
diff --git a/tools/Godot.app/Contents/PkgInfo b/tools/dist/osx_template.app/Contents/PkgInfo
index 6f749b0f3..6f749b0f3 100644
--- a/tools/Godot.app/Contents/PkgInfo
+++ b/tools/dist/osx_template.app/Contents/PkgInfo
diff --git a/tools/osx_template.app/Contents/Resources/icon.icns b/tools/dist/osx_template.app/Contents/Resources/icon.icns
index 375f61437..375f61437 100644
--- a/tools/osx_template.app/Contents/Resources/icon.icns
+++ b/tools/dist/osx_template.app/Contents/Resources/icon.icns
diff --git a/tools/Godot.app/Contents/Info.plist b/tools/dist/osx_tools.app/Contents/Info.plist
index 2a3e72713..2a3e72713 100755
--- a/tools/Godot.app/Contents/Info.plist
+++ b/tools/dist/osx_tools.app/Contents/Info.plist
diff --git a/tools/osx_template.app/Contents/PkgInfo b/tools/dist/osx_tools.app/Contents/PkgInfo
index 6f749b0f3..6f749b0f3 100644
--- a/tools/osx_template.app/Contents/PkgInfo
+++ b/tools/dist/osx_tools.app/Contents/PkgInfo
diff --git a/tools/Godot.app/Contents/Resources/Godot.icns b/tools/dist/osx_tools.app/Contents/Resources/Godot.icns
index 375f61437..375f61437 100644
--- a/tools/Godot.app/Contents/Resources/Godot.icns
+++ b/tools/dist/osx_tools.app/Contents/Resources/Godot.icns
diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp
index 479b99a03..4a8fdfb21 100644
--- a/tools/doc/doc_data.cpp
+++ b/tools/doc/doc_data.cpp
@@ -198,6 +198,11 @@ void DocData::generate(bool p_basic_types) {
 				if (method.qualifiers!="")
 					method.qualifiers+=" ";
 				method.qualifiers+="const";
+
+			} else if (E->get().flags&METHOD_FLAG_VARARG) {
+				if (method.qualifiers!="")
+					method.qualifiers+=" ";
+				method.qualifiers+="vararg";
 			}
 
 			for(int i=-1;i<E->get().arguments.size();i++) {
diff --git a/tools/docdump/doc_dump.cpp b/tools/doc/doc_dump.cpp
index fbf13f9e8..fbf13f9e8 100644
--- a/tools/docdump/doc_dump.cpp
+++ b/tools/doc/doc_dump.cpp
diff --git a/tools/docdump/doc_dump.h b/tools/doc/doc_dump.h
index 372f5e096..372f5e096 100644
--- a/tools/docdump/doc_dump.h
+++ b/tools/doc/doc_dump.h
diff --git a/tools/docdump/SCsub b/tools/docdump/SCsub
deleted file mode 100644
index 34524f10e..000000000
--- a/tools/docdump/SCsub
+++ /dev/null
@@ -1,5 +0,0 @@
-Import('env')
-
-env.add_source_files(env.tool_sources,"*.cpp")
-
-Export('env')
diff --git a/tools/editor/editor_dir_dialog.cpp b/tools/editor/editor_dir_dialog.cpp
index f6ce7bf3f..cf0732501 100644
--- a/tools/editor/editor_dir_dialog.cpp
+++ b/tools/editor/editor_dir_dialog.cpp
@@ -143,7 +143,7 @@ void EditorDirDialog::set_current_path(const String& p_path) {
 	reload();
 	String p = p_path;
 	if (p.begins_with("res://"))
-		p.replace_first("res://","");
+		p = p.replace_first("res://","");
 
 	Vector<String> dirs = p.split("/");
 
@@ -162,13 +162,13 @@ void EditorDirDialog::set_current_path(const String& p_path) {
 		ERR_FAIL_COND(!p);
 		String pp = p->get_metadata(0);
 		if (pp=="") {
+			p->set_metadata(0,String(r->get_metadata(0)).plus_file(d));
 			_update_dir(p);
-			updating=true;
-			p->set_collapsed(false);
-			updating=false;
-			_item_collapsed(p);
-
 		}
+		updating=true;
+		p->set_collapsed(false);
+		updating=false;
+		_item_collapsed(p);
 		r=p;
 	}
 
@@ -216,7 +216,7 @@ void EditorDirDialog::_make_dir_confirm() {
 	if (err!=OK) {
 		mkdirerr->popup_centered_minsize(Size2(250,80));
 	} else {
-		reload();
+		set_current_path(dir.plus_file(makedirname->get_text()));
 	}
 	makedirname->set_text(""); // reset label
 }
diff --git a/tools/editor/editor_help.cpp b/tools/editor/editor_help.cpp
index 8f486ba0c..4f83dc2f6 100644
--- a/tools/editor/editor_help.cpp
+++ b/tools/editor/editor_help.cpp
@@ -882,6 +882,15 @@ Error EditorHelp::_goto_desc(const String& p_class,int p_vscr) {
 				class_desc->pop();
 			}
 
+			if (cd.methods[i].qualifiers.find("vararg")!=-1) {
+				class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/text_color"));
+				class_desc->add_text(",");
+				class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/symbol_color"));
+				class_desc->add_text(" ... ");
+				class_desc->pop();
+				class_desc->pop();
+			}
+
 			class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/symbol_color"));
 			class_desc->add_text(cd.methods[i].arguments.size()?" )":")");
 			class_desc->pop();
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index f4b67f6e2..11c51991e 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -1228,7 +1228,7 @@ void EditorNode::_dialog_action(String p_file) {
 
 				//_save_scene(p_file);
 				_save_scene_with_preview(p_file);
-				_run(false);
+				_run(true);
 			}
 		} break;
 
@@ -6543,11 +6543,6 @@ EditorNode::EditorNode() {
 
 	Globals::get_singleton()->set("debug/indicators_enabled",true);
 	Globals::get_singleton()->set("render/room_cull_enabled",false);
-	theme->set_color("prop_category","Editor",Color::hex(0x3f3a44ff));
-	theme->set_color("prop_section","Editor",Color::hex(0x35313aff));
-	theme->set_color("prop_subsection","Editor",Color::hex(0x312e37ff));
-	theme->set_color("fg_selected","Editor",Color::html("ffbd8e8e"));
-	theme->set_color("fg_error","Editor",Color::html("ffbd8e8e"));
 
 	reference_resource_mem=true;
 	save_external_resources_mem=true;
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 99c80fdc3..ad5cd86b4 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -574,6 +574,9 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 
 	set("grid_map/pick_distance", 5000.0);
 
+	set("3d_editor/grid_color",Color(0,1,0,0.2));
+	hints["3d_editor/grid_color"]=PropertyInfo(Variant::COLOR,"3d_editor/grid_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT|PROPERTY_USAGE_RESTART_IF_CHANGED);
+
 	set("3d_editor/default_fov",45.0);
 	set("3d_editor/default_z_near",0.1);
 	set("3d_editor/default_z_far",500.0);
diff --git a/tools/editor/editor_themes.cpp b/tools/editor/editor_themes.cpp
index 44e21aee8..713004449 100644
--- a/tools/editor/editor_themes.cpp
+++ b/tools/editor/editor_themes.cpp
@@ -48,6 +48,11 @@ Ref<Theme> create_default_theme()
 	}
 	focus_sbt->set_draw_center(false);
 	theme->set_stylebox("EditorFocus","EditorStyles",focus_sbt);
+	theme->set_color("prop_category","Editor",Color::hex(0x3f3a44ff));
+	theme->set_color("prop_section","Editor",Color::hex(0x35313aff));
+	theme->set_color("prop_subsection","Editor",Color::hex(0x312e37ff));
+	theme->set_color("fg_selected","Editor",Color::html("ffbd8e8e"));
+	theme->set_color("fg_error","Editor",Color::html("ffbd8e8e"));
 
 	return theme;
 }
diff --git a/tools/editor/icons/2x/icon_mini_aabb.png b/tools/editor/icons/2x/icon_mini_aabb.png
index f0fd5620e..25603eec4 100644
--- a/tools/editor/icons/2x/icon_mini_aabb.png
+++ b/tools/editor/icons/2x/icon_mini_aabb.png
diff --git a/tools/editor/icons/2x/icon_mini_transform.png b/tools/editor/icons/2x/icon_mini_transform.png
index cb106ba5f..5144871c5 100644
--- a/tools/editor/icons/2x/icon_mini_transform.png
+++ b/tools/editor/icons/2x/icon_mini_transform.png
diff --git a/tools/editor/icons/icon_mini_aabb.png b/tools/editor/icons/icon_mini_aabb.png
index 3a6be5605..eebc4633e 100644
--- a/tools/editor/icons/icon_mini_aabb.png
+++ b/tools/editor/icons/icon_mini_aabb.png
diff --git a/tools/editor/icons/icon_mini_transform.png b/tools/editor/icons/icon_mini_transform.png
index 0107107a9..068ea0506 100644
--- a/tools/editor/icons/icon_mini_transform.png
+++ b/tools/editor/icons/icon_mini_transform.png
diff --git a/tools/editor/icons/source/icon_mini_aabb.svg b/tools/editor/icons/source/icon_mini_aabb.svg
index f6cc3feda..ebfd505be 100644
--- a/tools/editor/icons/source/icon_mini_aabb.svg
+++ b/tools/editor/icons/source/icon_mini_aabb.svg
@@ -29,8 +29,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="45.254835"
-     inkscape:cx="3.148993"
-     inkscape:cy="6.4579802"
+     inkscape:cx="5.0272453"
+     inkscape:cy="5.132155"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -76,7 +76,7 @@
        id="path4893"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#f5acbb;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#f39bad;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 3,1046.3622 a 3,3 0 0 0 -3,3 3,3 0 0 0 3,3 l 2,0 0,-6 -2,0 z m 0,2 0,2 a 1.0000174,1.0000174 0 0 1 -1,-1 1.0000174,1.0000174 0 0 1 1,-1 z"
        id="path4234"
        inkscape:connector-curvature="0" />
@@ -99,7 +99,7 @@
        id="rect4149"
        style="fill:#ee7991;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:#f5acbb;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#f39bad;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 8,1044.3622 0,8 2,0 a 3,3 0 0 0 3,-3 3,3 0 0 0 -3,-3 l 0,-2 -2,0 z m 2,4 a 1.0000174,1.0000174 0 0 1 1,1 1.0000174,1.0000174 0 0 1 -1,1 l 0,-2 z"
        id="path4151"
        inkscape:connector-curvature="0" />
diff --git a/tools/editor/icons/source/icon_mini_transform.svg b/tools/editor/icons/source/icon_mini_transform.svg
index a844171dd..6da4eb806 100644
--- a/tools/editor/icons/source/icon_mini_transform.svg
+++ b/tools/editor/icons/source/icon_mini_transform.svg
@@ -29,8 +29,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="32"
-     inkscape:cx="5.8969613"
-     inkscape:cy="6.372864"
+     inkscape:cx="8.2643591"
+     inkscape:cy="7.6152896"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -71,26 +71,20 @@
      id="layer1"
      transform="translate(0,-1040.3622)">
     <path
-       style="fill:#f3e49c;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 3,1042.3622 a 3,3 0 0 0 -3,3 l 0,5 2,0 0,-2 1,0 0,-2 -1,0 0,-1 a 1.0000174,1.0000174 0 0 1 1,-1 l 0,-2 z"
-       id="rect4455"
-       inkscape:connector-curvature="0" />
+       style="fill:#f6a86e;fill-opacity:1;stroke:none;stroke-width:20;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4,1042.3622 3.0917969,1044.5438 2,1042.3622 l -2,0 2,4 -2,4 2,0 0.9082031,-2.1816 L 4,1050.3622 l 2,0 -2,-4 2,-4 z"
+       id="rect4214"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       style="fill:#ecd669;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 8,1044.3622 0,6 2,0 0,-4 a 1.0000174,1.0000174 0 0 1 1,1 l 0,3 2,0 0,-3 0,-1 a 1.0000174,1.0000174 0 0 1 1,1 l 0,3 2,0 0,-3 a 3,3 0 0 0 -3,-3 l -2,0 0,0.1758 a 3,3 0 0 0 -1,-0.1758 l -2,0 z"
-       id="path4771"
+       style="fill:#f8bf95;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 9,1042.3622 a 3,3 0 0 0 -3,3 l 0,5 2,0 0,-2 1,0 0,-2 -1,0 0,-1 a 1.0000174,1.0000174 0 0 1 1,-1 l 1,0 0,-2 -1,0 z"
+       id="rect4455"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#ecd669;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 7,1044.3622 a 3,3 0 0 0 -3,3 l 0,3 2,0 0,-3 a 1.0000174,1.0000174 0 0 1 1,-1 l 0,-2 z"
-       id="rect4601"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#f3e49c;fill-opacity:1;stroke:none"
-       id="rect4139"
-       width="1"
-       height="2"
-       x="3"
-       y="1042.3622" />
+       style="fill:#f6a86e;fill-opacity:1;stroke:none;stroke-width:20;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10 4 L 10 6 L 10 8 L 10 10 L 12 10 L 12 8 L 13 9 L 14 8 L 14 10 L 16 10 L 16 8 L 16 6 L 16 4 L 14 4 L 13 6 L 12 4 L 10 4 z "
+       transform="translate(0,1040.3622)"
+       id="rect4231" />
   </g>
 </svg>
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp
index 57707ffa7..3468f42a6 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp
@@ -290,6 +290,7 @@ Dictionary CanvasItemEditor::get_state() const {
 	state["snap_rotation"]=snap_rotation;
 	state["snap_relative"]=snap_relative;
 	state["snap_pixel"]=snap_pixel;
+	state["skeleton_show_bones"]=skeleton_show_bones;
 	return state;
 }
 void CanvasItemEditor::set_state(const Dictionary& p_state){
@@ -351,6 +352,12 @@ void CanvasItemEditor::set_state(const Dictionary& p_state){
 		int idx = edit_menu->get_popup()->get_item_index(SNAP_USE_PIXEL);
 		edit_menu->get_popup()->set_item_checked(idx,snap_pixel);
 	}
+
+	if (state.has("skeleton_show_bones")) {
+		skeleton_show_bones=state["skeleton_show_bones"];
+		int idx = skeleton_menu->get_item_index(SKELETON_SHOW_BONES);
+		skeleton_menu->set_item_checked(idx,skeleton_show_bones);
+	}
 }
 
 
@@ -2083,76 +2090,78 @@ void CanvasItemEditor::_viewport_draw() {
 
 	}
 
-	int bone_width = EditorSettings::get_singleton()->get("2d_editor/bone_width");
-	Color bone_color1 = EditorSettings::get_singleton()->get("2d_editor/bone_color1");
-	Color bone_color2 = EditorSettings::get_singleton()->get("2d_editor/bone_color2");
-	Color bone_ik_color = EditorSettings::get_singleton()->get("2d_editor/bone_ik_color");
-	Color bone_selected_color = EditorSettings::get_singleton()->get("2d_editor/bone_selected_color");
+	if (skeleton_show_bones) {
+		int bone_width = EditorSettings::get_singleton()->get("2d_editor/bone_width");
+		Color bone_color1 = EditorSettings::get_singleton()->get("2d_editor/bone_color1");
+		Color bone_color2 = EditorSettings::get_singleton()->get("2d_editor/bone_color2");
+		Color bone_ik_color = EditorSettings::get_singleton()->get("2d_editor/bone_ik_color");
+		Color bone_selected_color = EditorSettings::get_singleton()->get("2d_editor/bone_selected_color");
 
-	for(Map<ObjectID,BoneList>::Element*E=bone_list.front();E;E=E->next()) {
+		for(Map<ObjectID,BoneList>::Element*E=bone_list.front();E;E=E->next()) {
 
-		E->get().from=Vector2();
-		E->get().to=Vector2();
+			E->get().from=Vector2();
+			E->get().to=Vector2();
 
-		Object *obj = ObjectDB::get_instance(E->get().bone);
-		if (!obj)
-			continue;
+			Object *obj = ObjectDB::get_instance(E->get().bone);
+			if (!obj)
+				continue;
 
-		Node2D* n2d = obj->cast_to<Node2D>();
-		if (!n2d)
-			continue;
+			Node2D* n2d = obj->cast_to<Node2D>();
+			if (!n2d)
+				continue;
 
-		if (!n2d->get_parent())
-			continue;
+			if (!n2d->get_parent())
+				continue;
 
-		CanvasItem *pi = n2d->get_parent_item();
+			CanvasItem *pi = n2d->get_parent_item();
 
 
-		Node2D* pn2d=n2d->get_parent()->cast_to<Node2D>();
+			Node2D* pn2d=n2d->get_parent()->cast_to<Node2D>();
 
-		if (!pn2d)
-			continue;
+			if (!pn2d)
+				continue;
 
-		Vector2 from = transform.xform(pn2d->get_global_pos());
-		Vector2 to = transform.xform(n2d->get_global_pos());
+			Vector2 from = transform.xform(pn2d->get_global_pos());
+			Vector2 to = transform.xform(n2d->get_global_pos());
 
-		E->get().from=from;
-		E->get().to=to;
+			E->get().from=from;
+			E->get().to=to;
 
-		Vector2 rel = to-from;
-		Vector2 relt = rel.tangent().normalized()*bone_width;
+			Vector2 rel = to-from;
+			Vector2 relt = rel.tangent().normalized()*bone_width;
 
 
 
-		Vector<Vector2> bone_shape;
-		bone_shape.push_back(from);
-		bone_shape.push_back(from+rel*0.2+relt);
-		bone_shape.push_back(to);
-		bone_shape.push_back(from+rel*0.2-relt);
-		Vector<Color> colors;
-		if (pi->has_meta("_edit_ik_")) {
+			Vector<Vector2> bone_shape;
+			bone_shape.push_back(from);
+			bone_shape.push_back(from+rel*0.2+relt);
+			bone_shape.push_back(to);
+			bone_shape.push_back(from+rel*0.2-relt);
+			Vector<Color> colors;
+			if (pi->has_meta("_edit_ik_")) {
 
-			colors.push_back(bone_ik_color);
-			colors.push_back(bone_ik_color);
-			colors.push_back(bone_ik_color);
-			colors.push_back(bone_ik_color);
-		} else {
-			colors.push_back(bone_color1);
-			colors.push_back(bone_color2);
-			colors.push_back(bone_color1);
-			colors.push_back(bone_color2);
-		}
+				colors.push_back(bone_ik_color);
+				colors.push_back(bone_ik_color);
+				colors.push_back(bone_ik_color);
+				colors.push_back(bone_ik_color);
+			} else {
+				colors.push_back(bone_color1);
+				colors.push_back(bone_color2);
+				colors.push_back(bone_color1);
+				colors.push_back(bone_color2);
+			}
 
 
-		VisualServer::get_singleton()->canvas_item_add_primitive(ci,bone_shape,colors,Vector<Vector2>(),RID());
+			VisualServer::get_singleton()->canvas_item_add_primitive(ci,bone_shape,colors,Vector<Vector2>(),RID());
 
-		if (editor_selection->is_selected(pi)) {
-			for(int i=0;i<bone_shape.size();i++) {
+			if (editor_selection->is_selected(pi)) {
+				for(int i=0;i<bone_shape.size();i++) {
 
-				VisualServer::get_singleton()->canvas_item_add_line(ci,bone_shape[i],bone_shape[(i+1)%bone_shape.size()],bone_selected_color,2);
+					VisualServer::get_singleton()->canvas_item_add_line(ci,bone_shape[i],bone_shape[(i+1)%bone_shape.size()],bone_selected_color,2);
+				}
 			}
-		}
 
+		}
 	}
 }
 
@@ -2536,6 +2545,12 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			((SnapDialog *)snap_dialog)->set_fields(snap_offset, snap_step, snap_rotation_offset, snap_rotation_step);
 			snap_dialog->popup_centered(Size2(220,160));
 		} break;
+		case SKELETON_SHOW_BONES: {
+			skeleton_show_bones = !skeleton_show_bones;
+			int idx = skeleton_menu->get_item_index(SKELETON_SHOW_BONES);
+			skeleton_menu->set_item_checked(idx,skeleton_show_bones);
+			viewport->update();
+		} break;
 		case ZOOM_IN: {
 			if (zoom>MAX_ZOOM)
 				return;
@@ -2999,6 +3014,8 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 					continue;
 
 				n2d->set_meta("_edit_bone_",true);
+				if (!skeleton_show_bones)
+					skeleton_menu->activate_item(skeleton_menu->get_item_index(SKELETON_SHOW_BONES));
 
 			}
 			viewport->update();
@@ -3017,6 +3034,8 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 					continue;
 
 				n2d->set_meta("_edit_bone_",Variant());
+				if (!skeleton_show_bones)
+					skeleton_menu->activate_item(skeleton_menu->get_item_index(SKELETON_SHOW_BONES));
 
 			}
 			viewport->update();
@@ -3036,6 +3055,8 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 					continue;
 
 				canvas_item->set_meta("_edit_ik_",true);
+				if (!skeleton_show_bones)
+					skeleton_menu->activate_item(skeleton_menu->get_item_index(SKELETON_SHOW_BONES));
 
 			}
 
@@ -3055,6 +3076,8 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 					continue;
 
 				n2d->set_meta("_edit_ik_",Variant());
+				if (!skeleton_show_bones)
+					skeleton_menu->activate_item(skeleton_menu->get_item_index(SKELETON_SHOW_BONES));
 
 			}
 			viewport->update();
@@ -3401,15 +3424,17 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/expand_to_parent", TTR("Expand to Parent"), KEY_MASK_CMD | KEY_P), EXPAND_TO_PARENT);
 	p->add_separator();
 	p->add_submenu_item(TTR("Skeleton.."),"skeleton");
-	PopupMenu *p2 = memnew(PopupMenu);
-	p->add_child(p2);
-	p2->set_name("skeleton");
-	p2->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_make_bones", TTR("Make Bones"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_B ),SKELETON_MAKE_BONES);
-	p2->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_clear_bones", TTR("Clear Bones")), SKELETON_CLEAR_BONES);
-	p2->add_separator();
-	p2->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_set_ik_chain", TTR("Make IK Chain")), SKELETON_SET_IK_CHAIN);
-	p2->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_clear_ik_chain", TTR("Clear IK Chain")), SKELETON_CLEAR_IK_CHAIN);
-	p2->connect("item_pressed", this,"_popup_callback");
+	skeleton_menu = memnew(PopupMenu);
+	p->add_child(skeleton_menu);
+	skeleton_menu->set_name("skeleton");
+	skeleton_menu->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_make_bones", TTR("Make Bones"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_B ),SKELETON_MAKE_BONES);
+	skeleton_menu->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_clear_bones", TTR("Clear Bones")), SKELETON_CLEAR_BONES);
+	skeleton_menu->add_separator();
+	skeleton_menu->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_show_bones", TTR("Show Bones")), SKELETON_SHOW_BONES);
+	skeleton_menu->add_separator();
+	skeleton_menu->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_set_ik_chain", TTR("Make IK Chain")), SKELETON_SET_IK_CHAIN);
+	skeleton_menu->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_clear_ik_chain", TTR("Clear IK Chain")), SKELETON_CLEAR_IK_CHAIN);
+	skeleton_menu->connect("item_pressed", this,"_popup_callback");
 
 
 	/*
@@ -3535,6 +3560,8 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	snap_show_grid=false;
 	snap_rotation=false;
 	snap_pixel=false;
+	skeleton_show_bones=true;
+	skeleton_menu->set_item_checked(skeleton_menu->get_item_index(SKELETON_SHOW_BONES),true);
 	updating_value_dialog=false;
 	box_selecting=false;
 	//zoom=0.5;
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.h b/tools/editor/plugins/canvas_item_editor_plugin.h
index ea582f6fa..9f4bc46eb 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.h
+++ b/tools/editor/plugins/canvas_item_editor_plugin.h
@@ -124,6 +124,7 @@ class CanvasItemEditor : public VBoxContainer {
 		VIEW_FRAME_TO_SELECTION,
 		SKELETON_MAKE_BONES,
 		SKELETON_CLEAR_BONES,
+		SKELETON_SHOW_BONES,
 		SKELETON_SET_IK_CHAIN,
 		SKELETON_CLEAR_IK_CHAIN
 
@@ -175,6 +176,7 @@ class CanvasItemEditor : public VBoxContainer {
 	bool snap_rotation;
 	bool snap_relative;
 	bool snap_pixel;
+	bool skeleton_show_bones;
 	bool box_selecting;
 	Point2 box_selecting_to;
 	bool key_pos;
@@ -256,6 +258,7 @@ class CanvasItemEditor : public VBoxContainer {
 	ToolButton *ungroup_button;
 
 	MenuButton *edit_menu;
+	PopupMenu *skeleton_menu;
 	MenuButton *view_menu;
 	HBoxContainer *animation_hb;
 	MenuButton *animation_menu;
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index fdb7856b8..1f931fb49 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -1292,6 +1292,7 @@ struct _ScriptEditorItemData {
 void ScriptEditor::_update_script_colors() {
 
 	bool enabled = EditorSettings::get_singleton()->get("text_editor/script_temperature_enabled");
+	bool highlight_current = EditorSettings::get_singleton()->get("text_editor/highlight_current_script");
 	if (!enabled)
 		return;
 
@@ -1319,8 +1320,12 @@ void ScriptEditor::_update_script_colors() {
 		int non_zero_hist_size = ( hist_size == 0 ) ? 1 : hist_size;
 		float v = Math::ease((edit_pass-pass)/float(non_zero_hist_size),0.4);
 
-
-		script_list->set_item_custom_bg_color(i,hot_color.linear_interpolate(cold_color,v));
+		bool current = tab_container->get_current_tab() == c;
+		if (current && highlight_current) {
+			script_list->set_item_custom_bg_color(i, EditorSettings::get_singleton()->get("text_editor/current_script_background_color"));
+		} else {
+			script_list->set_item_custom_bg_color(i,hot_color.linear_interpolate(cold_color,v));
+		}
 	}
 }
 
@@ -2356,9 +2361,11 @@ ScriptEditorPlugin::ScriptEditorPlugin(EditorNode *p_node) {
 	EDITOR_DEF("external_editor/use_external_editor",false);
 	EDITOR_DEF("external_editor/exec_path","");
 	EDITOR_DEF("text_editor/script_temperature_enabled",true);
+	EDITOR_DEF("text_editor/highlight_current_script", true);
 	EDITOR_DEF("text_editor/script_temperature_history_size",15);
 	EDITOR_DEF("text_editor/script_temperature_hot_color",Color(1,0,0,0.3));
 	EDITOR_DEF("text_editor/script_temperature_cold_color",Color(0,0,1,0.3));
+	EDITOR_DEF("text_editor/current_script_background_color",Color(0.81,0.81,0.14,0.63));
 	EDITOR_DEF("text_editor/group_help_pages",true);
 	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"external_editor/exec_path",PROPERTY_HINT_GLOBAL_FILE));
 	EDITOR_DEF("external_editor/exec_flags","");
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp
index 95106d2c8..41956747e 100644
--- a/tools/editor/plugins/spatial_editor_plugin.cpp
+++ b/tools/editor/plugins/spatial_editor_plugin.cpp
@@ -3151,6 +3151,8 @@ void SpatialEditor::_init_indicators() {
 		Vector<Color> origin_colors;
 		Vector<Vector3> origin_points;
 
+		Color grid_color = EditorSettings::get_singleton()->get("3d_editor/grid_color");
+
 		for(int i=0;i<3;i++) {
 			Vector3 axis;
 			axis[i]=1;
@@ -3168,10 +3170,10 @@ void SpatialEditor::_init_indicators() {
 			for(int j=-ORIGIN_GRID_SIZE;j<=ORIGIN_GRID_SIZE;j++) {
 
 
-				grid_colors[i].push_back(Color(axis.x,axis.y,axis.z,0.2));
-				grid_colors[i].push_back(Color(axis.x,axis.y,axis.z,0.2));
-				grid_colors[i].push_back(Color(axis.x,axis.y,axis.z,0.2));
-				grid_colors[i].push_back(Color(axis.x,axis.y,axis.z,0.2));
+				grid_colors[i].push_back(grid_color);
+				grid_colors[i].push_back(grid_color);
+				grid_colors[i].push_back(grid_color);
+				grid_colors[i].push_back(grid_color);
 				grid_points[i].push_back(axis_n1*ORIGIN_GRID_SIZE+axis_n2*j);
 				grid_points[i].push_back(-axis_n1*ORIGIN_GRID_SIZE+axis_n2*j);
 				grid_points[i].push_back(axis_n2*ORIGIN_GRID_SIZE+axis_n1*j);
diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp
index 822d9e6c8..43fe7d7ea 100644
--- a/tools/editor/plugins/tile_map_editor_plugin.cpp
+++ b/tools/editor/plugins/tile_map_editor_plugin.cpp
@@ -289,15 +289,16 @@ void TileMapEditor::_pick_tile(const Point2& p_pos) {
 	canvas_item_editor->update();
 }
 
-DVector<Vector2> TileMapEditor::_bucket_fill(const Point2i& p_start) {
+DVector<Vector2> TileMapEditor::_bucket_fill(const Point2i& p_start, bool erase) {
 
-	if (node->get_cell(p_start.x, p_start.y) != TileMap::INVALID_CELL)
-		return DVector<Vector2>();
+	int prev_id = node->get_cell(p_start.x, p_start.y);
+	int id = TileMap::INVALID_CELL;
+	if (!erase) {
+		id = get_selected_tile();
 
-	int id = get_selected_tile();
-
-	if (id == TileMap::INVALID_CELL)
-		return DVector<Vector2>();
+		if (id == TileMap::INVALID_CELL)
+			return DVector<Vector2>();
+	}
 
 	Rect2 r = node->get_item_rect();
 	r.pos = r.pos/node->get_cell_size();
@@ -316,7 +317,7 @@ DVector<Vector2> TileMapEditor::_bucket_fill(const Point2i& p_start) {
 		if (!r.has_point(n))
 			continue;
 
-		if (node->get_cell(n.x, n.y) == TileMap::INVALID_CELL) {
+		if (node->get_cell(n.x, n.y) == prev_id) {
 
 			node->set_cellv(n, id, flip_h, flip_v, transpose);
 
@@ -685,6 +686,12 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
 
 						} else if (tool==TOOL_BUCKET) {
 
+							Dictionary pop;
+							pop["id"] = node->get_cell(over_tile.x, over_tile.y);
+							pop["flip_h"] = node->is_cell_x_flipped(over_tile.x, over_tile.y);
+							pop["flip_v"] = node->is_cell_y_flipped(over_tile.x, over_tile.y);
+							pop["transpose"] = node->is_cell_transposed(over_tile.x, over_tile.y);
+
 							DVector<Vector2> points = _bucket_fill(over_tile);
 
 							if (points.size() == 0)
@@ -699,7 +706,7 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
 							undo_redo->create_action("Bucket Fill");
 
 							undo_redo->add_do_method(this, "_fill_points", points, op);
-							undo_redo->add_undo_method(this, "_erase_points", points);
+							undo_redo->add_undo_method(this, "_fill_points", points, pop);
 
 							undo_redo->commit_action();
 						}
@@ -782,6 +789,26 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
 						tool=TOOL_NONE;
 
 						return true;
+
+					} else if (tool==TOOL_BUCKET) {
+
+						Dictionary pop;
+						pop["id"] = node->get_cell(over_tile.x, over_tile.y);
+						pop["flip_h"] = node->is_cell_x_flipped(over_tile.x, over_tile.y);
+						pop["flip_v"] = node->is_cell_y_flipped(over_tile.x, over_tile.y);
+						pop["transpose"] = node->is_cell_transposed(over_tile.x, over_tile.y);
+
+						DVector<Vector2> points = _bucket_fill(over_tile, true);
+
+						if (points.size() == 0)
+							return false;
+
+						undo_redo->create_action("Bucket Fill");
+
+						undo_redo->add_do_method(this, "_erase_points", points);
+						undo_redo->add_undo_method(this, "_fill_points", points, pop);
+
+						undo_redo->commit_action();
 					}
 				}
 			}
@@ -798,7 +825,7 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
 				canvas_item_editor->update();
 			}
 
-			int tile_under = node->get_cell(over_tile.x, over_tile.y);	
+			int tile_under = node->get_cell(over_tile.x, over_tile.y);
 			String tile_name = "none";
 
 			if (node->get_tileset()->has_tile(tile_under))
diff --git a/tools/editor/plugins/tile_map_editor_plugin.h b/tools/editor/plugins/tile_map_editor_plugin.h
index 666290489..4b47dccd1 100644
--- a/tools/editor/plugins/tile_map_editor_plugin.h
+++ b/tools/editor/plugins/tile_map_editor_plugin.h
@@ -129,7 +129,7 @@ class TileMapEditor : public VBoxContainer {
 
 	void _pick_tile(const Point2& p_pos);
 
-	DVector<Vector2> _bucket_fill(const Point2i& p_start);
+	DVector<Vector2> _bucket_fill(const Point2i& p_start, bool erase=false);
 
 	void _fill_points(const DVector<Vector2> p_points, const Dictionary& p_op);
 	void _erase_points(const DVector<Vector2> p_points);
diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp
index dc1d6ec0f..0c734436c 100644
--- a/tools/editor/project_manager.cpp
+++ b/tools/editor/project_manager.cpp
@@ -1196,15 +1196,12 @@ ProjectManager::ProjectManager() {
 	FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files"));
 
 	set_area_as_parent_rect();
+	set_theme(create_default_theme());
 
 	gui_base = memnew( Control );
 	add_child(gui_base);
 	gui_base->set_area_as_parent_rect();
 
-	set_theme(create_default_theme());
-	Ref<Theme> theme = create_editor_theme();
-	gui_base->set_theme(theme);
-
 	Panel *panel = memnew( Panel );
 	gui_base->add_child(panel);
 	panel->set_area_as_parent_rect();
@@ -1391,6 +1388,8 @@ ProjectManager::ProjectManager() {
 	last_clicked = "";
 
 	SceneTree::get_singleton()->connect("files_dropped", this, "_files_dropped");
+
+	gui_base->set_theme(create_editor_theme());
 }
 
 
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index 2ea28e26a..de10e68f3 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -4557,7 +4557,7 @@ void SectionedPropertyEditor::update_category_list() {
 		else if ( !(pi.usage&PROPERTY_USAGE_EDITOR) )
 			continue;
 
-		if (pi.name.find(":")!=-1 || pi.name=="script/script")
+		if (pi.name.find(":")!=-1 || pi.name=="script/script" || pi.name.begins_with("resource/"))
 			continue;
 		int sp = pi.name.find("/");
 		if (sp!=-1) {
diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp
index da42f5409..7fba73ca0 100644
--- a/tools/editor/script_editor_debugger.cpp
+++ b/tools/editor/script_editor_debugger.cpp
@@ -1087,6 +1087,9 @@ void ScriptEditorDebugger::start() {
 
 	stop();
 
+	if (!EditorNode::get_log()->is_visible()) {
+		EditorNode::get_singleton()->make_bottom_panel_item_visible(EditorNode::get_log());
+	}
 
 	uint16_t port = GLOBAL_DEF("debug/remote_port",6007);
 	perf_history.clear();
diff --git a/tools/ios_xcode_template/data.pck b/tools/ios_xcode_template/data.pck
deleted file mode 100644
index e69de29bb..000000000
--- a/tools/ios_xcode_template/data.pck
+++ /dev/null
diff --git a/tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj b/tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj
deleted file mode 100644
index 4ae1ec8a5..000000000
--- a/tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,469 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		D0BCFE3818AEBDA2004A7AAE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0BCFE3718AEBDA2004A7AAE /* Foundation.framework */; };
-		D0BCFE3A18AEBDA2004A7AAE /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0BCFE3918AEBDA2004A7AAE /* CoreGraphics.framework */; };
-		D0BCFE3C18AEBDA2004A7AAE /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0BCFE3B18AEBDA2004A7AAE /* UIKit.framework */; };
-		D0BCFE3E18AEBDA2004A7AAE /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0BCFE3D18AEBDA2004A7AAE /* GLKit.framework */; };
-		D0BCFE4018AEBDA2004A7AAE /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0BCFE3F18AEBDA2004A7AAE /* OpenGLES.framework */; };
-		D0BCFE4618AEBDA2004A7AAE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D0BCFE4418AEBDA2004A7AAE /* InfoPlist.strings */; };
-		D0BCFE6218AEBDA3004A7AAE /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0BCFE6118AEBDA3004A7AAE /* XCTest.framework */; };
-		D0BCFE6318AEBDA3004A7AAE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0BCFE3718AEBDA2004A7AAE /* Foundation.framework */; };
-		D0BCFE6418AEBDA3004A7AAE /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0BCFE3B18AEBDA2004A7AAE /* UIKit.framework */; };
-		D0BCFE6C18AEBDA3004A7AAE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D0BCFE6A18AEBDA3004A7AAE /* InfoPlist.strings */; };
-		D0BCFE6E18AEBDA3004A7AAE /* godot_iosTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BCFE6D18AEBDA3004A7AAE /* godot_iosTests.m */; };
-		D0BCFE7818AEBFEB004A7AAE /* data.pck in Resources */ = {isa = PBXBuildFile; fileRef = D0BCFE7718AEBFEB004A7AAE /* data.pck */; };
-		D0BCFE7A18AEC06A004A7AAE /* godot_opt.iphone in Resources */ = {isa = PBXBuildFile; fileRef = D0BCFE7918AEC06A004A7AAE /* godot_opt.iphone */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		D0BCFE6518AEBDA3004A7AAE /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D0BCFE2C18AEBDA2004A7AAE /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D0BCFE3318AEBDA2004A7AAE;
-			remoteInfo = godot_ios;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		D0BCFE3418AEBDA2004A7AAE /* godot_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = godot_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		D0BCFE3718AEBDA2004A7AAE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		D0BCFE3918AEBDA2004A7AAE /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		D0BCFE3B18AEBDA2004A7AAE /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		D0BCFE3D18AEBDA2004A7AAE /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
-		D0BCFE3F18AEBDA2004A7AAE /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
-		D0BCFE4318AEBDA2004A7AAE /* godot_ios-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "godot_ios-Info.plist"; sourceTree = "<group>"; };
-		D0BCFE4518AEBDA2004A7AAE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		D0BCFE4918AEBDA2004A7AAE /* godot_ios-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "godot_ios-Prefix.pch"; sourceTree = "<group>"; };
-		D0BCFE6018AEBDA3004A7AAE /* godot_iosTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = godot_iosTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		D0BCFE6118AEBDA3004A7AAE /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
-		D0BCFE6918AEBDA3004A7AAE /* godot_iosTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "godot_iosTests-Info.plist"; sourceTree = "<group>"; };
-		D0BCFE6B18AEBDA3004A7AAE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		D0BCFE6D18AEBDA3004A7AAE /* godot_iosTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = godot_iosTests.m; sourceTree = "<group>"; };
-		D0BCFE7718AEBFEB004A7AAE /* data.pck */ = {isa = PBXFileReference; lastKnownFileType = file; path = data.pck; sourceTree = "<group>"; };
-		D0BCFE7918AEC06A004A7AAE /* godot_opt.iphone */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = godot_opt.iphone; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		D0BCFE3118AEBDA2004A7AAE /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0BCFE4018AEBDA2004A7AAE /* OpenGLES.framework in Frameworks */,
-				D0BCFE3A18AEBDA2004A7AAE /* CoreGraphics.framework in Frameworks */,
-				D0BCFE3C18AEBDA2004A7AAE /* UIKit.framework in Frameworks */,
-				D0BCFE3E18AEBDA2004A7AAE /* GLKit.framework in Frameworks */,
-				D0BCFE3818AEBDA2004A7AAE /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0BCFE5D18AEBDA3004A7AAE /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0BCFE6218AEBDA3004A7AAE /* XCTest.framework in Frameworks */,
-				D0BCFE6418AEBDA3004A7AAE /* UIKit.framework in Frameworks */,
-				D0BCFE6318AEBDA3004A7AAE /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		D0BCFE2B18AEBDA2004A7AAE = {
-			isa = PBXGroup;
-			children = (
-				D0BCFE7918AEC06A004A7AAE /* godot_opt.iphone */,
-				D0BCFE7718AEBFEB004A7AAE /* data.pck */,
-				D0BCFE4118AEBDA2004A7AAE /* godot_ios */,
-				D0BCFE6718AEBDA3004A7AAE /* godot_iosTests */,
-				D0BCFE3618AEBDA2004A7AAE /* Frameworks */,
-				D0BCFE3518AEBDA2004A7AAE /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		D0BCFE3518AEBDA2004A7AAE /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				D0BCFE3418AEBDA2004A7AAE /* godot_ios.app */,
-				D0BCFE6018AEBDA3004A7AAE /* godot_iosTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		D0BCFE3618AEBDA2004A7AAE /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				D0BCFE3718AEBDA2004A7AAE /* Foundation.framework */,
-				D0BCFE3918AEBDA2004A7AAE /* CoreGraphics.framework */,
-				D0BCFE3B18AEBDA2004A7AAE /* UIKit.framework */,
-				D0BCFE3D18AEBDA2004A7AAE /* GLKit.framework */,
-				D0BCFE3F18AEBDA2004A7AAE /* OpenGLES.framework */,
-				D0BCFE6118AEBDA3004A7AAE /* XCTest.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		D0BCFE4118AEBDA2004A7AAE /* godot_ios */ = {
-			isa = PBXGroup;
-			children = (
-				D0BCFE4218AEBDA2004A7AAE /* Supporting Files */,
-			);
-			path = godot_ios;
-			sourceTree = "<group>";
-		};
-		D0BCFE4218AEBDA2004A7AAE /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				D0BCFE4318AEBDA2004A7AAE /* godot_ios-Info.plist */,
-				D0BCFE4418AEBDA2004A7AAE /* InfoPlist.strings */,
-				D0BCFE4918AEBDA2004A7AAE /* godot_ios-Prefix.pch */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		D0BCFE6718AEBDA3004A7AAE /* godot_iosTests */ = {
-			isa = PBXGroup;
-			children = (
-				D0BCFE6D18AEBDA3004A7AAE /* godot_iosTests.m */,
-				D0BCFE6818AEBDA3004A7AAE /* Supporting Files */,
-			);
-			path = godot_iosTests;
-			sourceTree = "<group>";
-		};
-		D0BCFE6818AEBDA3004A7AAE /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				D0BCFE6918AEBDA3004A7AAE /* godot_iosTests-Info.plist */,
-				D0BCFE6A18AEBDA3004A7AAE /* InfoPlist.strings */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		D0BCFE3318AEBDA2004A7AAE /* godot_ios */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D0BCFE7118AEBDA3004A7AAE /* Build configuration list for PBXNativeTarget "godot_ios" */;
-			buildPhases = (
-				D0BCFE3018AEBDA2004A7AAE /* Sources */,
-				D0BCFE3118AEBDA2004A7AAE /* Frameworks */,
-				D0BCFE3218AEBDA2004A7AAE /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = godot_ios;
-			productName = godot_ios;
-			productReference = D0BCFE3418AEBDA2004A7AAE /* godot_ios.app */;
-			productType = "com.apple.product-type.application";
-		};
-		D0BCFE5F18AEBDA3004A7AAE /* godot_iosTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D0BCFE7418AEBDA3004A7AAE /* Build configuration list for PBXNativeTarget "godot_iosTests" */;
-			buildPhases = (
-				D0BCFE5C18AEBDA3004A7AAE /* Sources */,
-				D0BCFE5D18AEBDA3004A7AAE /* Frameworks */,
-				D0BCFE5E18AEBDA3004A7AAE /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				D0BCFE6618AEBDA3004A7AAE /* PBXTargetDependency */,
-			);
-			name = godot_iosTests;
-			productName = godot_iosTests;
-			productReference = D0BCFE6018AEBDA3004A7AAE /* godot_iosTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		D0BCFE2C18AEBDA2004A7AAE /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0500;
-				ORGANIZATIONNAME = GodotEngine;
-				TargetAttributes = {
-					D0BCFE5F18AEBDA3004A7AAE = {
-						TestTargetID = D0BCFE3318AEBDA2004A7AAE;
-					};
-				};
-			};
-			buildConfigurationList = D0BCFE2F18AEBDA2004A7AAE /* Build configuration list for PBXProject "godot_ios" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = D0BCFE2B18AEBDA2004A7AAE;
-			productRefGroup = D0BCFE3518AEBDA2004A7AAE /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				D0BCFE3318AEBDA2004A7AAE /* godot_ios */,
-				D0BCFE5F18AEBDA3004A7AAE /* godot_iosTests */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		D0BCFE3218AEBDA2004A7AAE /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0BCFE7818AEBFEB004A7AAE /* data.pck in Resources */,
-				D0BCFE4618AEBDA2004A7AAE /* InfoPlist.strings in Resources */,
-				D0BCFE7A18AEC06A004A7AAE /* godot_opt.iphone in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0BCFE5E18AEBDA3004A7AAE /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0BCFE6C18AEBDA3004A7AAE /* InfoPlist.strings in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		D0BCFE3018AEBDA2004A7AAE /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0BCFE5C18AEBDA3004A7AAE /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0BCFE6E18AEBDA3004A7AAE /* godot_iosTests.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		D0BCFE6618AEBDA3004A7AAE /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D0BCFE3318AEBDA2004A7AAE /* godot_ios */;
-			targetProxy = D0BCFE6518AEBDA3004A7AAE /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		D0BCFE4418AEBDA2004A7AAE /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				D0BCFE4518AEBDA2004A7AAE /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		D0BCFE6A18AEBDA3004A7AAE /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				D0BCFE6B18AEBDA3004A7AAE /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		D0BCFE6F18AEBDA3004A7AAE /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		D0BCFE7018AEBDA3004A7AAE /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		D0BCFE7218AEBDA3004A7AAE /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "godot_ios/godot_ios-Prefix.pch";
-				INFOPLIST_FILE = "godot_ios/godot_ios-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "armv7 armv7s";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Debug;
-		};
-		D0BCFE7318AEBDA3004A7AAE /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "godot_ios/godot_ios-Prefix.pch";
-				INFOPLIST_FILE = "godot_ios/godot_ios-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "armv7 armv7s";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-		D0BCFE7518AEBDA3004A7AAE /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
-				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/godot_ios.app/godot_ios";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-					"$(DEVELOPER_FRAMEWORKS_DIR)",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "godot_ios/godot_ios-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = "godot_iosTests/godot_iosTests-Info.plist";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUNDLE_LOADER)";
-				WRAPPER_EXTENSION = xctest;
-			};
-			name = Debug;
-		};
-		D0BCFE7618AEBDA3004A7AAE /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
-				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/godot_ios.app/godot_ios";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-					"$(DEVELOPER_FRAMEWORKS_DIR)",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "godot_ios/godot_ios-Prefix.pch";
-				INFOPLIST_FILE = "godot_iosTests/godot_iosTests-Info.plist";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUNDLE_LOADER)";
-				WRAPPER_EXTENSION = xctest;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		D0BCFE2F18AEBDA2004A7AAE /* Build configuration list for PBXProject "godot_ios" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D0BCFE6F18AEBDA3004A7AAE /* Debug */,
-				D0BCFE7018AEBDA3004A7AAE /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		D0BCFE7118AEBDA3004A7AAE /* Build configuration list for PBXNativeTarget "godot_ios" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D0BCFE7218AEBDA3004A7AAE /* Debug */,
-				D0BCFE7318AEBDA3004A7AAE /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-		};
-		D0BCFE7418AEBDA3004A7AAE /* Build configuration list for PBXNativeTarget "godot_iosTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D0BCFE7518AEBDA3004A7AAE /* Debug */,
-				D0BCFE7618AEBDA3004A7AAE /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = D0BCFE2C18AEBDA2004A7AAE /* Project object */;
-}
diff --git a/tools/ios_xcode_template/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tools/ios_xcode_template/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 3c9ba38bb..000000000
--- a/tools/ios_xcode_template/godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:godot_ios.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/tools/ios_xcode_template/godot_ios.xcodeproj/project.xcworkspace/xcuserdata/punto.xcuserdatad/UserInterfaceState.xcuserstate b/tools/ios_xcode_template/godot_ios.xcodeproj/project.xcworkspace/xcuserdata/punto.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 7c338929e..000000000
--- a/tools/ios_xcode_template/godot_ios.xcodeproj/project.xcworkspace/xcuserdata/punto.xcuserdatad/UserInterfaceState.xcuserstate
+++ /dev/null
diff --git a/tools/ios_xcode_template/godot_ios.xcodeproj/xcuserdata/punto.xcuserdatad/xcschemes/godot_ios.xcscheme b/tools/ios_xcode_template/godot_ios.xcodeproj/xcuserdata/punto.xcuserdatad/xcschemes/godot_ios.xcscheme
deleted file mode 100644
index 19af55b4a..000000000
--- a/tools/ios_xcode_template/godot_ios.xcodeproj/xcuserdata/punto.xcuserdatad/xcschemes/godot_ios.xcscheme
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0500"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D0BCFE3318AEBDA2004A7AAE"
-               BuildableName = "godot_ios.app"
-               BlueprintName = "godot_ios"
-               ReferencedContainer = "container:godot_ios.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D0BCFE5F18AEBDA3004A7AAE"
-               BuildableName = "godot_iosTests.xctest"
-               BlueprintName = "godot_iosTests"
-               ReferencedContainer = "container:godot_ios.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D0BCFE3318AEBDA2004A7AAE"
-            BuildableName = "godot_ios.app"
-            BlueprintName = "godot_ios"
-            ReferencedContainer = "container:godot_ios.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D0BCFE3318AEBDA2004A7AAE"
-            BuildableName = "godot_ios.app"
-            BlueprintName = "godot_ios"
-            ReferencedContainer = "container:godot_ios.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D0BCFE3318AEBDA2004A7AAE"
-            BuildableName = "godot_ios.app"
-            BlueprintName = "godot_ios"
-            ReferencedContainer = "container:godot_ios.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/tools/ios_xcode_template/godot_ios.xcodeproj/xcuserdata/punto.xcuserdatad/xcschemes/xcschememanagement.plist b/tools/ios_xcode_template/godot_ios.xcodeproj/xcuserdata/punto.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 4a3a16cbd..000000000
--- a/tools/ios_xcode_template/godot_ios.xcodeproj/xcuserdata/punto.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>godot_ios.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>D0BCFE3318AEBDA2004A7AAE</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-		<key>D0BCFE5F18AEBDA3004A7AAE</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/tools/ios_xcode_template/godot_ios/en.lproj/InfoPlist.strings b/tools/ios_xcode_template/godot_ios/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8..000000000
--- a/tools/ios_xcode_template/godot_ios/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/tools/ios_xcode_template/godot_ios/godot_ios-Info.plist b/tools/ios_xcode_template/godot_ios/godot_ios-Info.plist
deleted file mode 100644
index 357970920..000000000
--- a/tools/ios_xcode_template/godot_ios/godot_ios-Info.plist
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleExecutable</key>
-	<string>godot_opt.iphone</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.godotengine.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UIStatusBarHidden</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
diff --git a/tools/ios_xcode_template/godot_ios/godot_ios-Prefix.pch b/tools/ios_xcode_template/godot_ios/godot_ios-Prefix.pch
deleted file mode 100644
index 82a2bb450..000000000
--- a/tools/ios_xcode_template/godot_ios/godot_ios-Prefix.pch
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  Prefix header
-//
-//  The contents of this file are implicitly included at the beginning of every source file.
-//
-
-#import <Availability.h>
-
-#ifndef __IPHONE_5_0
-#warning "This project uses features only available in iOS SDK 5.0 and later."
-#endif
-
-#ifdef __OBJC__
-    #import <UIKit/UIKit.h>
-    #import <Foundation/Foundation.h>
-#endif
diff --git a/tools/ios_xcode_template/godot_ios/main.m b/tools/ios_xcode_template/godot_ios/main.m
deleted file mode 100644
index 3e4ea5e12..000000000
--- a/tools/ios_xcode_template/godot_ios/main.m
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************/
-/*  main.m                                                               */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                    http://www.godotengine.org                         */
-/*************************************************************************/
-/* Copyright (c) 2007-2016 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       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[])
-{
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
-}
diff --git a/tools/ios_xcode_template/godot_iosTests/en.lproj/InfoPlist.strings b/tools/ios_xcode_template/godot_iosTests/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8..000000000
--- a/tools/ios_xcode_template/godot_iosTests/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist b/tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist
deleted file mode 100644
index 0f69aa80e..000000000
--- a/tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.godotengine.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/tools/ios_xcode_template/godot_iosTests/godot_iosTests.m b/tools/ios_xcode_template/godot_iosTests/godot_iosTests.m
deleted file mode 100644
index d9fac0a25..000000000
--- a/tools/ios_xcode_template/godot_iosTests/godot_iosTests.m
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************/
-/*  godot_iosTests.m                                                     */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                    http://www.godotengine.org                         */
-/*************************************************************************/
-/* Copyright (c) 2007-2016 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       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#import <XCTest/XCTest.h>
-
-@interface godot_iosTests : XCTestCase
-
-@end
-
-@implementation godot_iosTests
-
-- (void)setUp
-{
-    [super setUp];
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-}
-
-- (void)tearDown
-{
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
-
-- (void)testExample
-{
-    XCTFail(@"No implementation for \"%s\"", __PRETTY_FUNCTION__);
-}
-
-@end
diff --git a/tools/script_plugins/terrain/plugin.cfg b/tools/script_plugins/terrain/plugin.cfg
deleted file mode 100644
index d2f291742..000000000
--- a/tools/script_plugins/terrain/plugin.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-[plugin]
-
-name="Terrain"
-description="Simple plugin for generating and editing grid-based terrains. This type of terrains were all the rage in the early 2000's, but lost popularity to hand crafted geometry towards the end of the decade."
-author="Juan Linietsky"
-version="1.0"
-installs=true
-script="terrain.gd"
-install_files=["terrain.gd","terrain_node.gd","icon_terrain.png"]
-
-
-
-
-
-
-
diff --git a/tools/script_plugins/terrain/terrain.gd b/tools/script_plugins/terrain/terrain.gd
deleted file mode 100644
index b3e3121e7..000000000
--- a/tools/script_plugins/terrain/terrain.gd
+++ /dev/null
@@ -1,17 +0,0 @@
-tool # Always declare as Tool, if it's meant to run in the editor.
-extends EditorPlugin
-
-
-func get_name(): 
-	return "Terrain"
-
-
-func _init():
-	print("PLUGIN INIT")
-	
- 
-func _enter_scene():
-	add_custom_type("Terrain","Spatial",preload("terrain_node.gd"),preload("terrain.png"))
-
-func _exit_scene():
-	remove_custom_type("Terrain")
diff --git a/tools/script_plugins/terrain/terrain.png b/tools/script_plugins/terrain/terrain.png
deleted file mode 100644
index 7c1c3d70d..000000000
--- a/tools/script_plugins/terrain/terrain.png
+++ /dev/null
diff --git a/tools/script_plugins/terrain/terrain_node.gd b/tools/script_plugins/terrain/terrain_node.gd
deleted file mode 100644
index 91cf3fcb2..000000000
--- a/tools/script_plugins/terrain/terrain_node.gd
+++ /dev/null
@@ -1,3 +0,0 @@
-extends Spatial
-
-
diff --git a/tools/script_plugins/time/plugin.cfg b/tools/script_plugins/time/plugin.cfg
deleted file mode 100644
index 5430306a7..000000000
--- a/tools/script_plugins/time/plugin.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[plugin]
-
-name="The Time"
-description="This plugin displays the current local time, with great accuracy, by harvesting the power of quartz crystals inside your computer.\nIt may also serve as simple example on how to write a non-installable editor plugin, or just remind you that it's time to go back home."
-author="Juan Linietsky"
-version="1.0"
-installs=false
-script="time.gd"
-
-
-
-
-
-
diff --git a/tools/script_plugins/time/time.gd b/tools/script_plugins/time/time.gd
deleted file mode 100644
index 2e56d89d4..000000000
--- a/tools/script_plugins/time/time.gd
+++ /dev/null
@@ -1,32 +0,0 @@
-tool # Always declare as Tool, if it's meant to run in the editor.
-extends EditorPlugin
-
-var timer = null
-var label = null
-
-func _timeout():
-	if (label):
-		var time = OS.get_time()
-		label.set_text(str(time.hour).pad_zeros(2)+":"+str(time.minute).pad_zeros(2)+":"+str(time.second).pad_zeros(2))
-
-func get_name(): 
-	return "The Time"
-
-
-func _init():
-	print("PLUGIN INIT")
-	timer = Timer.new()
-	add_child(timer)
-	timer.set_wait_time(0.5)
-	timer.set_one_shot(false)
-	timer.connect("timeout",self,"_timeout")
- 
-func _enter_tree():
-	label = Label.new()
-	add_custom_control(CONTAINER_TOOLBAR,label)
-	timer.start()
-	
-func _exit_tree():
-	timer.stop()
-	label.free()
-	label=null
diff --git a/tools/addheader/addheader.py b/tools/scripts/addheader.py
index d040d8b5d..d040d8b5d 100644
--- a/tools/addheader/addheader.py
+++ b/tools/scripts/addheader.py
diff --git a/tools/bmfhdr/makehdr.py b/tools/scripts/make_bmfhdr.py
index 0f6f45300..0f6f45300 100644
--- a/tools/bmfhdr/makehdr.py
+++ b/tools/scripts/make_bmfhdr.py
diff --git a/tools/glwrapper/makewrapper.py b/tools/scripts/make_glwrapper.py
index 2e5f06be1..f3f8d3983 100644
--- a/tools/glwrapper/makewrapper.py
+++ b/tools/scripts/make_glwrapper.py
@@ -2,7 +2,7 @@
 import sys
 
 if (len(sys.argv)<2):
-  print("usage: makewrapper.py <headers>")
+  print("usage: make_glwrapper.py <headers>")
   sys.exit(255)
 
 
diff --git a/tools/steam/make_icons.sh b/tools/scripts/make_icons.sh
index 71037cd1c..71037cd1c 100644
--- a/tools/steam/make_icons.sh
+++ b/tools/scripts/make_icons.sh
diff --git a/tools/memsort.py b/tools/scripts/memsort.py
index d2e4fe022..d2e4fe022 100644
--- a/tools/memsort.py
+++ b/tools/scripts/memsort.py