9 files changed, 171 insertions, 728 deletions

diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp
index 31d45d8e4c..8414210952 100644
--- a/scene/main/canvas_layer.cpp
+++ b/scene/main/canvas_layer.cpp
@@ -35,7 +35,7 @@ void CanvasLayer::set_layer(int p_xform) {
 
 	layer = p_xform;
 	if (viewport.is_valid())
-		VisualServer::get_singleton()->viewport_set_canvas_layer(viewport, canvas->get_canvas(), layer);
+		VisualServer::get_singleton()->viewport_set_canvas_layer(viewport, canvas, layer);
 }
 
 int CanvasLayer::get_layer() const {
@@ -48,7 +48,7 @@ void CanvasLayer::set_transform(const Transform2D &p_xform) {
 	transform = p_xform;
 	locrotscale_dirty = true;
 	if (viewport.is_valid())
-		VisualServer::get_singleton()->viewport_set_canvas_transform(viewport, canvas->get_canvas(), transform);
+		VisualServer::get_singleton()->viewport_set_canvas_transform(viewport, canvas, transform);
 }
 
 Transform2D CanvasLayer::get_transform() const {
@@ -61,7 +61,7 @@ void CanvasLayer::_update_xform() {
 	transform.set_rotation_and_scale(rot, scale);
 	transform.set_origin(ofs);
 	if (viewport.is_valid())
-		VisualServer::get_singleton()->viewport_set_canvas_transform(viewport, canvas->get_canvas(), transform);
+		VisualServer::get_singleton()->viewport_set_canvas_transform(viewport, canvas, transform);
 }
 
 void CanvasLayer::_update_locrotscale() {
@@ -133,11 +133,6 @@ Vector2 CanvasLayer::get_scale() const {
 	return scale;
 }
 
-Ref<World2D> CanvasLayer::get_world_2d() const {
-
-	return canvas;
-}
-
 void CanvasLayer::_notification(int p_what) {
 
 	switch (p_what) {
@@ -153,14 +148,14 @@ void CanvasLayer::_notification(int p_what) {
 			ERR_FAIL_COND(!vp);
 			viewport = vp->get_viewport_rid();
 
-			VisualServer::get_singleton()->viewport_attach_canvas(viewport, canvas->get_canvas());
-			VisualServer::get_singleton()->viewport_set_canvas_layer(viewport, canvas->get_canvas(), layer);
-			VisualServer::get_singleton()->viewport_set_canvas_transform(viewport, canvas->get_canvas(), transform);
+			VisualServer::get_singleton()->viewport_attach_canvas(viewport, canvas);
+			VisualServer::get_singleton()->viewport_set_canvas_layer(viewport, canvas, layer);
+			VisualServer::get_singleton()->viewport_set_canvas_transform(viewport, canvas, transform);
 
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
 
-			VisualServer::get_singleton()->viewport_remove_canvas(viewport, canvas->get_canvas());
+			VisualServer::get_singleton()->viewport_remove_canvas(viewport, canvas);
 			viewport = RID();
 
 		} break;
@@ -184,7 +179,7 @@ RID CanvasLayer::get_viewport() const {
 void CanvasLayer::set_custom_viewport(Node *p_viewport) {
 	ERR_FAIL_NULL(p_viewport);
 	if (is_inside_tree()) {
-		VisualServer::get_singleton()->viewport_remove_canvas(viewport, canvas->get_canvas());
+		VisualServer::get_singleton()->viewport_remove_canvas(viewport, canvas);
 		viewport = RID();
 	}
 
@@ -205,9 +200,9 @@ void CanvasLayer::set_custom_viewport(Node *p_viewport) {
 
 		viewport = vp->get_viewport_rid();
 
-		VisualServer::get_singleton()->viewport_attach_canvas(viewport, canvas->get_canvas());
-		VisualServer::get_singleton()->viewport_set_canvas_layer(viewport, canvas->get_canvas(), layer);
-		VisualServer::get_singleton()->viewport_set_canvas_transform(viewport, canvas->get_canvas(), transform);
+		VisualServer::get_singleton()->viewport_attach_canvas(viewport, canvas);
+		VisualServer::get_singleton()->viewport_set_canvas_layer(viewport, canvas, layer);
+		VisualServer::get_singleton()->viewport_set_canvas_transform(viewport, canvas, transform);
 	}
 }
 
@@ -225,6 +220,10 @@ int CanvasLayer::get_sort_index() {
 	return sort_index++;
 }
 
+RID CanvasLayer::get_canvas() const {
+
+	return canvas;
+}
 void CanvasLayer::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_layer", "layer"), &CanvasLayer::set_layer);
@@ -248,7 +247,7 @@ void CanvasLayer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_custom_viewport", "viewport"), &CanvasLayer::set_custom_viewport);
 	ClassDB::bind_method(D_METHOD("get_custom_viewport"), &CanvasLayer::get_custom_viewport);
 
-	ClassDB::bind_method(D_METHOD("get_world_2d"), &CanvasLayer::get_world_2d);
+	ClassDB::bind_method(D_METHOD("get_canvas"), &CanvasLayer::get_canvas);
 	//ClassDB::bind_method(D_METHOD("get_viewport"),&CanvasLayer::get_viewport);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "layer", PROPERTY_HINT_RANGE, "-128,128,1"), "set_layer", "get_layer");
@@ -268,8 +267,13 @@ CanvasLayer::CanvasLayer() {
 	rot = 0;
 	locrotscale_dirty = false;
 	layer = 1;
-	canvas = Ref<World2D>(memnew(World2D));
+	canvas = VS::get_singleton()->canvas_create();
 	custom_viewport = NULL;
 	custom_viewport_id = 0;
 	sort_index = 0;
 }
+
+CanvasLayer::~CanvasLayer() {
+
+	VS::get_singleton()->free(canvas);
+}
diff --git a/scene/main/canvas_layer.h b/scene/main/canvas_layer.h
index c3352a6dba..aae23fbb12 100644
--- a/scene/main/canvas_layer.h
+++ b/scene/main/canvas_layer.h
@@ -45,7 +45,7 @@ class CanvasLayer : public Node {
 	real_t rot;
 	int layer;
 	Transform2D transform;
-	Ref<World2D> canvas;
+	RID canvas;
 
 	ObjectID custom_viewport_id; // to check validity
 	Viewport *custom_viewport;
@@ -81,8 +81,6 @@ public:
 	void set_scale(const Size2 &p_scale);
 	Size2 get_scale() const;
 
-	Ref<World2D> get_world_2d() const;
-
 	Size2 get_viewport_size() const;
 
 	RID get_viewport() const;
@@ -93,7 +91,10 @@ public:
 	void reset_sort_index();
 	int get_sort_index();
 
+	RID get_canvas() const;
+
 	CanvasLayer();
+	~CanvasLayer();
 };
 
 #endif // CANVAS_LAYER_H
diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp
index 3d58aa65f8..ae21775c55 100644
--- a/scene/main/http_request.cpp
+++ b/scene/main/http_request.cpp
@@ -121,7 +121,7 @@ Error HTTPRequest::request(const String &p_url, const Vector<String> &p_custom_h
 	}
 
 	if (!has_user_agent) {
-		headers.push_back("User-Agent: GodotEngine/" + String(VERSION_MKSTRING) + " (" + OS::get_singleton()->get_name() + ")");
+		headers.push_back("User-Agent: GodotEngine/" + String(VERSION_FULL_BUILD) + " (" + OS::get_singleton()->get_name() + ")");
 	}
 
 	if (!has_accept) {
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index ac85dd64af..ec01490ae5 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -477,7 +477,7 @@ bool Node::is_network_master() const {
 
 	ERR_FAIL_COND_V(!is_inside_tree(), false);
 
-	return get_tree()->get_network_unique_id() == data.network_master;
+	return get_multiplayer_api()->get_network_unique_id() == data.network_master;
 }
 
 /***** RPC CONFIG ********/
@@ -667,200 +667,16 @@ Variant Node::_rpc_unreliable_id_bind(const Variant **p_args, int p_argcount, Va
 }
 
 void Node::rpcp(int p_peer_id, bool p_unreliable, const StringName &p_method, const Variant **p_arg, int p_argcount) {
-
 	ERR_FAIL_COND(!is_inside_tree());
-
-	bool skip_rpc = false;
-	bool call_local_native = false;
-	bool call_local_script = false;
-
-	if (p_peer_id == 0 || p_peer_id == get_tree()->get_network_unique_id() || (p_peer_id < 0 && p_peer_id != -get_tree()->get_network_unique_id())) {
-		//check that send mode can use local call
-
-		Map<StringName, RPCMode>::Element *E = data.rpc_methods.find(p_method);
-		if (E) {
-
-			switch (E->get()) {
-
-				case RPC_MODE_DISABLED: {
-					//do nothing
-				} break;
-				case RPC_MODE_REMOTE: {
-					//do nothing also, no need to call local
-				} break;
-				case RPC_MODE_SYNC: {
-					//call it, sync always results in call
-					call_local_native = true;
-				} break;
-				case RPC_MODE_MASTER: {
-					call_local_native = is_network_master();
-					if (call_local_native) {
-						skip_rpc = true; //no other master so..
-					}
-				} break;
-				case RPC_MODE_SLAVE: {
-					call_local_native = !is_network_master();
-				} break;
-			}
-		}
-
-		if (call_local_native) {
-			// done below
-		} else if (get_script_instance()) {
-			//attempt with script
-			ScriptInstance::RPCMode rpc_mode = get_script_instance()->get_rpc_mode(p_method);
-
-			switch (rpc_mode) {
-
-				case ScriptInstance::RPC_MODE_DISABLED: {
-					//do nothing
-				} break;
-				case ScriptInstance::RPC_MODE_REMOTE: {
-					//do nothing also, no need to call local
-				} break;
-				case ScriptInstance::RPC_MODE_SYNC: {
-					//call it, sync always results in call
-					call_local_script = true;
-				} break;
-				case ScriptInstance::RPC_MODE_MASTER: {
-					call_local_script = is_network_master();
-					if (call_local_script) {
-						skip_rpc = true; //no other master so..
-					}
-				} break;
-				case ScriptInstance::RPC_MODE_SLAVE: {
-					call_local_script = !is_network_master();
-				} break;
-			}
-		}
-	}
-
-	if (!skip_rpc) {
-		get_tree()->_rpc(this, p_peer_id, p_unreliable, false, p_method, p_arg, p_argcount);
-	}
-
-	if (call_local_native) {
-		Variant::CallError ce;
-		call(p_method, p_arg, p_argcount, ce);
-		if (ce.error != Variant::CallError::CALL_OK) {
-			String error = Variant::get_call_error_text(this, p_method, p_arg, p_argcount, ce);
-			error = "rpc() aborted in local call:  - " + error;
-			ERR_PRINTS(error);
-			return;
-		}
-	}
-
-	if (call_local_script) {
-		Variant::CallError ce;
-		ce.error = Variant::CallError::CALL_OK;
-		get_script_instance()->call(p_method, p_arg, p_argcount, ce);
-		if (ce.error != Variant::CallError::CALL_OK) {
-			String error = Variant::get_call_error_text(this, p_method, p_arg, p_argcount, ce);
-			error = "rpc() aborted in script local call:  - " + error;
-			ERR_PRINTS(error);
-			return;
-		}
-	}
+	get_multiplayer_api()->rpcp(this, p_peer_id, p_unreliable, p_method, p_arg, p_argcount);
 }
 
-/******** RSET *********/
-
 void Node::rsetp(int p_peer_id, bool p_unreliable, const StringName &p_property, const Variant &p_value) {
-
 	ERR_FAIL_COND(!is_inside_tree());
-
-	bool skip_rset = false;
-
-	if (p_peer_id == 0 || p_peer_id == get_tree()->get_network_unique_id() || (p_peer_id < 0 && p_peer_id != -get_tree()->get_network_unique_id())) {
-		//check that send mode can use local call
-
-		bool set_local = false;
-
-		Map<StringName, RPCMode>::Element *E = data.rpc_properties.find(p_property);
-		if (E) {
-
-			switch (E->get()) {
-
-				case RPC_MODE_DISABLED: {
-					//do nothing
-				} break;
-				case RPC_MODE_REMOTE: {
-					//do nothing also, no need to call local
-				} break;
-				case RPC_MODE_SYNC: {
-					//call it, sync always results in call
-					set_local = true;
-				} break;
-				case RPC_MODE_MASTER: {
-					set_local = is_network_master();
-					if (set_local) {
-						skip_rset = true;
-					}
-
-				} break;
-				case RPC_MODE_SLAVE: {
-					set_local = !is_network_master();
-				} break;
-			}
-		}
-
-		if (set_local) {
-			bool valid;
-			set(p_property, p_value, &valid);
-
-			if (!valid) {
-				String error = "rset() aborted in local set, property not found:  - " + String(p_property);
-				ERR_PRINTS(error);
-				return;
-			}
-		} else if (get_script_instance()) {
-			//attempt with script
-			ScriptInstance::RPCMode rpc_mode = get_script_instance()->get_rset_mode(p_property);
-
-			switch (rpc_mode) {
-
-				case ScriptInstance::RPC_MODE_DISABLED: {
-					//do nothing
-				} break;
-				case ScriptInstance::RPC_MODE_REMOTE: {
-					//do nothing also, no need to call local
-				} break;
-				case ScriptInstance::RPC_MODE_SYNC: {
-					//call it, sync always results in call
-					set_local = true;
-				} break;
-				case ScriptInstance::RPC_MODE_MASTER: {
-					set_local = is_network_master();
-					if (set_local) {
-						skip_rset = true;
-					}
-				} break;
-				case ScriptInstance::RPC_MODE_SLAVE: {
-					set_local = !is_network_master();
-				} break;
-			}
-
-			if (set_local) {
-
-				bool valid = get_script_instance()->set(p_property, p_value);
-
-				if (!valid) {
-					String error = "rset() aborted in local script set, property not found:  - " + String(p_property);
-					ERR_PRINTS(error);
-					return;
-				}
-			}
-		}
-	}
-
-	if (skip_rset)
-		return;
-
-	const Variant *vptr = &p_value;
-
-	get_tree()->_rpc(this, p_peer_id, p_unreliable, true, p_property, &vptr, 1);
+	get_multiplayer_api()->rsetp(this, p_peer_id, p_unreliable, p_property, p_value);
 }
 
+/******** RSET *********/
 void Node::rset(const StringName &p_property, const Variant &p_value) {
 
 	rsetp(0, false, p_property, p_value);
@@ -882,6 +698,30 @@ void Node::rset_unreliable_id(int p_peer_id, const StringName &p_property, const
 }
 
 //////////// end of rpc
+Ref<MultiplayerAPI> Node::get_multiplayer_api() const {
+	if (multiplayer_api.is_valid())
+		return multiplayer_api;
+	if (!is_inside_tree())
+		return Ref<MultiplayerAPI>();
+	return get_tree()->get_multiplayer_api();
+}
+
+Ref<MultiplayerAPI> Node::get_custom_multiplayer_api() const {
+	return multiplayer_api;
+}
+
+void Node::set_custom_multiplayer_api(Ref<MultiplayerAPI> p_multiplayer_api) {
+
+	multiplayer_api = p_multiplayer_api;
+}
+
+const Map<StringName, Node::RPCMode>::Element *Node::get_node_rpc_mode(const StringName &p_method) {
+	return data.rpc_methods.find(p_method);
+}
+
+const Map<StringName, Node::RPCMode>::Element *Node::get_node_rset_mode(const StringName &p_property) {
+	return data.rpc_properties.find(p_property);
+}
 
 bool Node::can_call_rpc(const StringName &p_method, int p_from) const {
 
@@ -2010,7 +1850,7 @@ void Node::set_editable_instance(Node *p_node, bool p_editable) {
 	if (!p_editable) {
 		data.editable_instances.erase(p);
 		// Avoid this flag being needlessly saved;
-		// also give more visual feedback if editable children is reenabled
+		// also give more visual feedback if editable children is re-enabled
 		set_display_folded(false);
 	} else {
 		data.editable_instances[p] = true;
@@ -2163,13 +2003,7 @@ Node *Node::_duplicate(int p_flags, Map<const Node *, Node *> *r_duplimap) const
 			if (name == script_property_name)
 				continue;
 
-			Variant value = N->get()->get(name);
-			// Duplicate dictionaries and arrays, mainly needed for __meta__
-			if (value.get_type() == Variant::DICTIONARY) {
-				value = Dictionary(value).duplicate();
-			} else if (value.get_type() == Variant::ARRAY) {
-				value = Array(value).duplicate();
-			}
+			Variant value = N->get()->get(name).duplicate(true);
 
 			if (E->get().usage & PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE) {
 
@@ -2313,13 +2147,7 @@ void Node::_duplicate_and_reown(Node *p_new_parent, const Map<Node *, Node *> &p
 			continue;
 		String name = E->get().name;
 
-		Variant value = get(name);
-		// Duplicate dictionaries and arrays, mainly needed for __meta__
-		if (value.get_type() == Variant::DICTIONARY) {
-			value = Dictionary(value).duplicate();
-		} else if (value.get_type() == Variant::ARRAY) {
-			value = Array(value).duplicate();
-		}
+		Variant value = get(name).duplicate(true);
 
 		node->set(name, value);
 	}
@@ -2502,7 +2330,10 @@ void Node::replace_by(Node *p_node, bool p_keep_data) {
 
 		Node *child = get_child(0);
 		remove_child(child);
-		p_node->add_child(child);
+		if (!child->is_owned_by_parent()) {
+			// add the custom children to the p_node
+			p_node->add_child(child);
+		}
 	}
 
 	p_node->set_owner(owner);
@@ -2886,6 +2717,9 @@ void Node::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("is_network_master"), &Node::is_network_master);
 
+	ClassDB::bind_method(D_METHOD("get_multiplayer_api"), &Node::get_multiplayer_api);
+	ClassDB::bind_method(D_METHOD("get_custom_multiplayer_api"), &Node::get_custom_multiplayer_api);
+	ClassDB::bind_method(D_METHOD("set_custom_multiplayer_api", "api"), &Node::set_custom_multiplayer_api);
 	ClassDB::bind_method(D_METHOD("rpc_config", "method", "mode"), &Node::rpc_config);
 	ClassDB::bind_method(D_METHOD("rset_config", "property", "mode"), &Node::rset_config);
 
@@ -2967,6 +2801,8 @@ void Node::_bind_methods() {
 	ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "name", PROPERTY_HINT_NONE, "", 0), "set_name", "get_name");
 	ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "filename", PROPERTY_HINT_NONE, "", 0), "set_filename", "get_filename");
 	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "owner", PROPERTY_HINT_RESOURCE_TYPE, "Node", 0), "set_owner", "get_owner");
+	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "multiplayer_api", PROPERTY_HINT_RESOURCE_TYPE, "MultiplayerAPI", 0), "", "get_multiplayer_api");
+	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "custom_multiplayer_api", PROPERTY_HINT_RESOURCE_TYPE, "MultiplayerAPI", 0), "set_custom_multiplayer_api", "get_custom_multiplayer_api");
 
 	BIND_VMETHOD(MethodInfo("_process", PropertyInfo(Variant::REAL, "delta")));
 	BIND_VMETHOD(MethodInfo("_physics_process", PropertyInfo(Variant::REAL, "delta")));
diff --git a/scene/main/node.h b/scene/main/node.h
index dc6bda4621..2e8716cbd1 100644
--- a/scene/main/node.h
+++ b/scene/main/node.h
@@ -104,7 +104,7 @@ private:
 		StringName name;
 		SceneTree *tree;
 		bool inside_tree;
-		bool ready_notified; //this is a small hack, so if a node is added during _ready() to the tree, it corretly gets the _ready() notification
+		bool ready_notified; //this is a small hack, so if a node is added during _ready() to the tree, it correctly gets the _ready() notification
 		bool ready_first;
 #ifdef TOOLS_ENABLED
 		NodePath import_path; //path used when imported, used by scene editors to keep tracking
@@ -151,6 +151,8 @@ private:
 		NAME_CASING_SNAKE_CASE
 	};
 
+	Ref<MultiplayerAPI> multiplayer_api;
+
 	void _print_tree(const Node *p_node);
 
 	Node *_get_node(const NodePath &p_path) const;
@@ -364,7 +366,7 @@ public:
 
 	void queue_delete();
 
-	//shitty hacks for speed
+	//hacks for speed
 	static void set_human_readable_collision_renaming(bool p_enabled);
 	static void init_node_hrcr();
 
@@ -403,15 +405,20 @@ public:
 	void rpc_id(int p_peer_id, const StringName &p_method, VARIANT_ARG_LIST); //rpc call, honors RPCMode
 	void rpc_unreliable_id(int p_peer_id, const StringName &p_method, VARIANT_ARG_LIST); //rpc call, honors RPCMode
 
-	void rpcp(int p_peer_id, bool p_unreliable, const StringName &p_method, const Variant **p_arg, int p_argcount);
-
 	void rset(const StringName &p_property, const Variant &p_value); //remote set call, honors RPCMode
 	void rset_unreliable(const StringName &p_property, const Variant &p_value); //remote set call, honors RPCMode
 	void rset_id(int p_peer_id, const StringName &p_property, const Variant &p_value); //remote set call, honors RPCMode
 	void rset_unreliable_id(int p_peer_id, const StringName &p_property, const Variant &p_value); //remote set call, honors RPCMode
 
+	void rpcp(int p_peer_id, bool p_unreliable, const StringName &p_method, const Variant **p_arg, int p_argcount);
 	void rsetp(int p_peer_id, bool p_unreliable, const StringName &p_property, const Variant &p_value);
 
+	Ref<MultiplayerAPI> get_multiplayer_api() const;
+	Ref<MultiplayerAPI> get_custom_multiplayer_api() const;
+	void set_custom_multiplayer_api(Ref<MultiplayerAPI> p_multiplayer_api);
+	const Map<StringName, RPCMode>::Element *get_node_rpc_mode(const StringName &p_method);
+	const Map<StringName, RPCMode>::Element *get_node_rset_mode(const StringName &p_property);
+
 	bool can_call_rpc(const StringName &p_method, int p_from) const;
 	bool can_call_rset(const StringName &p_property, int p_from) const;
 
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index 55ae9fe1ec..4419dfe70f 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -484,7 +484,7 @@ bool SceneTree::idle(float p_time) {
 
 	idle_process_time = p_time;
 
-	_network_poll();
+	multiplayer_api->poll();
 
 	emit_signal("idle_frame");
 
@@ -498,14 +498,14 @@ bool SceneTree::idle(float p_time) {
 	Size2 win_size = Size2(OS::get_singleton()->get_video_mode().width, OS::get_singleton()->get_video_mode().height);
 	if (win_size != last_screen_size) {
 
+		last_screen_size = win_size;
+		_update_root_rect();
+
 		if (use_font_oversampling) {
 			DynamicFontAtSize::font_oversampling = OS::get_singleton()->get_window_size().width / root->get_visible_rect().size.width;
 			DynamicFont::update_oversampling();
 		}
 
-		last_screen_size = win_size;
-		_update_root_rect();
-
 		emit_signal("screen_resized");
 	}
 
@@ -615,6 +615,8 @@ void SceneTree::_notification(int p_notification) {
 			}
 		} break;
 		case NOTIFICATION_OS_MEMORY_WARNING:
+		case NOTIFICATION_WM_MOUSE_ENTER:
+		case NOTIFICATION_WM_MOUSE_EXIT:
 		case NOTIFICATION_WM_FOCUS_IN:
 		case NOTIFICATION_WM_FOCUS_OUT: {
 
@@ -1631,16 +1633,11 @@ Ref<SceneTreeTimer> SceneTree::create_timer(float p_delay_sec, bool p_process_pa
 
 void SceneTree::_network_peer_connected(int p_id) {
 
-	connected_peers.insert(p_id);
-	path_get_cache.insert(p_id, PathGetCache());
-
 	emit_signal("network_peer_connected", p_id);
 }
 
 void SceneTree::_network_peer_disconnected(int p_id) {
 
-	connected_peers.erase(p_id);
-	path_get_cache.erase(p_id); //I no longer need your cache, sorry
 	emit_signal("network_peer_disconnected", p_id);
 }
 
@@ -1659,471 +1656,70 @@ void SceneTree::_server_disconnected() {
 	emit_signal("server_disconnected");
 }
 
-void SceneTree::set_network_peer(const Ref<NetworkedMultiplayerPeer> &p_network_peer) {
-	if (network_peer.is_valid()) {
-		network_peer->disconnect("peer_connected", this, "_network_peer_connected");
-		network_peer->disconnect("peer_disconnected", this, "_network_peer_disconnected");
-		network_peer->disconnect("connection_succeeded", this, "_connected_to_server");
-		network_peer->disconnect("connection_failed", this, "_connection_failed");
-		network_peer->disconnect("server_disconnected", this, "_server_disconnected");
-		connected_peers.clear();
-		path_get_cache.clear();
-		path_send_cache.clear();
-		last_send_cache_id = 1;
+Ref<MultiplayerAPI> SceneTree::get_multiplayer_api() const {
+	return multiplayer_api;
+}
+
+void SceneTree::set_multiplayer_api(Ref<MultiplayerAPI> p_multiplayer_api) {
+	ERR_FAIL_COND(!p_multiplayer_api.is_valid());
+
+	if (multiplayer_api.is_valid()) {
+		multiplayer_api->disconnect("network_peer_connected", this, "_network_peer_connected");
+		multiplayer_api->disconnect("network_peer_disconnected", this, "_network_peer_disconnected");
+		multiplayer_api->disconnect("connected_to_server", this, "_connected_to_server");
+		multiplayer_api->disconnect("connection_failed", this, "_connection_failed");
+		multiplayer_api->disconnect("server_disconnected", this, "_server_disconnected");
 	}
 
-	ERR_EXPLAIN("Supplied NetworkedNetworkPeer must be connecting or connected.");
-	ERR_FAIL_COND(p_network_peer.is_valid() && p_network_peer->get_connection_status() == NetworkedMultiplayerPeer::CONNECTION_DISCONNECTED);
+	multiplayer_api = p_multiplayer_api;
+	multiplayer_api->set_root_node(root);
 
-	network_peer = p_network_peer;
+	multiplayer_api->connect("network_peer_connected", this, "_network_peer_connected");
+	multiplayer_api->connect("network_peer_disconnected", this, "_network_peer_disconnected");
+	multiplayer_api->connect("connected_to_server", this, "_connected_to_server");
+	multiplayer_api->connect("connection_failed", this, "_connection_failed");
+	multiplayer_api->connect("server_disconnected", this, "_server_disconnected");
+}
 
-	if (network_peer.is_valid()) {
-		network_peer->connect("peer_connected", this, "_network_peer_connected");
-		network_peer->connect("peer_disconnected", this, "_network_peer_disconnected");
-		network_peer->connect("connection_succeeded", this, "_connected_to_server");
-		network_peer->connect("connection_failed", this, "_connection_failed");
-		network_peer->connect("server_disconnected", this, "_server_disconnected");
-	}
+void SceneTree::set_network_peer(const Ref<NetworkedMultiplayerPeer> &p_network_peer) {
+
+	multiplayer_api->set_network_peer(p_network_peer);
 }
 
 Ref<NetworkedMultiplayerPeer> SceneTree::get_network_peer() const {
 
-	return network_peer;
+	return multiplayer_api->get_network_peer();
 }
 
 bool SceneTree::is_network_server() const {
 
-	ERR_FAIL_COND_V(!network_peer.is_valid(), false);
-	return network_peer->is_server();
+	return multiplayer_api->is_network_server();
 }
 
 bool SceneTree::has_network_peer() const {
-	return network_peer.is_valid();
+	return multiplayer_api->has_network_peer();
 }
 
 int SceneTree::get_network_unique_id() const {
 
-	ERR_FAIL_COND_V(!network_peer.is_valid(), 0);
-	return network_peer->get_unique_id();
+	return multiplayer_api->get_network_unique_id();
 }
 
 Vector<int> SceneTree::get_network_connected_peers() const {
-	ERR_FAIL_COND_V(!network_peer.is_valid(), Vector<int>());
-
-	Vector<int> ret;
-	for (Set<int>::Element *E = connected_peers.front(); E; E = E->next()) {
-		ret.push_back(E->get());
-	}
 
-	return ret;
+	return multiplayer_api->get_network_connected_peers();
 }
 
 int SceneTree::get_rpc_sender_id() const {
-	return rpc_sender_id;
+	return multiplayer_api->get_rpc_sender_id();
 }
 
 void SceneTree::set_refuse_new_network_connections(bool p_refuse) {
-	ERR_FAIL_COND(!network_peer.is_valid());
-	network_peer->set_refuse_new_connections(p_refuse);
+	multiplayer_api->set_refuse_new_network_connections(p_refuse);
 }
 
 bool SceneTree::is_refusing_new_network_connections() const {
-
-	ERR_FAIL_COND_V(!network_peer.is_valid(), false);
-
-	return network_peer->is_refusing_new_connections();
-}
-
-void SceneTree::_rpc(Node *p_from, int p_to, bool p_unreliable, bool p_set, const StringName &p_name, const Variant **p_arg, int p_argcount) {
-
-	if (network_peer.is_null()) {
-		ERR_EXPLAIN("Attempt to remote call/set when networking is not active in SceneTree.");
-		ERR_FAIL();
-	}
-
-	if (network_peer->get_connection_status() == NetworkedMultiplayerPeer::CONNECTION_CONNECTING) {
-		ERR_EXPLAIN("Attempt to remote call/set when networking is not connected yet in SceneTree.");
-		ERR_FAIL();
-	}
-
-	if (network_peer->get_connection_status() == NetworkedMultiplayerPeer::CONNECTION_DISCONNECTED) {
-		ERR_EXPLAIN("Attempt to remote call/set when networking is disconnected.");
-		ERR_FAIL();
-	}
-
-	if (p_argcount > 255) {
-		ERR_EXPLAIN("Too many arguments >255.");
-		ERR_FAIL();
-	}
-
-	if (p_to != 0 && !connected_peers.has(ABS(p_to))) {
-		if (p_to == get_network_unique_id()) {
-			ERR_EXPLAIN("Attempt to remote call/set yourself! unique ID: " + itos(get_network_unique_id()));
-		} else {
-			ERR_EXPLAIN("Attempt to remote call unexisting ID: " + itos(p_to));
-		}
-
-		ERR_FAIL();
-	}
-
-	NodePath from_path = p_from->get_path();
-	ERR_FAIL_COND(from_path.is_empty());
-
-	//see if the path is cached
-	PathSentCache *psc = path_send_cache.getptr(from_path);
-	if (!psc) {
-		//path is not cached, create
-		path_send_cache[from_path] = PathSentCache();
-		psc = path_send_cache.getptr(from_path);
-		psc->id = last_send_cache_id++;
-	}
-
-	//create base packet, lots of harcode because it must be tight
-
-	int ofs = 0;
-
-#define MAKE_ROOM(m_amount) \
-	if (packet_cache.size() < m_amount) packet_cache.resize(m_amount);
-
-	//encode type
-	MAKE_ROOM(1);
-	packet_cache[0] = p_set ? NETWORK_COMMAND_REMOTE_SET : NETWORK_COMMAND_REMOTE_CALL;
-	ofs += 1;
-
-	//encode ID
-	MAKE_ROOM(ofs + 4);
-	encode_uint32(psc->id, &packet_cache[ofs]);
-	ofs += 4;
-
-	//encode function name
-	CharString name = String(p_name).utf8();
-	int len = encode_cstring(name.get_data(), NULL);
-	MAKE_ROOM(ofs + len);
-	encode_cstring(name.get_data(), &packet_cache[ofs]);
-	ofs += len;
-
-	if (p_set) {
-		//set argument
-		Error err = encode_variant(*p_arg[0], NULL, len);
-		ERR_FAIL_COND(err != OK);
-		MAKE_ROOM(ofs + len);
-		encode_variant(*p_arg[0], &packet_cache[ofs], len);
-		ofs += len;
-
-	} else {
-		//call arguments
-		MAKE_ROOM(ofs + 1);
-		packet_cache[ofs] = p_argcount;
-		ofs += 1;
-		for (int i = 0; i < p_argcount; i++) {
-			Error err = encode_variant(*p_arg[i], NULL, len);
-			ERR_FAIL_COND(err != OK);
-			MAKE_ROOM(ofs + len);
-			encode_variant(*p_arg[i], &packet_cache[ofs], len);
-			ofs += len;
-		}
-	}
-
-	//see if all peers have cached path (is so, call can be fast)
-	bool has_all_peers = true;
-
-	List<int> peers_to_add; //if one is missing, take note to add it
-
-	for (Set<int>::Element *E = connected_peers.front(); E; E = E->next()) {
-
-		if (p_to < 0 && E->get() == -p_to)
-			continue; //continue, excluded
-
-		if (p_to > 0 && E->get() != p_to)
-			continue; //continue, not for this peer
-
-		Map<int, bool>::Element *F = psc->confirmed_peers.find(E->get());
-
-		if (!F || F->get() == false) {
-			//path was not cached, or was cached but is unconfirmed
-			if (!F) {
-				//not cached at all, take note
-				peers_to_add.push_back(E->get());
-			}
-
-			has_all_peers = false;
-		}
-	}
-
-	//those that need to be added, send a message for this
-
-	for (List<int>::Element *E = peers_to_add.front(); E; E = E->next()) {
-
-		//encode function name
-		CharString pname = String(from_path).utf8();
-		int len = encode_cstring(pname.get_data(), NULL);
-
-		Vector<uint8_t> packet;
-
-		packet.resize(1 + 4 + len);
-		packet[0] = NETWORK_COMMAND_SIMPLIFY_PATH;
-		encode_uint32(psc->id, &packet[1]);
-		encode_cstring(pname.get_data(), &packet[5]);
-
-		network_peer->set_target_peer(E->get()); //to all of you
-		network_peer->set_transfer_mode(NetworkedMultiplayerPeer::TRANSFER_MODE_RELIABLE);
-		network_peer->put_packet(packet.ptr(), packet.size());
-
-		psc->confirmed_peers.insert(E->get(), false); //insert into confirmed, but as false since it was not confirmed
-	}
-
-	//take chance and set transfer mode, since all send methods will use it
-	network_peer->set_transfer_mode(p_unreliable ? NetworkedMultiplayerPeer::TRANSFER_MODE_UNRELIABLE : NetworkedMultiplayerPeer::TRANSFER_MODE_RELIABLE);
-
-	if (has_all_peers) {
-
-		//they all have verified paths, so send fast
-		network_peer->set_target_peer(p_to); //to all of you
-		network_peer->put_packet(packet_cache.ptr(), ofs); //a message with love
-	} else {
-		//not all verified path, so send one by one
-
-		//apend path at the end, since we will need it for some packets
-		CharString pname = String(from_path).utf8();
-		int path_len = encode_cstring(pname.get_data(), NULL);
-		MAKE_ROOM(ofs + path_len);
-		encode_cstring(pname.get_data(), &packet_cache[ofs]);
-
-		for (Set<int>::Element *E = connected_peers.front(); E; E = E->next()) {
-
-			if (p_to < 0 && E->get() == -p_to)
-				continue; //continue, excluded
-
-			if (p_to > 0 && E->get() != p_to)
-				continue; //continue, not for this peer
-
-			Map<int, bool>::Element *F = psc->confirmed_peers.find(E->get());
-			ERR_CONTINUE(!F); //should never happen
-
-			network_peer->set_target_peer(E->get()); //to this one specifically
-
-			if (F->get() == true) {
-				//this one confirmed path, so use id
-				encode_uint32(psc->id, &packet_cache[1]);
-				network_peer->put_packet(packet_cache.ptr(), ofs);
-			} else {
-				//this one did not confirm path yet, so use entire path (sorry!)
-				encode_uint32(0x80000000 | ofs, &packet_cache[1]); //offset to path and flag
-				network_peer->put_packet(packet_cache.ptr(), ofs + path_len);
-			}
-		}
-	}
-}
-
-void SceneTree::_network_process_packet(int p_from, const uint8_t *p_packet, int p_packet_len) {
-
-	ERR_FAIL_COND(p_packet_len < 5);
-
-	uint8_t packet_type = p_packet[0];
-
-	switch (packet_type) {
-
-		case NETWORK_COMMAND_REMOTE_CALL:
-		case NETWORK_COMMAND_REMOTE_SET: {
-
-			ERR_FAIL_COND(p_packet_len < 5);
-			uint32_t target = decode_uint32(&p_packet[1]);
-
-			Node *node = NULL;
-
-			if (target & 0x80000000) {
-				//use full path (not cached yet)
-
-				int ofs = target & 0x7FFFFFFF;
-				ERR_FAIL_COND(ofs >= p_packet_len);
-
-				String paths;
-				paths.parse_utf8((const char *)&p_packet[ofs], p_packet_len - ofs);
-
-				NodePath np = paths;
-
-				node = get_root()->get_node(np);
-				if (node == NULL) {
-					ERR_EXPLAIN("Failed to get path from RPC: " + String(np));
-					ERR_FAIL_COND(node == NULL);
-				}
-			} else {
-				//use cached path
-				int id = target;
-
-				Map<int, PathGetCache>::Element *E = path_get_cache.find(p_from);
-				ERR_FAIL_COND(!E);
-
-				Map<int, PathGetCache::NodeInfo>::Element *F = E->get().nodes.find(id);
-				ERR_FAIL_COND(!F);
-
-				PathGetCache::NodeInfo *ni = &F->get();
-				//do proper caching later
-
-				node = get_root()->get_node(ni->path);
-				if (node == NULL) {
-					ERR_EXPLAIN("Failed to get cached path from RPC: " + String(ni->path));
-					ERR_FAIL_COND(node == NULL);
-				}
-			}
-
-			ERR_FAIL_COND(p_packet_len < 6);
-
-			//detect cstring end
-			int len_end = 5;
-			for (; len_end < p_packet_len; len_end++) {
-				if (p_packet[len_end] == 0) {
-					break;
-				}
-			}
-
-			ERR_FAIL_COND(len_end >= p_packet_len);
-
-			StringName name = String::utf8((const char *)&p_packet[5]);
-
-			if (packet_type == NETWORK_COMMAND_REMOTE_CALL) {
-
-				if (!node->can_call_rpc(name, p_from))
-					return;
-
-				int ofs = len_end + 1;
-
-				ERR_FAIL_COND(ofs >= p_packet_len);
-
-				int argc = p_packet[ofs];
-				Vector<Variant> args;
-				Vector<const Variant *> argp;
-				args.resize(argc);
-				argp.resize(argc);
-
-				ofs++;
-
-				for (int i = 0; i < argc; i++) {
-
-					ERR_FAIL_COND(ofs >= p_packet_len);
-					int vlen;
-					Error err = decode_variant(args[i], &p_packet[ofs], p_packet_len - ofs, &vlen);
-					ERR_FAIL_COND(err != OK);
-					//args[i]=p_packet[3+i];
-					argp[i] = &args[i];
-					ofs += vlen;
-				}
-
-				Variant::CallError ce;
-
-				node->call(name, (const Variant **)argp.ptr(), argc, ce);
-				if (ce.error != Variant::CallError::CALL_OK) {
-					String error = Variant::get_call_error_text(node, name, (const Variant **)argp.ptr(), argc, ce);
-					error = "RPC - " + error;
-					ERR_PRINTS(error);
-				}
-
-			} else {
-
-				if (!node->can_call_rset(name, p_from))
-					return;
-
-				int ofs = len_end + 1;
-
-				ERR_FAIL_COND(ofs >= p_packet_len);
-
-				Variant value;
-				decode_variant(value, &p_packet[ofs], p_packet_len - ofs);
-
-				bool valid;
-
-				node->set(name, value, &valid);
-				if (!valid) {
-					String error = "Error setting remote property '" + String(name) + "', not found in object of type " + node->get_class();
-					ERR_PRINTS(error);
-				}
-			}
-
-		} break;
-		case NETWORK_COMMAND_SIMPLIFY_PATH: {
-
-			ERR_FAIL_COND(p_packet_len < 5);
-			int id = decode_uint32(&p_packet[1]);
-
-			String paths;
-			paths.parse_utf8((const char *)&p_packet[5], p_packet_len - 5);
-
-			NodePath path = paths;
-
-			if (!path_get_cache.has(p_from)) {
-				path_get_cache[p_from] = PathGetCache();
-			}
-
-			PathGetCache::NodeInfo ni;
-			ni.path = path;
-			ni.instance = 0;
-
-			path_get_cache[p_from].nodes[id] = ni;
-
-			{
-				//send ack
-
-				//encode path
-				CharString pname = String(path).utf8();
-				int len = encode_cstring(pname.get_data(), NULL);
-
-				Vector<uint8_t> packet;
-
-				packet.resize(1 + len);
-				packet[0] = NETWORK_COMMAND_CONFIRM_PATH;
-				encode_cstring(pname.get_data(), &packet[1]);
-
-				network_peer->set_transfer_mode(NetworkedMultiplayerPeer::TRANSFER_MODE_RELIABLE);
-				network_peer->set_target_peer(p_from);
-				network_peer->put_packet(packet.ptr(), packet.size());
-			}
-		} break;
-		case NETWORK_COMMAND_CONFIRM_PATH: {
-
-			String paths;
-			paths.parse_utf8((const char *)&p_packet[1], p_packet_len - 1);
-
-			NodePath path = paths;
-
-			PathSentCache *psc = path_send_cache.getptr(path);
-			ERR_FAIL_COND(!psc);
-
-			Map<int, bool>::Element *E = psc->confirmed_peers.find(p_from);
-			ERR_FAIL_COND(!E);
-			E->get() = true;
-		} break;
-	}
-}
-
-void SceneTree::_network_poll() {
-
-	if (!network_peer.is_valid() || network_peer->get_connection_status() == NetworkedMultiplayerPeer::CONNECTION_DISCONNECTED)
-		return;
-
-	network_peer->poll();
-
-	if (!network_peer.is_valid()) //it's possible that polling might have resulted in a disconnection, so check here
-		return;
-
-	while (network_peer->get_available_packet_count()) {
-
-		int sender = network_peer->get_packet_peer();
-		const uint8_t *packet;
-		int len;
-
-		Error err = network_peer->get_packet(&packet, len);
-		if (err != OK) {
-			ERR_PRINT("Error getting packet!");
-		}
-
-		rpc_sender_id = sender;
-		_network_process_packet(sender, packet, len);
-		rpc_sender_id = 0;
-
-		if (!network_peer.is_valid()) {
-			break; //it's also possible that a packet or RPC caused a disconnection, so also check here
-		}
-	}
+	return multiplayer_api->is_refusing_new_network_connections();
 }
 
 void SceneTree::_bind_methods() {
@@ -2194,6 +1790,8 @@ void SceneTree::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("_change_scene"), &SceneTree::_change_scene);
 
+	ClassDB::bind_method(D_METHOD("set_multiplayer_api", "multiplayer_api"), &SceneTree::set_multiplayer_api);
+	ClassDB::bind_method(D_METHOD("get_multiplayer_api"), &SceneTree::get_multiplayer_api);
 	ClassDB::bind_method(D_METHOD("set_network_peer", "peer"), &SceneTree::set_network_peer);
 	ClassDB::bind_method(D_METHOD("get_network_peer"), &SceneTree::get_network_peer);
 	ClassDB::bind_method(D_METHOD("is_network_server"), &SceneTree::is_network_server);
@@ -2223,6 +1821,7 @@ void SceneTree::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "current_scene", PROPERTY_HINT_RESOURCE_TYPE, "Node", 0), "set_current_scene", "get_current_scene");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "network_peer", PROPERTY_HINT_RESOURCE_TYPE, "NetworkedMultiplayerPeer", 0), "set_network_peer", "get_network_peer");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "root", PROPERTY_HINT_RESOURCE_TYPE, "Node", 0), "", "get_root");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multiplayer_api", PROPERTY_HINT_RESOURCE_TYPE, "MultiplayerAPI", 0), "set_multiplayer_api", "get_multiplayer_api");
 
 	ADD_SIGNAL(MethodInfo("tree_changed"));
 	ADD_SIGNAL(MethodInfo("node_added", PropertyInfo(Variant::OBJECT, "node")));
@@ -2318,7 +1917,6 @@ SceneTree::SceneTree() {
 	call_lock = 0;
 	root_lock = 0;
 	node_count = 0;
-	rpc_sender_id = 0;
 
 	//create with mainloop
 
@@ -2327,6 +1925,9 @@ SceneTree::SceneTree() {
 	if (!root->get_world().is_valid())
 		root->set_world(Ref<World>(memnew(World)));
 
+	// Initialize network state
+	set_multiplayer_api(Ref<MultiplayerAPI>(memnew(MultiplayerAPI)));
+
 	//root->set_world_2d( Ref<World2D>( memnew( World2D )));
 	root->set_as_audio_listener(true);
 	root->set_as_audio_listener_2d(true);
@@ -2421,8 +2022,6 @@ SceneTree::SceneTree() {
 
 	live_edit_root = NodePath("/root");
 
-	last_send_cache_id = 1;
-
 #endif
 
 	use_font_oversampling = false;
diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h
index c5357762ec..203c1d9c9c 100644
--- a/scene/main/scene_tree.h
+++ b/scene/main/scene_tree.h
@@ -31,7 +31,7 @@
 #ifndef SCENE_MAIN_LOOP_H
 #define SCENE_MAIN_LOOP_H
 
-#include "io/networked_multiplayer_peer.h"
+#include "io/multiplayer_api.h"
 #include "os/main_loop.h"
 #include "os/thread_safe.h"
 #include "scene/resources/mesh.h"
@@ -185,16 +185,8 @@ private:
 
 	///network///
 
-	enum NetworkCommands {
-		NETWORK_COMMAND_REMOTE_CALL,
-		NETWORK_COMMAND_REMOTE_SET,
-		NETWORK_COMMAND_SIMPLIFY_PATH,
-		NETWORK_COMMAND_CONFIRM_PATH,
-	};
-
-	Ref<NetworkedMultiplayerPeer> network_peer;
+	Ref<MultiplayerAPI> multiplayer_api;
 
-	Set<int> connected_peers;
 	void _network_peer_connected(int p_id);
 	void _network_peer_disconnected(int p_id);
 
@@ -202,39 +194,9 @@ private:
 	void _connection_failed();
 	void _server_disconnected();
 
-	int rpc_sender_id;
-
-	//path sent caches
-	struct PathSentCache {
-		Map<int, bool> confirmed_peers;
-		int id;
-	};
-
-	HashMap<NodePath, PathSentCache> path_send_cache;
-	int last_send_cache_id;
-
-	//path get caches
-	struct PathGetCache {
-		struct NodeInfo {
-			NodePath path;
-			ObjectID instance;
-		};
-
-		Map<int, NodeInfo> nodes;
-	};
-
-	Map<int, PathGetCache> path_get_cache;
-
-	Vector<uint8_t> packet_cache;
-
-	void _network_process_packet(int p_from, const uint8_t *p_packet, int p_packet_len);
-	void _network_poll();
-
 	static SceneTree *singleton;
 	friend class Node;
 
-	void _rpc(Node *p_from, int p_to, bool p_unreliable, bool p_set, const StringName &p_name, const Variant **p_arg, int p_argcount);
-
 	void tree_changed();
 	void node_added(Node *p_node);
 	void node_removed(Node *p_node);
@@ -450,6 +412,8 @@ public:
 
 	//network API
 
+	Ref<MultiplayerAPI> get_multiplayer_api() const;
+	void set_multiplayer_api(Ref<MultiplayerAPI> p_multiplayer_api);
 	void set_network_peer(const Ref<NetworkedMultiplayerPeer> &p_network_peer);
 	Ref<NetworkedMultiplayerPeer> get_network_peer() const;
 	bool is_network_server() const;
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 1ff1f4b6d8..45a969eeda 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -181,6 +181,7 @@ public:
 Viewport::GUI::GUI() {
 
 	mouse_focus = NULL;
+	mouse_click_grabber = NULL;
 	mouse_focus_button = -1;
 	key_focus = NULL;
 	mouse_over = NULL;
@@ -192,6 +193,7 @@ Viewport::GUI::GUI() {
 }
 
 /////////////////////////////////////
+
 void Viewport::_update_stretch_transform() {
 
 	if (size_override_stretch && size_override) {
@@ -318,6 +320,11 @@ void Viewport::_notification(int p_what) {
 					first->make_current();
 			}
 #endif
+
+			// Enable processing for tooltips, collision debugging, physics object picking, etc.
+			set_process_internal(true);
+			set_physics_process_internal(true);
+
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
 
@@ -345,15 +352,18 @@ void Viewport::_notification(int p_what) {
 			VS::get_singleton()->viewport_set_active(viewport, false);
 
 		} break;
-		case NOTIFICATION_PHYSICS_PROCESS: {
+		case NOTIFICATION_INTERNAL_PROCESS: {
 
 			if (gui.tooltip_timer >= 0) {
-				gui.tooltip_timer -= get_physics_process_delta_time();
+				gui.tooltip_timer -= get_process_delta_time();
 				if (gui.tooltip_timer < 0) {
 					_gui_show_tooltip();
 				}
 			}
 
+		} break;
+		case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
+
 			if (get_tree()->is_debugging_collisions_hint() && contact_2d_debug.is_valid()) {
 
 				VisualServer::get_singleton()->canvas_item_clear(contact_2d_debug);
@@ -1925,6 +1935,8 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 	Ref<InputEventGesture> gesture_event = p_event;
 	if (gesture_event.is_valid()) {
 
+		gui.key_event_accepted = false;
+
 		_gui_cancel_tooltip();
 
 		Size2 pos = gesture_event->get_position();
@@ -2017,6 +2029,9 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 				top->notification(Control::NOTIFICATION_MODAL_CLOSE);
 				top->_modal_stack_remove();
 				top->hide();
+				// Close modal, set input as handled
+				get_tree()->set_input_as_handled();
+				return;
 			}
 		}
 
@@ -2264,7 +2279,7 @@ List<Control *>::Element *Viewport::_gui_show_modal(Control *p_control) {
 	else
 		p_control->_modal_set_prev_focus_owner(0);
 
-	if (gui.mouse_focus && !p_control->is_a_parent_of(gui.mouse_focus)) {
+	if (gui.mouse_focus && !p_control->is_a_parent_of(gui.mouse_focus) && !gui.mouse_click_grabber) {
 		Ref<InputEventMouseButton> mb;
 		mb.instance();
 		mb->set_position(gui.mouse_focus->get_local_mouse_position());
@@ -2286,9 +2301,22 @@ Control *Viewport::_gui_get_focus_owner() {
 
 void Viewport::_gui_grab_click_focus(Control *p_control) {
 
+	gui.mouse_click_grabber = p_control;
+	call_deferred("_post_gui_grab_click_focus");
+}
+
+void Viewport::_post_gui_grab_click_focus() {
+
+	Control *focus_grabber = gui.mouse_click_grabber;
+	if (!focus_grabber) {
+		// Redundant grab requests were made
+		return;
+	}
+	gui.mouse_click_grabber = NULL;
+
 	if (gui.mouse_focus) {
 
-		if (gui.mouse_focus == p_control)
+		if (gui.mouse_focus == focus_grabber)
 			return;
 		Ref<InputEventMouseButton> mb;
 		mb.instance();
@@ -2299,9 +2327,9 @@ void Viewport::_gui_grab_click_focus(Control *p_control) {
 		mb->set_position(click);
 		mb->set_button_index(gui.mouse_focus_button);
 		mb->set_pressed(false);
-		gui.mouse_focus->call_deferred(SceneStringNames::get_singleton()->_gui_input, mb);
+		gui.mouse_focus->call_multilevel(SceneStringNames::get_singleton()->_gui_input, mb);
 
-		gui.mouse_focus = p_control;
+		gui.mouse_focus = focus_grabber;
 		gui.focus_inv_xform = gui.mouse_focus->get_global_transform_with_canvas().affine_inverse();
 		click = gui.mouse_focus->get_global_transform_with_canvas().affine_inverse().xform(gui.last_mouse_pos);
 		mb->set_position(click);
@@ -2404,9 +2432,14 @@ Rect2 Viewport::get_attach_to_screen_rect() const {
 void Viewport::set_physics_object_picking(bool p_enable) {
 
 	physics_object_picking = p_enable;
-	set_physics_process(physics_object_picking);
-	if (!physics_object_picking)
+	if (!physics_object_picking) {
 		physics_picking_events.clear();
+	}
+}
+
+bool Viewport::get_physics_object_picking() {
+
+	return physics_object_picking;
 }
 
 Vector2 Viewport::get_camera_coords(const Vector2 &p_viewport_coords) const {
@@ -2420,11 +2453,6 @@ Vector2 Viewport::get_camera_rect_size() const {
 	return size;
 }
 
-bool Viewport::get_physics_object_picking() {
-
-	return physics_object_picking;
-}
-
 bool Viewport::gui_has_modal_stack() const {
 
 	return gui.modal_stack.size();
@@ -2634,6 +2662,7 @@ void Viewport::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("_gui_show_tooltip"), &Viewport::_gui_show_tooltip);
 	ClassDB::bind_method(D_METHOD("_gui_remove_focus"), &Viewport::_gui_remove_focus);
+	ClassDB::bind_method(D_METHOD("_post_gui_grab_click_focus"), &Viewport::_post_gui_grab_click_focus);
 
 	ClassDB::bind_method(D_METHOD("set_shadow_atlas_size", "size"), &Viewport::set_shadow_atlas_size);
 	ClassDB::bind_method(D_METHOD("get_shadow_atlas_size"), &Viewport::get_shadow_atlas_size);
@@ -2789,6 +2818,7 @@ Viewport::Viewport() {
 	gui.drag_preview = NULL;
 	gui.drag_attempted = false;
 	gui.canvas_sort_index = 0;
+	gui.roots_order_dirty = false;
 
 	msaa = MSAA_DISABLED;
 	hdr = true;
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index 07bbd3f1fa..94e49033e0 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -248,6 +248,7 @@ private:
 
 		bool key_event_accepted;
 		Control *mouse_focus;
+		Control *mouse_click_grabber;
 		int mouse_focus_button;
 		Control *key_focus;
 		Control *mouse_over;
@@ -323,6 +324,7 @@ private:
 	bool _gui_control_has_focus(const Control *p_control);
 	void _gui_control_grab_focus(Control *p_control);
 	void _gui_grab_click_focus(Control *p_control);
+	void _post_gui_grab_click_focus();
 	void _gui_accept_event();
 
 	Control *_gui_get_focus_owner();