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

1 files changed, 50 insertions, 1 deletions

diff --git a/tools/editor/editor_run_native.cpp b/tools/editor/editor_run_native.cpp
index 83b1753ea2..2eedba93dc 100644
--- a/tools/editor/editor_run_native.cpp
+++ b/tools/editor/editor_run_native.cpp
@@ -101,12 +101,28 @@ void EditorRunNative::_run_native(int p_idx,const String& p_platform) {
 
 	Ref<EditorExportPlatform> eep = EditorImportExport::get_singleton()->get_export_platform(p_platform);
 	ERR_FAIL_COND(eep.is_null());
-	eep->run(p_idx,deploy_dumb);
+	if (deploy_debug_remote) {
+		emit_signal("native_run");
+
+	}
+	int flags=0;
+	if (deploy_debug_remote)
+		flags|=EditorExportPlatform::EXPORT_REMOTE_DEBUG;
+	if (deploy_dumb)
+		flags|=EditorExportPlatform::EXPORT_DUMB_CLIENT;
+	if (debug_collisions)
+		flags|=EditorExportPlatform::EXPORT_VIEW_COLLISONS;
+	if (debug_navigation)
+		flags|=EditorExportPlatform::EXPORT_VIEW_NAVIGATION;
+
+	eep->run(p_idx,flags);
 }
 
 void EditorRunNative::_bind_methods() {
 
 	ObjectTypeDB::bind_method("_run_native",&EditorRunNative::_run_native);
+
+	ADD_SIGNAL(MethodInfo("native_run"));
 }
 
 void EditorRunNative::set_deploy_dumb(bool p_enabled) {
@@ -119,10 +135,43 @@ bool EditorRunNative::is_deploy_dumb_enabled() const{
 	return deploy_dumb;
 }
 
+void EditorRunNative::set_deploy_debug_remote(bool p_enabled) {
+
+	deploy_debug_remote=p_enabled;
+}
+
+bool EditorRunNative::is_deploy_debug_remote_enabled() const{
+
+	return deploy_debug_remote;
+}
+
+void EditorRunNative::set_debug_collisions(bool p_debug) {
+
+	debug_collisions=p_debug;
+}
+
+bool EditorRunNative::get_debug_collisions() const{
+
+	return debug_collisions;
+}
+
+void EditorRunNative::set_debug_navigation(bool p_debug) {
+
+	debug_navigation=p_debug;
+}
+
+bool EditorRunNative::get_debug_navigation() const{
+
+	return debug_navigation;
+}
 
 EditorRunNative::EditorRunNative()
 {
 	set_process(true);
 	first=true;
 	deploy_dumb=false;
+	deploy_debug_remote=false;
+	debug_collisions=false;
+	debug_navigation=false;
+
 }