3 files changed, 30 insertions, 15 deletions

diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp
index 3c0e56f5a8..0ba69a8d47 100644
--- a/core/os/main_loop.cpp
+++ b/core/os/main_loop.cpp
@@ -33,11 +33,6 @@
 #include "core/object/script_language.h"
 
 void MainLoop::_bind_methods() {
-	BIND_VMETHOD(MethodInfo("_initialize"));
-	BIND_VMETHOD(MethodInfo(Variant::BOOL, "_physics_process", PropertyInfo(Variant::FLOAT, "delta")));
-	BIND_VMETHOD(MethodInfo(Variant::BOOL, "_process", PropertyInfo(Variant::FLOAT, "delta")));
-	BIND_VMETHOD(MethodInfo("_finalize"));
-
 	BIND_CONSTANT(NOTIFICATION_OS_MEMORY_WARNING);
 	BIND_CONSTANT(NOTIFICATION_TRANSLATION_CHANGED);
 	BIND_CONSTANT(NOTIFICATION_WM_ABOUT);
@@ -50,7 +45,12 @@ void MainLoop::_bind_methods() {
 	BIND_CONSTANT(NOTIFICATION_TEXT_SERVER_CHANGED);
 
 	ADD_SIGNAL(MethodInfo("on_request_permissions_result", PropertyInfo(Variant::STRING, "permission"), PropertyInfo(Variant::BOOL, "granted")));
-};
+
+	GDVIRTUAL_BIND(_initialize);
+	GDVIRTUAL_BIND(_physics_process, "delta");
+	GDVIRTUAL_BIND(_process, "delta");
+	GDVIRTUAL_BIND(_finalize);
+}
 
 void MainLoop::set_initialize_script(const Ref<Script> &p_initialize_script) {
 	initialize_script = p_initialize_script;
@@ -61,30 +61,31 @@ void MainLoop::initialize() {
 		set_script(initialize_script);
 	}
 
-	if (get_script_instance()) {
-		get_script_instance()->call("_initialize");
-	}
+	GDVIRTUAL_CALL(_initialize);
 }
 
 bool MainLoop::physics_process(double p_time) {
-	if (get_script_instance()) {
-		return get_script_instance()->call("_physics_process", p_time);
+	bool quit;
+	if (GDVIRTUAL_CALL(_physics_process, p_time, quit)) {
+		return quit;
 	}
 
 	return false;
 }
 
 bool MainLoop::process(double p_time) {
-	if (get_script_instance()) {
-		return get_script_instance()->call("_process", p_time);
+	bool quit;
+	if (GDVIRTUAL_CALL(_process, p_time, quit)) {
+		return quit;
 	}
 
 	return false;
 }
 
 void MainLoop::finalize() {
+	GDVIRTUAL_CALL(_finalize);
+
 	if (get_script_instance()) {
-		get_script_instance()->call("_finalize");
 		set_script(Variant()); //clear script
 	}
 }
diff --git a/core/os/main_loop.h b/core/os/main_loop.h
index b42e9b18ff..4da01d767e 100644
--- a/core/os/main_loop.h
+++ b/core/os/main_loop.h
@@ -32,6 +32,7 @@
 #define MAIN_LOOP_H
 
 #include "core/input/input_event.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
 #include "core/object/script_language.h"
 
@@ -44,6 +45,11 @@ class MainLoop : public Object {
 protected:
 	static void _bind_methods();
 
+	GDVIRTUAL0(_initialize)
+	GDVIRTUAL1R(bool, _physics_process, double)
+	GDVIRTUAL1R(bool, _process, double)
+	GDVIRTUAL0(_finalize)
+
 public:
 	enum {
 		//make sure these are replicated in Node
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 63390919f4..89ba73b35e 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -357,9 +357,17 @@ void OS::set_has_server_feature_callback(HasServerFeatureCallback p_callback) {
 }
 
 bool OS::has_feature(const String &p_feature) {
-	if (p_feature == get_name()) {
+	// Feature tags are always lowercase for consistency.
+	if (p_feature == get_name().to_lower()) {
 		return true;
 	}
+
+	// Catch-all `linuxbsd` feature tag that matches on both Linux and BSD.
+	// This is the one exposed in the project settings dialog.
+	if (p_feature == "linuxbsd" && (get_name() == "Linux" || get_name() == "FreeBSD" || get_name() == "NetBSD" || get_name() == "OpenBSD" || get_name() == "BSD")) {
+		return true;
+	}
+
 #ifdef DEBUG_ENABLED
 	if (p_feature == "debug") {
 		return true;