53 files changed, 720 insertions, 80 deletions

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index c0bb756d2e..6d227d6615 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -63,6 +63,11 @@ Copyright: 2011, Ole Kniemeyer, MAXON, www.maxon.net
  2007-2014, Juan Linietsky, Ariel Manzur
 License: Expat and Zlib
 
+Files: ./modules/godot_physics_2d/godot_joints_2d.cpp
+Comment: Chipmunk2D Joint Constraints
+Copyright: 2007, Scott Lembcke
+License: Expat
+
 Files: ./modules/godot_physics_3d/gjk_epa.cpp
  ./modules/godot_physics_3d/joints/godot_generic_6dof_joint_3d.cpp
  ./modules/godot_physics_3d/joints/godot_generic_6dof_joint_3d.h
@@ -126,11 +131,6 @@ Copyright: 2001, Robert Penner
  2007-2014, Juan Linietsky, Ariel Manzur
 License: Expat
 
-Files: ./servers/physics_2d/godot_joints_2d.cpp
-Comment: Chipmunk2D Joint Constraints
-Copyright: 2007, Scott Lembcke
-License: Expat
-
 Files: ./servers/rendering/renderer_rd/shaders/ss_effects_downsample.glsl
  ./servers/rendering/renderer_rd/shaders/ssao_blur.glsl
  ./servers/rendering/renderer_rd/shaders/ssao_importance_map.glsl
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index 0e5097b7b2..7b6d8d0cd3 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -2215,6 +2215,7 @@
 		<member name="physics/2d/physics_engine" type="String" setter="" getter="" default="&quot;DEFAULT&quot;">
 			Sets which physics engine to use for 2D physics.
 			"DEFAULT" and "GodotPhysics2D" are the same, as there is currently no alternative 2D physics server implemented.
+			"Dummy" is a 2D physics server that does nothing and returns only dummy values, effectively disabling all 2D physics functionality.
 		</member>
 		<member name="physics/2d/run_on_separate_thread" type="bool" setter="" getter="" default="false">
 			If [code]true[/code], the 2D physics server runs on a separate thread, making better use of multi-core CPUs. If [code]false[/code], the 2D physics server runs on the main thread. Running the physics server on a separate thread can increase performance, but restricts API access to only physics process.
diff --git a/doc/classes/Signal.xml b/doc/classes/Signal.xml
index 65168d6980..c970ccb094 100644
--- a/doc/classes/Signal.xml
+++ b/doc/classes/Signal.xml
@@ -48,7 +48,7 @@
 			<param index="0" name="object" type="Object" />
 			<param index="1" name="signal" type="StringName" />
 			<description>
-				Creates a new [Signal] named [param signal] in the specified [param object].
+				Creates a [Signal] object referencing a signal named [param signal] in the specified [param object].
 			</description>
 		</constructor>
 	</constructors>
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 184176391a..f248d03140 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -1202,7 +1202,7 @@ void EditorNode::_reload_modified_scenes() {
 			editor_data.set_edited_scene(i);
 			_remove_edited_scene(false);
 
-			Error err = load_scene(filename, false, false, true, false, true);
+			Error err = load_scene(filename, false, false, false, true);
 			if (err != OK) {
 				ERR_PRINT(vformat("Failed to load scene: %s", filename));
 			}
@@ -3931,7 +3931,7 @@ int EditorNode::new_scene() {
 	return idx;
 }
 
-Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, bool p_set_inherited, bool p_clear_errors, bool p_force_open_imported, bool p_silent_change_tab) {
+Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, bool p_set_inherited, bool p_force_open_imported, bool p_silent_change_tab) {
 	if (!is_inside_tree()) {
 		defer_load_scene = p_scene;
 		return OK;
@@ -3954,10 +3954,6 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b
 		}
 	}
 
-	if (p_clear_errors && !load_errors_queued_to_display) {
-		load_errors->clear();
-	}
-
 	String lpath = ProjectSettings::get_singleton()->localize_path(p_scene);
 
 	if (!lpath.begins_with("res://")) {
@@ -4935,6 +4931,12 @@ void EditorNode::_progress_dialog_visibility_changed() {
 	}
 }
 
+void EditorNode::_load_error_dialog_visibility_changed() {
+	if (!load_error_dialog->is_visible()) {
+		load_errors->clear();
+	}
+}
+
 String EditorNode::_get_system_info() const {
 	String distribution_name = OS::get_singleton()->get_distribution_name();
 	if (distribution_name.is_empty()) {
@@ -5915,7 +5917,7 @@ void EditorNode::reload_scene(const String &p_path) {
 
 	// Reload scene.
 	_remove_scene(scene_idx, false);
-	load_scene(p_path, true, false, true, true);
+	load_scene(p_path, true, false, true);
 
 	// Adjust index so tab is back a the previous position.
 	editor_data.move_edited_scene_to_index(scene_idx);
@@ -6441,7 +6443,7 @@ void EditorNode::_inherit_imported(const String &p_action) {
 }
 
 void EditorNode::_open_imported() {
-	load_scene(open_import_request, true, false, true, true);
+	load_scene(open_import_request, true, false, true);
 }
 
 void EditorNode::dim_editor(bool p_dimming) {
@@ -7848,6 +7850,7 @@ EditorNode::EditorNode() {
 	load_error_dialog->set_unparent_when_invisible(true);
 	load_error_dialog->add_child(load_errors);
 	load_error_dialog->set_title(TTR("Load Errors"));
+	load_error_dialog->connect(SceneStringName(visibility_changed), callable_mp(this, &EditorNode::_load_error_dialog_visibility_changed));
 
 	execute_outputs = memnew(RichTextLabel);
 	execute_outputs->set_selection_enabled(true);
diff --git a/editor/editor_node.h b/editor/editor_node.h
index 109cacdf0e..7ef38b4edb 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -660,6 +660,7 @@ private:
 	void _remove_all_not_owned_children(Node *p_node, Node *p_owner);
 
 	void _progress_dialog_visibility_changed();
+	void _load_error_dialog_visibility_changed();
 
 protected:
 	friend class FileSystemDock;
@@ -778,7 +779,7 @@ public:
 
 	void fix_dependencies(const String &p_for_file);
 	int new_scene();
-	Error load_scene(const String &p_scene, bool p_ignore_broken_deps = false, bool p_set_inherited = false, bool p_clear_errors = true, bool p_force_open_imported = false, bool p_silent_change_tab = false);
+	Error load_scene(const String &p_scene, bool p_ignore_broken_deps = false, bool p_set_inherited = false, bool p_force_open_imported = false, bool p_silent_change_tab = false);
 	Error load_resource(const String &p_resource, bool p_ignore_broken_deps = false);
 
 	HashMap<StringName, Variant> get_modified_properties_for_node(Node *p_node, bool p_node_references_only);
diff --git a/editor/localization_editor.cpp b/editor/localization_editor.cpp
index 3c07e85758..921467ccbc 100644
--- a/editor/localization_editor.cpp
+++ b/editor/localization_editor.cpp
@@ -74,15 +74,20 @@ void LocalizationEditor::add_translation(const String &p_translation) {
 
 void LocalizationEditor::_translation_add(const PackedStringArray &p_paths) {
 	PackedStringArray translations = GLOBAL_GET("internationalization/locale/translations");
-	for (int i = 0; i < p_paths.size(); i++) {
-		if (!translations.has(p_paths[i])) {
+	int count = 0;
+	for (const String &path : p_paths) {
+		if (!translations.has(path)) {
 			// Don't add duplicate translation paths.
-			translations.push_back(p_paths[i]);
+			translations.push_back(path);
+			count += 1;
 		}
 	}
+	if (count == 0) {
+		return;
+	}
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(vformat(TTR("Add %d Translations"), p_paths.size()));
+	undo_redo->create_action(vformat(TTRN("Add %d Translation", "Add %d Translations", count), count));
 	undo_redo->add_do_property(ProjectSettings::get_singleton(), "internationalization/locale/translations", translations);
 	undo_redo->add_undo_property(ProjectSettings::get_singleton(), "internationalization/locale/translations", GLOBAL_GET("internationalization/locale/translations"));
 	undo_redo->add_do_method(this, "update_translations");
@@ -136,15 +141,20 @@ void LocalizationEditor::_translation_res_add(const PackedStringArray &p_paths)
 		prev = remaps;
 	}
 
-	for (int i = 0; i < p_paths.size(); i++) {
-		if (!remaps.has(p_paths[i])) {
+	int count = 0;
+	for (const String &path : p_paths) {
+		if (!remaps.has(path)) {
 			// Don't overwrite with an empty remap array if an array already exists for the given path.
-			remaps[p_paths[i]] = PackedStringArray();
+			remaps[path] = PackedStringArray();
+			count += 1;
 		}
 	}
+	if (count == 0) {
+		return;
+	}
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(vformat(TTR("Translation Resource Remap: Add %d Path(s)"), p_paths.size()));
+	undo_redo->create_action(vformat(TTRN("Translation Resource Remap: Add %d Path", "Translation Resource Remap: Add %d Paths", count), count));
 	undo_redo->add_do_property(ProjectSettings::get_singleton(), "internationalization/locale/translation_remaps", remaps);
 	undo_redo->add_undo_property(ProjectSettings::get_singleton(), "internationalization/locale/translation_remaps", prev);
 	undo_redo->add_do_method(this, "update_translations");
@@ -176,7 +186,7 @@ void LocalizationEditor::_translation_res_option_add(const PackedStringArray &p_
 	remaps[key] = r;
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(vformat(TTR("Translation Resource Remap: Add %d Remap(s)"), p_paths.size()));
+	undo_redo->create_action(vformat(TTRN("Translation Resource Remap: Add %d Remap", "Translation Resource Remap: Add %d Remaps", p_paths.size()), p_paths.size()));
 	undo_redo->add_do_property(ProjectSettings::get_singleton(), "internationalization/locale/translation_remaps", remaps);
 	undo_redo->add_undo_property(ProjectSettings::get_singleton(), "internationalization/locale/translation_remaps", GLOBAL_GET("internationalization/locale/translation_remaps"));
 	undo_redo->add_do_method(this, "update_translations");
@@ -326,14 +336,19 @@ void LocalizationEditor::_translation_res_option_delete(Object *p_item, int p_co
 
 void LocalizationEditor::_pot_add(const PackedStringArray &p_paths) {
 	PackedStringArray pot_translations = GLOBAL_GET("internationalization/locale/translations_pot_files");
-	for (int i = 0; i < p_paths.size(); i++) {
-		if (!pot_translations.has(p_paths[i])) {
-			pot_translations.push_back(p_paths[i]);
+	int count = 0;
+	for (const String &path : p_paths) {
+		if (!pot_translations.has(path)) {
+			pot_translations.push_back(path);
+			count += 1;
 		}
 	}
+	if (count == 0) {
+		return;
+	}
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(vformat(TTR("Add %d file(s) for POT generation"), p_paths.size()));
+	undo_redo->create_action(vformat(TTRN("Add %d file for POT generation", "Add %d files for POT generation", count), count));
 	undo_redo->add_do_property(ProjectSettings::get_singleton(), "internationalization/locale/translations_pot_files", pot_translations);
 	undo_redo->add_undo_property(ProjectSettings::get_singleton(), "internationalization/locale/translations_pot_files", GLOBAL_GET("internationalization/locale/translations_pot_files"));
 	undo_redo->add_do_method(this, "update_translations");
diff --git a/main/main.cpp b/main/main.cpp
index 439cd385c0..75797e31de 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -80,6 +80,7 @@
 #include "servers/navigation_server_2d.h"
 #include "servers/navigation_server_2d_dummy.h"
 #include "servers/physics_server_2d.h"
+#include "servers/physics_server_2d_dummy.h"
 
 #ifndef _3D_DISABLED
 #include "servers/physics_server_3d.h"
@@ -340,7 +341,15 @@ void initialize_physics() {
 		// Physics server not found, Use the default physics
 		physics_server_2d = PhysicsServer2DManager::get_singleton()->new_default_server();
 	}
-	ERR_FAIL_NULL(physics_server_2d);
+
+	// Fall back to dummy if no default server has been registered.
+	if (!physics_server_2d) {
+		WARN_PRINT(vformat("Falling back to dummy PhysicsServer2D; 2D physics functionality will be disabled. If this is intended, set the %s project setting to Dummy.", PhysicsServer2DManager::setting_property_name));
+		physics_server_2d = memnew(PhysicsServer2DDummy);
+	}
+
+	// Should be impossible, but make sure it's not null.
+	ERR_FAIL_NULL_MSG(physics_server_2d, "Failed to initialize PhysicsServer2D.");
 	physics_server_2d->init();
 }
 
diff --git a/modules/godot_physics_2d/SCsub b/modules/godot_physics_2d/SCsub
new file mode 100644
index 0000000000..5d93da5ecf
--- /dev/null
+++ b/modules/godot_physics_2d/SCsub
@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+Import('env')
+
+env.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/godot_physics_2d/config.py b/modules/godot_physics_2d/config.py
new file mode 100644
index 0000000000..d22f9454ed
--- /dev/null
+++ b/modules/godot_physics_2d/config.py
@@ -0,0 +1,6 @@
+def can_build(env, platform):
+    return True
+
+
+def configure(env):
+    pass
diff --git a/servers/physics_2d/godot_area_2d.cpp b/modules/godot_physics_2d/godot_area_2d.cpp
index d6c786706c..d6c786706c 100644
--- a/servers/physics_2d/godot_area_2d.cpp
+++ b/modules/godot_physics_2d/godot_area_2d.cpp
diff --git a/servers/physics_2d/godot_area_2d.h b/modules/godot_physics_2d/godot_area_2d.h
index e6c3b45d6c..e6c3b45d6c 100644
--- a/servers/physics_2d/godot_area_2d.h
+++ b/modules/godot_physics_2d/godot_area_2d.h
diff --git a/servers/physics_2d/godot_area_pair_2d.cpp b/modules/godot_physics_2d/godot_area_pair_2d.cpp
index ca12e30c29..ca12e30c29 100644
--- a/servers/physics_2d/godot_area_pair_2d.cpp
+++ b/modules/godot_physics_2d/godot_area_pair_2d.cpp
diff --git a/servers/physics_2d/godot_area_pair_2d.h b/modules/godot_physics_2d/godot_area_pair_2d.h
index eb091288a9..eb091288a9 100644
--- a/servers/physics_2d/godot_area_pair_2d.h
+++ b/modules/godot_physics_2d/godot_area_pair_2d.h
diff --git a/servers/physics_2d/godot_body_2d.cpp b/modules/godot_physics_2d/godot_body_2d.cpp
index c401e6eee7..c401e6eee7 100644
--- a/servers/physics_2d/godot_body_2d.cpp
+++ b/modules/godot_physics_2d/godot_body_2d.cpp
diff --git a/servers/physics_2d/godot_body_2d.h b/modules/godot_physics_2d/godot_body_2d.h
index 529305dbb2..529305dbb2 100644
--- a/servers/physics_2d/godot_body_2d.h
+++ b/modules/godot_physics_2d/godot_body_2d.h
diff --git a/servers/physics_2d/godot_body_direct_state_2d.cpp b/modules/godot_physics_2d/godot_body_direct_state_2d.cpp
index b34c70831d..b34c70831d 100644
--- a/servers/physics_2d/godot_body_direct_state_2d.cpp
+++ b/modules/godot_physics_2d/godot_body_direct_state_2d.cpp
diff --git a/servers/physics_2d/godot_body_direct_state_2d.h b/modules/godot_physics_2d/godot_body_direct_state_2d.h
index 90b7c1d369..90b7c1d369 100644
--- a/servers/physics_2d/godot_body_direct_state_2d.h
+++ b/modules/godot_physics_2d/godot_body_direct_state_2d.h
diff --git a/servers/physics_2d/godot_body_pair_2d.cpp b/modules/godot_physics_2d/godot_body_pair_2d.cpp
index 6c2d28dc92..6c2d28dc92 100644
--- a/servers/physics_2d/godot_body_pair_2d.cpp
+++ b/modules/godot_physics_2d/godot_body_pair_2d.cpp
diff --git a/servers/physics_2d/godot_body_pair_2d.h b/modules/godot_physics_2d/godot_body_pair_2d.h
index 4e9bfa6022..4e9bfa6022 100644
--- a/servers/physics_2d/godot_body_pair_2d.h
+++ b/modules/godot_physics_2d/godot_body_pair_2d.h
diff --git a/servers/physics_2d/godot_broad_phase_2d.cpp b/modules/godot_physics_2d/godot_broad_phase_2d.cpp
index eb6bc21d60..eb6bc21d60 100644
--- a/servers/physics_2d/godot_broad_phase_2d.cpp
+++ b/modules/godot_physics_2d/godot_broad_phase_2d.cpp
diff --git a/servers/physics_2d/godot_broad_phase_2d.h b/modules/godot_physics_2d/godot_broad_phase_2d.h
index f3c07a69bb..f3c07a69bb 100644
--- a/servers/physics_2d/godot_broad_phase_2d.h
+++ b/modules/godot_physics_2d/godot_broad_phase_2d.h
diff --git a/servers/physics_2d/godot_broad_phase_2d_bvh.cpp b/modules/godot_physics_2d/godot_broad_phase_2d_bvh.cpp
index 59623a2667..59623a2667 100644
--- a/servers/physics_2d/godot_broad_phase_2d_bvh.cpp
+++ b/modules/godot_physics_2d/godot_broad_phase_2d_bvh.cpp
diff --git a/servers/physics_2d/godot_broad_phase_2d_bvh.h b/modules/godot_physics_2d/godot_broad_phase_2d_bvh.h
index 6c1fae5cb2..6c1fae5cb2 100644
--- a/servers/physics_2d/godot_broad_phase_2d_bvh.h
+++ b/modules/godot_physics_2d/godot_broad_phase_2d_bvh.h
diff --git a/servers/physics_2d/godot_collision_object_2d.cpp b/modules/godot_physics_2d/godot_collision_object_2d.cpp
index 9851cac140..9851cac140 100644
--- a/servers/physics_2d/godot_collision_object_2d.cpp
+++ b/modules/godot_physics_2d/godot_collision_object_2d.cpp
diff --git a/servers/physics_2d/godot_collision_object_2d.h b/modules/godot_physics_2d/godot_collision_object_2d.h
index 129fa27ff3..129fa27ff3 100644
--- a/servers/physics_2d/godot_collision_object_2d.h
+++ b/modules/godot_physics_2d/godot_collision_object_2d.h
diff --git a/servers/physics_2d/godot_collision_solver_2d.cpp b/modules/godot_physics_2d/godot_collision_solver_2d.cpp
index a1acbe9cf0..a1acbe9cf0 100644
--- a/servers/physics_2d/godot_collision_solver_2d.cpp
+++ b/modules/godot_physics_2d/godot_collision_solver_2d.cpp
diff --git a/servers/physics_2d/godot_collision_solver_2d.h b/modules/godot_physics_2d/godot_collision_solver_2d.h
index 1c09714f76..1c09714f76 100644
--- a/servers/physics_2d/godot_collision_solver_2d.h
+++ b/modules/godot_physics_2d/godot_collision_solver_2d.h
diff --git a/servers/physics_2d/godot_collision_solver_2d_sat.cpp b/modules/godot_physics_2d/godot_collision_solver_2d_sat.cpp
index daa9982b2e..daa9982b2e 100644
--- a/servers/physics_2d/godot_collision_solver_2d_sat.cpp
+++ b/modules/godot_physics_2d/godot_collision_solver_2d_sat.cpp
diff --git a/servers/physics_2d/godot_collision_solver_2d_sat.h b/modules/godot_physics_2d/godot_collision_solver_2d_sat.h
index c9183f7ecb..c9183f7ecb 100644
--- a/servers/physics_2d/godot_collision_solver_2d_sat.h
+++ b/modules/godot_physics_2d/godot_collision_solver_2d_sat.h
diff --git a/servers/physics_2d/godot_constraint_2d.h b/modules/godot_physics_2d/godot_constraint_2d.h
index f4136f6643..f4136f6643 100644
--- a/servers/physics_2d/godot_constraint_2d.h
+++ b/modules/godot_physics_2d/godot_constraint_2d.h
diff --git a/servers/physics_2d/godot_joints_2d.cpp b/modules/godot_physics_2d/godot_joints_2d.cpp
index 5c76eb9dad..5c76eb9dad 100644
--- a/servers/physics_2d/godot_joints_2d.cpp
+++ b/modules/godot_physics_2d/godot_joints_2d.cpp
diff --git a/servers/physics_2d/godot_joints_2d.h b/modules/godot_physics_2d/godot_joints_2d.h
index c6a1fdb692..c6a1fdb692 100644
--- a/servers/physics_2d/godot_joints_2d.h
+++ b/modules/godot_physics_2d/godot_joints_2d.h
diff --git a/servers/physics_2d/godot_physics_server_2d.cpp b/modules/godot_physics_2d/godot_physics_server_2d.cpp
index 8df17992ea..8df17992ea 100644
--- a/servers/physics_2d/godot_physics_server_2d.cpp
+++ b/modules/godot_physics_2d/godot_physics_server_2d.cpp
diff --git a/servers/physics_2d/godot_physics_server_2d.h b/modules/godot_physics_2d/godot_physics_server_2d.h
index 991cf67c95..991cf67c95 100644
--- a/servers/physics_2d/godot_physics_server_2d.h
+++ b/modules/godot_physics_2d/godot_physics_server_2d.h
diff --git a/servers/physics_2d/godot_shape_2d.cpp b/modules/godot_physics_2d/godot_shape_2d.cpp
index d77b1a77e3..d77b1a77e3 100644
--- a/servers/physics_2d/godot_shape_2d.cpp
+++ b/modules/godot_physics_2d/godot_shape_2d.cpp
diff --git a/servers/physics_2d/godot_shape_2d.h b/modules/godot_physics_2d/godot_shape_2d.h
index 28c69574a0..28c69574a0 100644
--- a/servers/physics_2d/godot_shape_2d.h
+++ b/modules/godot_physics_2d/godot_shape_2d.h
diff --git a/servers/physics_2d/godot_space_2d.cpp b/modules/godot_physics_2d/godot_space_2d.cpp
index 2966818beb..2966818beb 100644
--- a/servers/physics_2d/godot_space_2d.cpp
+++ b/modules/godot_physics_2d/godot_space_2d.cpp
diff --git a/servers/physics_2d/godot_space_2d.h b/modules/godot_physics_2d/godot_space_2d.h
index ded3b08d5b..ded3b08d5b 100644
--- a/servers/physics_2d/godot_space_2d.h
+++ b/modules/godot_physics_2d/godot_space_2d.h
diff --git a/servers/physics_2d/godot_step_2d.cpp b/modules/godot_physics_2d/godot_step_2d.cpp
index bbaec8be2b..bbaec8be2b 100644
--- a/servers/physics_2d/godot_step_2d.cpp
+++ b/modules/godot_physics_2d/godot_step_2d.cpp
diff --git a/servers/physics_2d/godot_step_2d.h b/modules/godot_physics_2d/godot_step_2d.h
index c08c6379de..c08c6379de 100644
--- a/servers/physics_2d/godot_step_2d.h
+++ b/modules/godot_physics_2d/godot_step_2d.h
diff --git a/modules/godot_physics_2d/register_types.cpp b/modules/godot_physics_2d/register_types.cpp
new file mode 100644
index 0000000000..57422b1814
--- /dev/null
+++ b/modules/godot_physics_2d/register_types.cpp
@@ -0,0 +1,61 @@
+/**************************************************************************/
+/*  register_types.cpp                                                    */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 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 "register_types.h"
+
+#include "godot_physics_server_2d.h"
+#include "servers/physics_server_2d.h"
+#include "servers/physics_server_2d_wrap_mt.h"
+
+static PhysicsServer2D *_createGodotPhysics2DCallback() {
+#ifdef THREADS_ENABLED
+	bool using_threads = GLOBAL_GET("physics/2d/run_on_separate_thread");
+#else
+	bool using_threads = false;
+#endif
+
+	PhysicsServer2D *physics_server_2d = memnew(GodotPhysicsServer2D(using_threads));
+
+	return memnew(PhysicsServer2DWrapMT(physics_server_2d, using_threads));
+}
+
+void initialize_godot_physics_2d_module(ModuleInitializationLevel p_level) {
+	if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
+		return;
+	}
+	PhysicsServer2DManager::get_singleton()->register_server("GodotPhysics2D", callable_mp_static(_createGodotPhysics2DCallback));
+	PhysicsServer2DManager::get_singleton()->set_default_server("GodotPhysics2D");
+}
+
+void uninitialize_godot_physics_2d_module(ModuleInitializationLevel p_level) {
+	if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
+		return;
+	}
+}
diff --git a/modules/godot_physics_2d/register_types.h b/modules/godot_physics_2d/register_types.h
new file mode 100644
index 0000000000..1d2d1301b9
--- /dev/null
+++ b/modules/godot_physics_2d/register_types.h
@@ -0,0 +1,39 @@
+/**************************************************************************/
+/*  register_types.h                                                      */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 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 GODOT_PHYSICS_2D_REGISTER_TYPES_H
+#define GODOT_PHYSICS_2D_REGISTER_TYPES_H
+
+#include "modules/register_module_types.h"
+
+void initialize_godot_physics_2d_module(ModuleInitializationLevel p_level);
+void uninitialize_godot_physics_2d_module(ModuleInitializationLevel p_level);
+
+#endif // GODOT_PHYSICS_2D_REGISTER_TYPES_H
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
index 1b3062c5db..91d49854c7 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
@@ -660,15 +660,7 @@ namespace Godot.Bridge
         {
             Type native = GodotObject.InternalGetClassNativeBase(scriptType);
 
-            string typeName = scriptType.Name;
-            if (scriptType.IsGenericType)
-            {
-                var sb = new StringBuilder();
-                AppendTypeName(sb, scriptType);
-                typeName = sb.ToString();
-            }
-
-            godot_string className = Marshaling.ConvertStringToNative(typeName);
+            godot_string className = Marshaling.ConvertStringToNative(ReflectionUtils.ConstructTypeName(scriptType));
 
             bool isTool = scriptType.IsDefined(typeof(ToolAttribute), inherit: false);
 
@@ -701,24 +693,6 @@ namespace Godot.Bridge
             outTypeInfo->IsGenericTypeDefinition = scriptType.IsGenericTypeDefinition.ToGodotBool();
             outTypeInfo->IsConstructedGenericType = scriptType.IsConstructedGenericType.ToGodotBool();
 
-            static void AppendTypeName(StringBuilder sb, Type type)
-            {
-                sb.Append(type.Name);
-                if (type.IsGenericType)
-                {
-                    sb.Append('<');
-                    for (int i = 0; i < type.GenericTypeArguments.Length; i++)
-                    {
-                        Type typeArg = type.GenericTypeArguments[i];
-                        AppendTypeName(sb, typeArg);
-                        if (i != type.GenericTypeArguments.Length - 1)
-                        {
-                            sb.Append(", ");
-                        }
-                    }
-                    sb.Append('>');
-                }
-            }
         }
 
         [UnmanagedCallersOnly]
@@ -1032,7 +1006,7 @@ namespace Godot.Bridge
                         interopProperties[i] = interopProperty;
                     }
 
-                    using godot_string currentClassName = Marshaling.ConvertStringToNative(type.Name);
+                    using godot_string currentClassName = Marshaling.ConvertStringToNative(ReflectionUtils.ConstructTypeName(type));
 
                     addPropInfoFunc(scriptPtr, &currentClassName, interopProperties, length);
 
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/ReflectionUtils.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/ReflectionUtils.cs
index ee605f8d8f..27989b5c81 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/ReflectionUtils.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/ReflectionUtils.cs
@@ -1,5 +1,8 @@
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Text;
 
 #nullable enable
 
@@ -7,10 +10,186 @@ namespace Godot;
 
 internal class ReflectionUtils
 {
+    private static readonly HashSet<Type>? _tupleTypeSet;
+    private static readonly Dictionary<Type, string>? _builtinTypeNameDictionary;
+    private static readonly bool _isEditorHintCached;
+
+    static ReflectionUtils()
+    {
+        _isEditorHintCached = Engine.IsEditorHint();
+        if (!_isEditorHintCached)
+        {
+            return;
+        }
+
+        _tupleTypeSet = new HashSet<Type>
+        {
+            // ValueTuple with only one element should be treated as normal generic type.
+            //typeof(ValueTuple<>),
+            typeof(ValueTuple<,>),
+            typeof(ValueTuple<,,>),
+            typeof(ValueTuple<,,,>),
+            typeof(ValueTuple<,,,,>),
+            typeof(ValueTuple<,,,,,>),
+            typeof(ValueTuple<,,,,,,>),
+            typeof(ValueTuple<,,,,,,,>),
+        };
+
+        _builtinTypeNameDictionary ??= new Dictionary<Type, string>
+        {
+            { typeof(sbyte), "sbyte" },
+            { typeof(byte), "byte" },
+            { typeof(short), "short" },
+            { typeof(ushort), "ushort" },
+            { typeof(int), "int" },
+            { typeof(uint), "uint" },
+            { typeof(long), "long" },
+            { typeof(ulong), "ulong" },
+            { typeof(nint), "nint" },
+            { typeof(nuint), "nuint" },
+            { typeof(float), "float" },
+            { typeof(double), "double" },
+            { typeof(decimal), "decimal" },
+            { typeof(bool), "bool" },
+            { typeof(char), "char" },
+            { typeof(string), "string" },
+            { typeof(object), "object" },
+        };
+    }
+
     public static Type? FindTypeInLoadedAssemblies(string assemblyName, string typeFullName)
     {
         return AppDomain.CurrentDomain.GetAssemblies()
             .FirstOrDefault(a => a.GetName().Name == assemblyName)?
             .GetType(typeFullName);
     }
+
+    public static string ConstructTypeName(Type type)
+    {
+        if (!_isEditorHintCached)
+        {
+            return type.Name;
+        }
+
+        if (type is { IsArray: false, IsGenericType: false })
+        {
+            return GetSimpleTypeName(type);
+        }
+
+        var typeNameBuilder = new StringBuilder();
+        AppendType(typeNameBuilder, type);
+        return typeNameBuilder.ToString();
+
+        static void AppendType(StringBuilder sb, Type type)
+        {
+            if (type.IsArray)
+            {
+                AppendArray(sb, type);
+            }
+            else if (type.IsGenericType)
+            {
+                AppendGeneric(sb, type);
+            }
+            else
+            {
+                sb.Append(GetSimpleTypeName(type));
+            }
+        }
+
+        static void AppendArray(StringBuilder sb, Type type)
+        {
+            // Append inner most non-array element.
+            var elementType = type.GetElementType()!;
+            while (elementType.IsArray)
+            {
+                elementType = elementType.GetElementType()!;
+            }
+
+            AppendType(sb, elementType);
+            // Append brackets.
+            AppendArrayBrackets(sb, type);
+
+            static void AppendArrayBrackets(StringBuilder sb, Type type)
+            {
+                while (type != null && type.IsArray)
+                {
+                    int rank = type.GetArrayRank();
+                    sb.Append('[');
+                    sb.Append(',', rank - 1);
+                    sb.Append(']');
+                    type = type.GetElementType();
+                }
+            }
+        }
+
+        static void AppendGeneric(StringBuilder sb, Type type)
+        {
+            var genericArgs = type.GenericTypeArguments;
+            var genericDefinition = type.GetGenericTypeDefinition();
+
+            // Nullable<T>
+            if (genericDefinition == typeof(Nullable<>))
+            {
+                AppendType(sb, genericArgs[0]);
+                sb.Append('?');
+                return;
+            }
+
+            // ValueTuple
+            Debug.Assert(_tupleTypeSet != null);
+            if (_tupleTypeSet.Contains(genericDefinition))
+            {
+                sb.Append('(');
+                while (true)
+                {
+                    // We assume that ValueTuple has 1~8 elements.
+                    // And the 8th element (TRest) is always another ValueTuple.
+
+                    // This is a hard coded tuple element length check.
+                    if (genericArgs.Length != 8)
+                    {
+                        AppendParamTypes(sb, genericArgs);
+                        break;
+                    }
+                    else
+                    {
+                        AppendParamTypes(sb, genericArgs.AsSpan(0, 7));
+                        sb.Append(", ");
+
+                        // TRest should be a ValueTuple!
+                        var nextTuple = genericArgs[7];
+
+                        genericArgs = nextTuple.GenericTypeArguments;
+                    }
+                }
+                sb.Append(')');
+                return;
+            }
+
+            // Normal generic
+            var typeName = type.Name.AsSpan();
+            sb.Append(typeName[..typeName.LastIndexOf('`')]);
+            sb.Append('<');
+            AppendParamTypes(sb, genericArgs);
+            sb.Append('>');
+
+            static void AppendParamTypes(StringBuilder sb, ReadOnlySpan<Type> genericArgs)
+            {
+                int n = genericArgs.Length - 1;
+                for (int i = 0; i < n; i += 1)
+                {
+                    AppendType(sb, genericArgs[i]);
+                    sb.Append(", ");
+                }
+
+                AppendType(sb, genericArgs[n]);
+            }
+        }
+
+        static string GetSimpleTypeName(Type type)
+        {
+            Debug.Assert(_builtinTypeNameDictionary != null);
+            return _builtinTypeNameDictionary.TryGetValue(type, out string? name) ? name : type.Name;
+        }
+    }
 }
diff --git a/scene/2d/physics/shape_cast_2d.cpp b/scene/2d/physics/shape_cast_2d.cpp
index b92978bcad..dd9d589165 100644
--- a/scene/2d/physics/shape_cast_2d.cpp
+++ b/scene/2d/physics/shape_cast_2d.cpp
@@ -34,7 +34,7 @@
 #include "scene/2d/physics/collision_object_2d.h"
 #include "scene/2d/physics/physics_body_2d.h"
 #include "scene/resources/2d/circle_shape_2d.h"
-#include "servers/physics_2d/godot_physics_server_2d.h"
+#include "servers/physics_server_2d.h"
 
 void ShapeCast2D::set_target_position(const Vector2 &p_point) {
 	target_position = p_point;
diff --git a/scu_builders.py b/scu_builders.py
index 7fc0c15b2d..3c04d66668 100644
--- a/scu_builders.py
+++ b/scu_builders.py
@@ -322,6 +322,7 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["modules/openxr"], ["register_types"])
     process_folder(["modules/openxr/action_map"])
     process_folder(["modules/openxr/editor"])
+    process_folder(["modules/godot_physics_2d"])
     process_folder(["modules/godot_physics_3d"])
     process_folder(["modules/godot_physics_3d/joints"])
 
@@ -350,7 +351,6 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["servers/rendering/renderer_rd/effects"])
     process_folder(["servers/rendering/renderer_rd/environment"])
     process_folder(["servers/rendering/renderer_rd/storage_rd"])
-    process_folder(["servers/physics_2d"])
     process_folder(["servers/audio"])
     process_folder(["servers/audio/effects"])
 
diff --git a/servers/SCsub b/servers/SCsub
index 472cb096ab..28180a7bb2 100644
--- a/servers/SCsub
+++ b/servers/SCsub
@@ -25,8 +25,6 @@ SConscript("navigation/SCsub")
 SConscript("rendering/SCsub")
 SConscript("text/SCsub")
 
-SConscript("physics_2d/SCsub")
-
 if not env["disable_3d"]:
     env.add_source_files(env.servers_sources, "physics_server_3d.cpp")
     env.add_source_files(env.servers_sources, "physics_server_3d_wrap_mt.cpp")
diff --git a/servers/physics_2d/SCsub b/servers/physics_2d/SCsub
deleted file mode 100644
index 86681f9c74..0000000000
--- a/servers/physics_2d/SCsub
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-Import("env")
-
-env.add_source_files(env.servers_sources, "*.cpp")
diff --git a/servers/physics_server_2d.cpp b/servers/physics_server_2d.cpp
index da25621ba5..f4f9a2e8b7 100644
--- a/servers/physics_server_2d.cpp
+++ b/servers/physics_server_2d.cpp
@@ -972,7 +972,9 @@ String PhysicsServer2DManager::get_server_name(int p_id) {
 }
 
 PhysicsServer2D *PhysicsServer2DManager::new_default_server() {
-	ERR_FAIL_COND_V(default_server_id == -1, nullptr);
+	if (default_server_id == -1) {
+		return nullptr;
+	}
 	Variant ret;
 	Callable::CallError ce;
 	physics_2d_servers[default_server_id].create_callback.callp(nullptr, 0, ret, ce);
diff --git a/servers/physics_server_2d_dummy.h b/servers/physics_server_2d_dummy.h
new file mode 100644
index 0000000000..1f211d7ce0
--- /dev/null
+++ b/servers/physics_server_2d_dummy.h
@@ -0,0 +1,350 @@
+/**************************************************************************/
+/*  physics_server_2d_dummy.h                                             */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 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 PHYSICS_SERVER_2D_DUMMY_H
+#define PHYSICS_SERVER_2D_DUMMY_H
+
+#include "physics_server_2d.h"
+
+class PhysicsDirectBodyState2DDummy : public PhysicsDirectBodyState2D {
+	GDCLASS(PhysicsDirectBodyState2DDummy, PhysicsDirectBodyState2D);
+
+	PhysicsDirectSpaceState2D *space_state_dummy = nullptr;
+
+public:
+	virtual Vector2 get_total_gravity() const override { return Vector2(); }
+	virtual real_t get_total_linear_damp() const override { return 0; }
+	virtual real_t get_total_angular_damp() const override { return 0; }
+
+	virtual Vector2 get_center_of_mass() const override { return Vector2(); }
+	virtual Vector2 get_center_of_mass_local() const override { return Vector2(); }
+	virtual real_t get_inverse_mass() const override { return 0; }
+	virtual real_t get_inverse_inertia() const override { return 0; }
+
+	virtual void set_linear_velocity(const Vector2 &p_velocity) override {}
+	virtual Vector2 get_linear_velocity() const override { return Vector2(); }
+
+	virtual void set_angular_velocity(real_t p_velocity) override {}
+	virtual real_t get_angular_velocity() const override { return 0; }
+
+	virtual void set_transform(const Transform2D &p_transform) override {}
+	virtual Transform2D get_transform() const override { return Transform2D(); }
+
+	virtual Vector2 get_velocity_at_local_position(const Vector2 &p_position) const override { return Vector2(); }
+
+	virtual void apply_central_impulse(const Vector2 &p_impulse) override {}
+	virtual void apply_torque_impulse(real_t p_torque) override {}
+	virtual void apply_impulse(const Vector2 &p_impulse, const Vector2 &p_position = Vector2()) override {}
+
+	virtual void apply_central_force(const Vector2 &p_force) override {}
+	virtual void apply_force(const Vector2 &p_force, const Vector2 &p_position = Vector2()) override {}
+	virtual void apply_torque(real_t p_torque) override {}
+
+	virtual void add_constant_central_force(const Vector2 &p_force) override {}
+	virtual void add_constant_force(const Vector2 &p_force, const Vector2 &p_position = Vector2()) override {}
+	virtual void add_constant_torque(real_t p_torque) override {}
+
+	virtual void set_constant_force(const Vector2 &p_force) override {}
+	virtual Vector2 get_constant_force() const override { return Vector2(); }
+
+	virtual void set_constant_torque(real_t p_torque) override {}
+	virtual real_t get_constant_torque() const override { return 0; }
+
+	virtual void set_sleep_state(bool p_enable) override {}
+	virtual bool is_sleeping() const override { return false; }
+
+	virtual int get_contact_count() const override { return 0; }
+
+	virtual Vector2 get_contact_local_position(int p_contact_idx) const override { return Vector2(); }
+	virtual Vector2 get_contact_local_normal(int p_contact_idx) const override { return Vector2(); }
+	virtual int get_contact_local_shape(int p_contact_idx) const override { return 0; }
+	virtual Vector2 get_contact_local_velocity_at_position(int p_contact_idx) const override { return Vector2(); }
+
+	virtual RID get_contact_collider(int p_contact_idx) const override { return RID(); }
+	virtual Vector2 get_contact_collider_position(int p_contact_idx) const override { return Vector2(); }
+	virtual ObjectID get_contact_collider_id(int p_contact_idx) const override { return ObjectID(); }
+	virtual Object *get_contact_collider_object(int p_contact_idx) const override { return nullptr; }
+	virtual int get_contact_collider_shape(int p_contact_idx) const override { return 0; }
+	virtual Vector2 get_contact_collider_velocity_at_position(int p_contact_idx) const override { return Vector2(); }
+	virtual Vector2 get_contact_impulse(int p_contact_idx) const override { return Vector2(); }
+
+	virtual real_t get_step() const override { return 0; }
+	virtual void integrate_forces() override {}
+
+	virtual PhysicsDirectSpaceState2D *get_space_state() override { return space_state_dummy; }
+
+	PhysicsDirectBodyState2DDummy(PhysicsDirectSpaceState2D *p_space_state_dummy) {
+		space_state_dummy = p_space_state_dummy;
+	}
+};
+
+class PhysicsDirectSpaceState2DDummy : public PhysicsDirectSpaceState2D {
+	GDCLASS(PhysicsDirectSpaceState2DDummy, PhysicsDirectSpaceState2D);
+
+public:
+	virtual bool intersect_ray(const RayParameters &p_parameters, RayResult &r_result) override { return false; }
+
+	virtual int intersect_point(const PointParameters &p_parameters, ShapeResult *r_results, int p_result_max) override { return 0; }
+
+	virtual int intersect_shape(const ShapeParameters &p_parameters, ShapeResult *r_results, int p_result_max) override { return 0; }
+	virtual bool cast_motion(const ShapeParameters &p_parameters, real_t &p_closest_safe, real_t &p_closest_unsafe) override { return false; }
+	virtual bool collide_shape(const ShapeParameters &p_parameters, Vector2 *r_results, int p_result_max, int &r_result_count) override { return false; }
+	virtual bool rest_info(const ShapeParameters &p_parameters, ShapeRestInfo *r_info) override { return false; }
+};
+
+class PhysicsServer2DDummy : public PhysicsServer2D {
+	GDCLASS(PhysicsServer2DDummy, PhysicsServer2D);
+
+	PhysicsDirectSpaceState2DDummy *space_state_dummy = nullptr;
+	PhysicsDirectBodyState2DDummy *body_state_dummy = nullptr;
+
+public:
+	virtual RID world_boundary_shape_create() override { return RID(); }
+	virtual RID separation_ray_shape_create() override { return RID(); }
+	virtual RID segment_shape_create() override { return RID(); }
+	virtual RID circle_shape_create() override { return RID(); }
+	virtual RID rectangle_shape_create() override { return RID(); }
+	virtual RID capsule_shape_create() override { return RID(); }
+	virtual RID convex_polygon_shape_create() override { return RID(); }
+	virtual RID concave_polygon_shape_create() override { return RID(); }
+
+	virtual void shape_set_data(RID p_shape, const Variant &p_data) override {}
+	virtual void shape_set_custom_solver_bias(RID p_shape, real_t p_bias) override {}
+
+	virtual ShapeType shape_get_type(RID p_shape) const override { return ShapeType::SHAPE_CIRCLE; }
+	virtual Variant shape_get_data(RID p_shape) const override { return Variant(); }
+	virtual real_t shape_get_custom_solver_bias(RID p_shape) const override { return 0; }
+
+	virtual bool shape_collide(RID p_shape_A, const Transform2D &p_xform_A, const Vector2 &p_motion_A, RID p_shape_B, const Transform2D &p_xform_B, const Vector2 &p_motion_B, Vector2 *r_results, int p_result_max, int &r_result_count) override { return false; }
+
+	/* SPACE API */
+
+	virtual RID space_create() override { return RID(); }
+	virtual void space_set_active(RID p_space, bool p_active) override {}
+	virtual bool space_is_active(RID p_space) const override { return false; }
+
+	virtual void space_set_param(RID p_space, SpaceParameter p_param, real_t p_value) override {}
+	virtual real_t space_get_param(RID p_space, SpaceParameter p_param) const override { return 0; }
+
+	virtual PhysicsDirectSpaceState2D *space_get_direct_state(RID p_space) override { return space_state_dummy; }
+
+	virtual void space_set_debug_contacts(RID p_space, int p_max_contacts) override {}
+	virtual Vector<Vector2> space_get_contacts(RID p_space) const override { return Vector<Vector2>(); }
+	virtual int space_get_contact_count(RID p_space) const override { return 0; }
+
+	/* AREA API */
+
+	virtual RID area_create() override { return RID(); }
+
+	virtual void area_set_space(RID p_area, RID p_space) override {}
+	virtual RID area_get_space(RID p_area) const override { return RID(); }
+
+	virtual void area_add_shape(RID p_area, RID p_shape, const Transform2D &p_transform = Transform2D(), bool p_disabled = false) override {}
+	virtual void area_set_shape(RID p_area, int p_shape_idx, RID p_shape) override {}
+	virtual void area_set_shape_transform(RID p_area, int p_shape_idx, const Transform2D &p_transform) override {}
+
+	virtual int area_get_shape_count(RID p_area) const override { return 0; }
+	virtual RID area_get_shape(RID p_area, int p_shape_idx) const override { return RID(); }
+	virtual Transform2D area_get_shape_transform(RID p_area, int p_shape_idx) const override { return Transform2D(); }
+
+	virtual void area_remove_shape(RID p_area, int p_shape_idx) override {}
+	virtual void area_clear_shapes(RID p_area) override {}
+
+	virtual void area_set_shape_disabled(RID p_area, int p_shape, bool p_disabled) override {}
+
+	virtual void area_attach_object_instance_id(RID p_area, ObjectID p_id) override {}
+	virtual ObjectID area_get_object_instance_id(RID p_area) const override { return ObjectID(); }
+
+	virtual void area_attach_canvas_instance_id(RID p_area, ObjectID p_id) override {}
+	virtual ObjectID area_get_canvas_instance_id(RID p_area) const override { return ObjectID(); }
+
+	virtual void area_set_param(RID p_area, AreaParameter p_param, const Variant &p_value) override {}
+	virtual void area_set_transform(RID p_area, const Transform2D &p_transform) override {}
+
+	virtual Variant area_get_param(RID p_parea, AreaParameter p_param) const override { return Variant(); }
+	virtual Transform2D area_get_transform(RID p_area) const override { return Transform2D(); }
+
+	virtual void area_set_collision_layer(RID p_area, uint32_t p_layer) override {}
+	virtual uint32_t area_get_collision_layer(RID p_area) const override { return 0; }
+
+	virtual void area_set_collision_mask(RID p_area, uint32_t p_mask) override {}
+	virtual uint32_t area_get_collision_mask(RID p_area) const override { return 0; }
+
+	virtual void area_set_monitorable(RID p_area, bool p_monitorable) override {}
+	virtual void area_set_pickable(RID p_area, bool p_pickable) override {}
+
+	virtual void area_set_monitor_callback(RID p_area, const Callable &p_callback) override {}
+	virtual void area_set_area_monitor_callback(RID p_area, const Callable &p_callback) override {}
+
+	/* BODY API */
+
+	virtual RID body_create() override { return RID(); }
+
+	virtual void body_set_space(RID p_body, RID p_space) override {}
+	virtual RID body_get_space(RID p_body) const override { return RID(); }
+
+	virtual void body_set_mode(RID p_body, BodyMode p_mode) override {}
+	virtual BodyMode body_get_mode(RID p_body) const override { return BodyMode::BODY_MODE_STATIC; }
+
+	virtual void body_add_shape(RID p_body, RID p_shape, const Transform2D &p_transform = Transform2D(), bool p_disabled = false) override {}
+	virtual void body_set_shape(RID p_body, int p_shape_idx, RID p_shape) override {}
+	virtual void body_set_shape_transform(RID p_body, int p_shape_idx, const Transform2D &p_transform) override {}
+
+	virtual int body_get_shape_count(RID p_body) const override { return 0; }
+	virtual RID body_get_shape(RID p_body, int p_shape_idx) const override { return RID(); }
+	virtual Transform2D body_get_shape_transform(RID p_body, int p_shape_idx) const override { return Transform2D(); }
+
+	virtual void body_set_shape_disabled(RID p_body, int p_shape, bool p_disabled) override {}
+	virtual void body_set_shape_as_one_way_collision(RID p_body, int p_shape, bool p_enabled, real_t p_margin = 0) override {}
+
+	virtual void body_remove_shape(RID p_body, int p_shape_idx) override {}
+	virtual void body_clear_shapes(RID p_body) override {}
+
+	virtual void body_attach_object_instance_id(RID p_body, ObjectID p_id) override {}
+	virtual ObjectID body_get_object_instance_id(RID p_body) const override { return ObjectID(); }
+
+	virtual void body_attach_canvas_instance_id(RID p_body, ObjectID p_id) override {}
+	virtual ObjectID body_get_canvas_instance_id(RID p_body) const override { return ObjectID(); }
+
+	virtual void body_set_continuous_collision_detection_mode(RID p_body, CCDMode p_mode) override {}
+	virtual CCDMode body_get_continuous_collision_detection_mode(RID p_body) const override { return CCDMode::CCD_MODE_DISABLED; }
+
+	virtual void body_set_collision_layer(RID p_body, uint32_t p_layer) override {}
+	virtual uint32_t body_get_collision_layer(RID p_body) const override { return 0; }
+
+	virtual void body_set_collision_mask(RID p_body, uint32_t p_mask) override {}
+	virtual uint32_t body_get_collision_mask(RID p_body) const override { return 0; }
+
+	virtual void body_set_collision_priority(RID p_body, real_t p_priority) override {}
+	virtual real_t body_get_collision_priority(RID p_body) const override { return 0; }
+
+	virtual void body_set_param(RID p_body, BodyParameter p_param, const Variant &p_value) override {}
+	virtual Variant body_get_param(RID p_body, BodyParameter p_param) const override { return Variant(); }
+
+	virtual void body_reset_mass_properties(RID p_body) override {}
+
+	virtual void body_set_state(RID p_body, BodyState p_state, const Variant &p_variant) override {}
+	virtual Variant body_get_state(RID p_body, BodyState p_state) const override { return Variant(); }
+
+	virtual void body_apply_central_impulse(RID p_body, const Vector2 &p_impulse) override {}
+	virtual void body_apply_torque_impulse(RID p_body, real_t p_torque) override {}
+	virtual void body_apply_impulse(RID p_body, const Vector2 &p_impulse, const Vector2 &p_position = Vector2()) override {}
+
+	virtual void body_apply_central_force(RID p_body, const Vector2 &p_force) override {}
+	virtual void body_apply_force(RID p_body, const Vector2 &p_force, const Vector2 &p_position = Vector2()) override {}
+	virtual void body_apply_torque(RID p_body, real_t p_torque) override {}
+
+	virtual void body_add_constant_central_force(RID p_body, const Vector2 &p_force) override {}
+	virtual void body_add_constant_force(RID p_body, const Vector2 &p_force, const Vector2 &p_position = Vector2()) override {}
+	virtual void body_add_constant_torque(RID p_body, real_t p_torque) override {}
+
+	virtual void body_set_constant_force(RID p_body, const Vector2 &p_force) override {}
+	virtual Vector2 body_get_constant_force(RID p_body) const override { return Vector2(); }
+
+	virtual void body_set_constant_torque(RID p_body, real_t p_torque) override {}
+	virtual real_t body_get_constant_torque(RID p_body) const override { return 0; }
+
+	virtual void body_set_axis_velocity(RID p_body, const Vector2 &p_axis_velocity) override {}
+
+	virtual void body_add_collision_exception(RID p_body, RID p_body_b) override {}
+	virtual void body_remove_collision_exception(RID p_body, RID p_body_b) override {}
+	virtual void body_get_collision_exceptions(RID p_body, List<RID> *p_exceptions) override {}
+
+	virtual void body_set_max_contacts_reported(RID p_body, int p_contacts) override {}
+	virtual int body_get_max_contacts_reported(RID p_body) const override { return 0; }
+
+	virtual void body_set_contacts_reported_depth_threshold(RID p_body, real_t p_threshold) override {}
+	virtual real_t body_get_contacts_reported_depth_threshold(RID p_body) const override { return 0; }
+
+	virtual void body_set_omit_force_integration(RID p_body, bool p_omit) override {}
+	virtual bool body_is_omitting_force_integration(RID p_body) const override { return false; }
+
+	virtual void body_set_state_sync_callback(RID p_body, const Callable &p_callable) override {}
+	virtual void body_set_force_integration_callback(RID p_body, const Callable &p_callable, const Variant &p_udata = Variant()) override {}
+
+	virtual bool body_collide_shape(RID p_body, int p_body_shape, RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, Vector2 *r_results, int p_result_max, int &r_result_count) override { return false; }
+
+	virtual void body_set_pickable(RID p_body, bool p_pickable) override {}
+
+	virtual PhysicsDirectBodyState2D *body_get_direct_state(RID p_body) override { return body_state_dummy; }
+
+	virtual bool body_test_motion(RID p_body, const MotionParameters &p_parameters, MotionResult *r_result = nullptr) override { return false; }
+
+	/* JOINT API */
+
+	virtual RID joint_create() override { return RID(); }
+
+	virtual void joint_clear(RID p_joint) override {}
+
+	virtual void joint_set_param(RID p_joint, JointParam p_param, real_t p_value) override {}
+	virtual real_t joint_get_param(RID p_joint, JointParam p_param) const override { return 0; }
+
+	virtual void joint_disable_collisions_between_bodies(RID p_joint, const bool p_disable) override {}
+	virtual bool joint_is_disabled_collisions_between_bodies(RID p_joint) const override { return false; }
+
+	virtual void joint_make_pin(RID p_joint, const Vector2 &p_anchor, RID p_body_a, RID p_body_b = RID()) override {}
+	virtual void joint_make_groove(RID p_joint, const Vector2 &p_a_groove1, const Vector2 &p_a_groove2, const Vector2 &p_b_anchor, RID p_body_a, RID p_body_b) override {}
+	virtual void joint_make_damped_spring(RID p_joint, const Vector2 &p_anchor_a, const Vector2 &p_anchor_b, RID p_body_a, RID p_body_b = RID()) override {}
+
+	virtual void pin_joint_set_param(RID p_joint, PinJointParam p_param, real_t p_value) override {}
+	virtual real_t pin_joint_get_param(RID p_joint, PinJointParam p_param) const override { return 0; }
+
+	virtual void pin_joint_set_flag(RID p_joint, PinJointFlag p_flag, bool p_enabled) override {}
+	virtual bool pin_joint_get_flag(RID p_joint, PinJointFlag p_flag) const override { return false; }
+
+	virtual void damped_spring_joint_set_param(RID p_joint, DampedSpringParam p_param, real_t p_value) override {}
+	virtual real_t damped_spring_joint_get_param(RID p_joint, DampedSpringParam p_param) const override { return 0; }
+
+	virtual JointType joint_get_type(RID p_joint) const override { return JointType::JOINT_TYPE_PIN; }
+
+	/* MISC */
+
+	virtual void free(RID p_rid) override {}
+
+	virtual void set_active(bool p_active) override {}
+	virtual void init() override {
+		space_state_dummy = memnew(PhysicsDirectSpaceState2DDummy);
+		body_state_dummy = memnew(PhysicsDirectBodyState2DDummy(space_state_dummy));
+	}
+	virtual void step(real_t p_step) override {}
+	virtual void sync() override {}
+	virtual void flush_queries() override {}
+	virtual void end_sync() override {}
+	virtual void finish() override {
+		memdelete(body_state_dummy);
+		memdelete(space_state_dummy);
+	}
+
+	virtual bool is_flushing_queries() const override { return false; }
+
+	virtual int get_process_info(ProcessInfo p_info) override { return 0; }
+};
+
+#endif // PHYSICS_SERVER_2D_DUMMY_H
diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp
index b23c77aa0a..18ee863083 100644
--- a/servers/register_server_types.cpp
+++ b/servers/register_server_types.cpp
@@ -81,8 +81,8 @@
 
 // 2D physics and navigation.
 #include "navigation_server_2d.h"
-#include "physics_2d/godot_physics_server_2d.h"
 #include "physics_server_2d.h"
+#include "physics_server_2d_dummy.h"
 #include "physics_server_2d_wrap_mt.h"
 #include "servers/extensions/physics_server_2d_extension.h"
 
@@ -111,16 +111,8 @@ static PhysicsServer3D *_create_dummy_physics_server_3d() {
 }
 #endif // _3D_DISABLED
 
-static PhysicsServer2D *_createGodotPhysics2DCallback() {
-#ifdef THREADS_ENABLED
-	bool using_threads = GLOBAL_GET("physics/2d/run_on_separate_thread");
-#else
-	bool using_threads = false;
-#endif
-
-	PhysicsServer2D *physics_server_2d = memnew(GodotPhysicsServer2D(using_threads));
-
-	return memnew(PhysicsServer2DWrapMT(physics_server_2d, using_threads));
+static PhysicsServer2D *_create_dummy_physics_server_2d() {
+	return memnew(PhysicsServer2DDummy);
 }
 
 static bool has_server_feature_callback(const String &p_feature) {
@@ -281,8 +273,7 @@ void register_server_types() {
 
 	GLOBAL_DEF(PropertyInfo(Variant::STRING, PhysicsServer2DManager::setting_property_name, PROPERTY_HINT_ENUM, "DEFAULT"), "DEFAULT");
 
-	PhysicsServer2DManager::get_singleton()->register_server("GodotPhysics2D", callable_mp_static(_createGodotPhysics2DCallback));
-	PhysicsServer2DManager::get_singleton()->set_default_server("GodotPhysics2D");
+	PhysicsServer2DManager::get_singleton()->register_server("Dummy", callable_mp_static(_create_dummy_physics_server_2d));
 
 	GDREGISTER_ABSTRACT_CLASS(NavigationServer2D);
 	GDREGISTER_CLASS(NavigationPathQueryParameters2D);
diff --git a/tests/scene/test_viewport.h b/tests/scene/test_viewport.h
index 9d02c41719..dde37944ec 100644
--- a/tests/scene/test_viewport.h
+++ b/tests/scene/test_viewport.h
@@ -38,6 +38,7 @@
 #include "scene/main/canvas_layer.h"
 #include "scene/main/window.h"
 #include "scene/resources/2d/rectangle_shape_2d.h"
+#include "servers/physics_server_2d_dummy.h"
 
 #include "tests/test_macros.h"
 
@@ -1550,6 +1551,12 @@ int TestArea2D::counter = 0;
 TEST_CASE("[SceneTree][Viewport] Physics Picking 2D") {
 	// FIXME: MOUSE_MODE_CAPTURED if-conditions are not testable, because DisplayServerMock doesn't support it.
 
+	// NOTE: This test requires a real physics server.
+	PhysicsServer2DDummy *physics_server_2d_dummy = Object::cast_to<PhysicsServer2DDummy>(PhysicsServer2D::get_singleton());
+	if (physics_server_2d_dummy) {
+		return;
+	}
+
 	struct PickingCollider {
 		TestArea2D *a;
 		CollisionShape2D *c;
diff --git a/tests/test_main.cpp b/tests/test_main.cpp
index 3c184ccc5d..12ff3ad4bc 100644
--- a/tests/test_main.cpp
+++ b/tests/test_main.cpp
@@ -174,6 +174,7 @@
 #include "servers/navigation_server_3d.h"
 #endif // _3D_DISABLED
 #include "servers/physics_server_2d.h"
+#include "servers/physics_server_2d_dummy.h"
 #ifndef _3D_DISABLED
 #include "servers/physics_server_3d.h"
 #include "servers/physics_server_3d_dummy.h"
@@ -298,6 +299,9 @@ struct GodotTestCaseListener : public doctest::IReporter {
 #endif // _3D_DISABLED
 
 			physics_server_2d = PhysicsServer2DManager::get_singleton()->new_default_server();
+			if (!physics_server_2d) {
+				physics_server_2d = memnew(PhysicsServer2DDummy);
+			}
 			physics_server_2d->init();
 
 #ifndef _3D_DISABLED