From 2fd59b77adf03d2d879fd2edfd80dea8a7159da7 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Mon, 31 Oct 2022 13:36:23 +0100
Subject: [PATCH 01/36] Update compatibility for 4.0 beta3
 (35cfaafda8073f700c9d2fe42a43d3d81eaaea67)

---
 README.md                                     |  2 +-
 modules/bullet_physics/components_gizmos.cpp  | 96 +++++++++----------
 .../godot/components/transform_component.cpp  | 12 +--
 .../components_mesh_gizmo_3d.cpp              |  2 +-
 .../components_transform_gizmo_3d.cpp         |  2 +-
 .../godot/editor_plugins/editor_world_ecs.cpp | 43 ++++++++-
 .../godot/editor_plugins/editor_world_ecs.h   |  1 +
 modules/godot/nodes/ecs_world.cpp             |  4 +-
 modules/godot/nodes/ecs_world.h               |  2 +-
 9 files changed, 99 insertions(+), 65 deletions(-)

diff --git a/README.md b/README.md
index 565fc4c4..a1613e6c 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Godex is a Godot Engine ecs library.
 **Disclaimer:** this module is still in development, open an [issues](https://github.com/GodotECS/godex/issues) to report any problem or a new [discussion](https://github.com/GodotECS/godex/discussions) if you need any help. Any form of contribution is welcome.
 
 ### The tested Godot version
-Is `master` `35cfaafda8073f700c9d2fe42a43d3d81eaaea67`, please open an issue if the current master is not working or doesn't compile.
+Is `master` `01ae26d31befb6679ecd92cd3c73aa5a76162e95`, please open an issue if the current master is not working or doesn't compile.
 
 ### What is ECS
 Shortened as ECS, the Entity Component System is an architectural design pattern that allow to organize the data in a way so that the workload can be split into small and easy programs.
diff --git a/modules/bullet_physics/components_gizmos.cpp b/modules/bullet_physics/components_gizmos.cpp
index f9aad4e6..d86eb9e2 100644
--- a/modules/bullet_physics/components_gizmos.cpp
+++ b/modules/bullet_physics/components_gizmos.cpp
@@ -18,7 +18,7 @@ void BtBoxGizmo::init() {
 }
 
 void BtBoxGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 
 	if (entity->has_component(box_component_name)) {
@@ -55,7 +55,7 @@ void BtBoxGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
 }
 
 int BtBoxGizmo::get_handle_count(const EditorNode3DGizmo *p_gizmo) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, 0);
 
 	if (entity->has_component(box_component_name)) {
@@ -76,7 +76,7 @@ String BtBoxGizmo::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx)
 }
 
 Variant BtBoxGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, Variant());
 	ERR_FAIL_COND_V(entity->has_component(box_component_name) == false, Variant());
 
@@ -86,7 +86,7 @@ Variant BtBoxGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_idx
 }
 
 void BtBoxGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(box_component_name) == false);
 
@@ -118,7 +118,7 @@ void BtBoxGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Camera3
 }
 
 void BtBoxGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(box_component_name) == false);
 
@@ -127,7 +127,7 @@ void BtBoxGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, cons
 	if (p_cancel) {
 		entity->set_component_value(box_component_name, half_extents_name, p_restore);
 	} else {
-		UndoRedo *ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
 		ur->create_action(TTR("Change Shape Box Half Extent"));
 		ur->add_do_method(entity, "set_component_value", box_component_name, half_extents_name, half_extents);
 		Vector3 restore = half_extents;
@@ -143,7 +143,7 @@ void BtSphereGizmo::init() {
 }
 
 void BtSphereGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 
 	if (entity->has_component(sphere_component_name)) {
@@ -156,8 +156,8 @@ void BtSphereGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
 		Vector<Vector3> points;
 
 		for (int i = 0; i <= 360; i++) {
-			float ra = Math::deg2rad((float)i);
-			float rb = Math::deg2rad((float)i + 1);
+			float ra = Math::deg_to_rad((float)i);
+			float rb = Math::deg_to_rad((float)i + 1);
 			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * radius;
 			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * radius;
 
@@ -194,7 +194,7 @@ void BtSphereGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
 }
 
 int BtSphereGizmo::get_handle_count(const EditorNode3DGizmo *p_gizmo) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, 0);
 
 	if (entity->has_component(sphere_component_name)) {
@@ -209,7 +209,7 @@ String BtSphereGizmo::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_id
 }
 
 Variant BtSphereGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, Variant());
 	ERR_FAIL_COND_V(entity->has_component(sphere_component_name) == false, Variant());
 
@@ -217,7 +217,7 @@ Variant BtSphereGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_
 }
 
 void BtSphereGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(sphere_component_name) == false);
 
@@ -244,7 +244,7 @@ void BtSphereGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Came
 }
 
 void BtSphereGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(sphere_component_name) == false);
 
@@ -253,7 +253,7 @@ void BtSphereGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, c
 	if (p_cancel) {
 		entity->set_component_value(sphere_component_name, radius_name, p_restore);
 	} else {
-		UndoRedo *ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
 		ur->create_action(TTR("Change Shape Sphere Radius"));
 		ur->add_do_method(entity, "set_component_value", sphere_component_name, radius_name, radius);
 		ur->add_undo_method(entity, "set_component_value", sphere_component_name, radius_name, p_restore);
@@ -267,7 +267,7 @@ void BtCapsuleGizmo::init() {
 }
 
 void BtCapsuleGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 
 	if (entity->has_component(capsule_component_name)) {
@@ -282,8 +282,8 @@ void BtCapsuleGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
 
 		Vector3 d(0, height * 0.5, 0);
 		for (int i = 0; i < 360; i++) {
-			float ra = Math::deg2rad((float)i);
-			float rb = Math::deg2rad((float)i + 1);
+			float ra = Math::deg_to_rad((float)i);
+			float rb = Math::deg_to_rad((float)i + 1);
 			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * radius;
 			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * radius;
 
@@ -345,7 +345,7 @@ void BtCapsuleGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
 }
 
 int BtCapsuleGizmo::get_handle_count(const EditorNode3DGizmo *p_gizmo) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, 0);
 
 	if (entity->has_component(capsule_component_name)) {
@@ -364,7 +364,7 @@ String BtCapsuleGizmo::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_i
 }
 
 Variant BtCapsuleGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, Variant());
 	ERR_FAIL_COND_V(entity->has_component(capsule_component_name) == false, Variant());
 
@@ -376,7 +376,7 @@ Variant BtCapsuleGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p
 }
 
 void BtCapsuleGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(capsule_component_name) == false);
 
@@ -414,7 +414,7 @@ void BtCapsuleGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Cam
 }
 
 void BtCapsuleGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(capsule_component_name) == false);
 
@@ -423,7 +423,7 @@ void BtCapsuleGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx,
 	if (p_cancel) {
 		entity->set_component_value(capsule_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
 	} else {
-		UndoRedo *ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
 		ur->create_action(TTR("Change Shape Capsule Radius"));
 		ur->add_do_method(entity, "set_component_value", capsule_component_name, p_idx == 0 ? radius_name : height_name, v);
 		ur->add_undo_method(entity, "set_component_value", capsule_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
@@ -437,7 +437,7 @@ void BtConeGizmo::init() {
 }
 
 void BtConeGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 
 	if (entity->has_component(cone_component_name)) {
@@ -452,8 +452,8 @@ void BtConeGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
 
 		Vector3 d(0, height * 0.5, 0);
 		for (int i = 0; i < 360; i++) {
-			float ra = Math::deg2rad((float)i);
-			float rb = Math::deg2rad((float)i + 1);
+			float ra = Math::deg_to_rad((float)i);
+			float rb = Math::deg_to_rad((float)i + 1);
 			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * radius;
 			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * radius;
 
@@ -495,7 +495,7 @@ void BtConeGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
 }
 
 int BtConeGizmo::get_handle_count(const EditorNode3DGizmo *p_gizmo) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, 0);
 
 	if (entity->has_component(cone_component_name)) {
@@ -514,7 +514,7 @@ String BtConeGizmo::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx)
 }
 
 Variant BtConeGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, Variant());
 	ERR_FAIL_COND_V(entity->has_component(cone_component_name) == false, Variant());
 
@@ -526,7 +526,7 @@ Variant BtConeGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id
 }
 
 void BtConeGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(cone_component_name) == false);
 
@@ -560,7 +560,7 @@ void BtConeGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Camera
 }
 
 void BtConeGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(cone_component_name) == false);
 
@@ -569,7 +569,7 @@ void BtConeGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, con
 	if (p_cancel) {
 		entity->set_component_value(cone_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
 	} else {
-		UndoRedo *ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
 		ur->create_action(TTR("Change Shape Cone Radius"));
 		ur->add_do_method(entity, "set_component_value", cone_component_name, p_idx == 0 ? radius_name : height_name, v);
 		ur->add_undo_method(entity, "set_component_value", cone_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
@@ -583,7 +583,7 @@ void BtCylinderGizmo::init() {
 }
 
 void BtCylinderGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 
 	if (entity->has_component(cylinder_component_name)) {
@@ -598,8 +598,8 @@ void BtCylinderGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
 
 		Vector3 d(0, height * 0.5, 0);
 		for (int i = 0; i < 360; i++) {
-			float ra = Math::deg2rad((float)i);
-			float rb = Math::deg2rad((float)i + 1);
+			float ra = Math::deg_to_rad((float)i);
+			float rb = Math::deg_to_rad((float)i + 1);
 			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * radius;
 			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * radius;
 
@@ -659,7 +659,7 @@ void BtCylinderGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
 }
 
 int BtCylinderGizmo::get_handle_count(const EditorNode3DGizmo *p_gizmo) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, 0);
 
 	if (entity->has_component(cylinder_component_name)) {
@@ -678,7 +678,7 @@ String BtCylinderGizmo::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_
 }
 
 Variant BtCylinderGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, Variant());
 	ERR_FAIL_COND_V(entity->has_component(cylinder_component_name) == false, Variant());
 
@@ -690,7 +690,7 @@ Variant BtCylinderGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int
 }
 
 void BtCylinderGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(cylinder_component_name) == false);
 
@@ -723,7 +723,7 @@ void BtCylinderGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Ca
 }
 
 void BtCylinderGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(cylinder_component_name) == false);
 
@@ -732,7 +732,7 @@ void BtCylinderGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx,
 	if (p_cancel) {
 		entity->set_component_value(cylinder_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
 	} else {
-		UndoRedo *ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
 		ur->create_action(TTR("Change Shape Capsule Radius"));
 		ur->add_do_method(entity, "set_component_value", cylinder_component_name, p_idx == 0 ? radius_name : height_name, v);
 		ur->add_undo_method(entity, "set_component_value", cylinder_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
@@ -752,7 +752,7 @@ void BtConvexGizmo::init() {
 }
 
 void BtConvexGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 
 	if (entity->has_component(convex_component_name)) {
@@ -804,7 +804,7 @@ void BtTrimeshGizmo::init() {
 }
 
 void BtTrimeshGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 
 	if (entity->has_component(trimesh_component_name)) {
@@ -859,7 +859,7 @@ void BtPawnGizmo::init() {
 }
 
 void BtPawnGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 
 	if (entity->has_component(pawn_component_name)) {
@@ -904,8 +904,8 @@ void BtPawnGizmo::redraw_capsule(EditorNode3DGizmo *p_gizmo, const Ref<Material>
 
 	Vector3 d(0, p_height * 0.5, 0);
 	for (int i = 0; i < 360; i++) {
-		float ra = Math::deg2rad((float)i);
-		float rb = Math::deg2rad((float)i + 1);
+		float ra = Math::deg_to_rad((float)i);
+		float rb = Math::deg_to_rad((float)i + 1);
 		Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * p_radius;
 		Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * p_radius;
 
@@ -967,7 +967,7 @@ void BtPawnGizmo::redraw_capsule(EditorNode3DGizmo *p_gizmo, const Ref<Material>
 }
 
 int BtPawnGizmo::get_handle_count(const EditorNode3DGizmo *p_gizmo) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, 0);
 
 	if (entity->has_component(pawn_component_name)) {
@@ -990,7 +990,7 @@ String BtPawnGizmo::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx)
 }
 
 Variant BtPawnGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND_V(entity == nullptr, Variant());
 	ERR_FAIL_COND_V(entity->has_component(pawn_component_name) == false, Variant());
 
@@ -1006,7 +1006,7 @@ Variant BtPawnGizmo::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id
 }
 
 void BtPawnGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(pawn_component_name) == false);
 
@@ -1059,7 +1059,7 @@ void BtPawnGizmo::set_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, Camera
 }
 
 void BtPawnGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 	ERR_FAIL_COND(entity == nullptr);
 	ERR_FAIL_COND(entity->has_component(pawn_component_name) == false);
 
@@ -1079,7 +1079,7 @@ void BtPawnGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, con
 	if (p_cancel) {
 		entity->set_component_value(pawn_component_name, prop_name, p_restore);
 	} else {
-		UndoRedo *ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
 		ur->create_action(TTR("Change Shape Capsule Radius"));
 		ur->add_do_method(entity, "set_component_value", pawn_component_name, prop_name, v);
 		ur->add_undo_method(entity, "set_component_value", pawn_component_name, prop_name, p_restore);
diff --git a/modules/godot/components/transform_component.cpp b/modules/godot/components/transform_component.cpp
index e80000df..26b14999 100644
--- a/modules/godot/components/transform_component.cpp
+++ b/modules/godot/components/transform_component.cpp
@@ -38,17 +38,17 @@ const Vector3 TransformComponent::get_rotation() const {
 
 void TransformComponent::set_rotation_deg(const Vector3 &p_euler) {
 	set_rotation(Vector3(
-			Math::deg2rad(p_euler[0]),
-			Math::deg2rad(p_euler[1]),
-			Math::deg2rad(p_euler[2])));
+			Math::deg_to_rad(p_euler[0]),
+			Math::deg_to_rad(p_euler[1]),
+			Math::deg_to_rad(p_euler[2])));
 }
 
 const Vector3 TransformComponent::get_rotation_deg() const {
 	const Vector3 r = get_rotation();
 	return Vector3(
-			Math::rad2deg(r[0]),
-			Math::rad2deg(r[1]),
-			Math::rad2deg(r[2]));
+			Math::rad_to_deg(r[0]),
+			Math::rad_to_deg(r[1]),
+			Math::rad_to_deg(r[2]));
 }
 
 void TransformComponent::set_scale(const Vector3 &p_scale) {
diff --git a/modules/godot/editor_plugins/components_mesh_gizmo_3d.cpp b/modules/godot/editor_plugins/components_mesh_gizmo_3d.cpp
index 7f512dc7..2e1cbf6c 100644
--- a/modules/godot/editor_plugins/components_mesh_gizmo_3d.cpp
+++ b/modules/godot/editor_plugins/components_mesh_gizmo_3d.cpp
@@ -28,7 +28,7 @@ void MeshComponentGizmo::init() {}
 
 void MeshComponentGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
 #ifdef TOOLS_ENABLED
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 
 	RID scenario = entity->get_world_3d()->get_scenario();
 	Ref<ComponentDepot> component_data = entity->get_component_depot(SNAME("MeshComponent"));
diff --git a/modules/godot/editor_plugins/components_transform_gizmo_3d.cpp b/modules/godot/editor_plugins/components_transform_gizmo_3d.cpp
index 1d12a7a0..026e251f 100644
--- a/modules/godot/editor_plugins/components_transform_gizmo_3d.cpp
+++ b/modules/godot/editor_plugins/components_transform_gizmo_3d.cpp
@@ -16,7 +16,7 @@ void TransformComponentGizmo::init() {
 }
 
 void TransformComponentGizmo::redraw(EditorNode3DGizmo *p_gizmo) {
-	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_spatial_node());
+	Entity3D *entity = static_cast<Entity3D *>(p_gizmo->get_node_3d());
 
 	if (entity->has_component(transform_component_name) == false) {
 		// Nothing to do.
diff --git a/modules/godot/editor_plugins/editor_world_ecs.cpp b/modules/godot/editor_plugins/editor_world_ecs.cpp
index 9af61dde..f02c4cdd 100644
--- a/modules/godot/editor_plugins/editor_world_ecs.cpp
+++ b/modules/godot/editor_plugins/editor_world_ecs.cpp
@@ -1275,10 +1275,43 @@ void EditorWorldECS::add_warning(const String &p_msg) {
 	errors_warnings_container->add_child(lbl);
 }
 
+void EditorWorldECS::remove_node_and_reparent_children(Node *p_node) {
+	Node *new_owner = p_node->get_owner();
+
+	List<Node *> children;
+
+	while (true) {
+		bool clear = true;
+		for (int i = 0; i < p_node->get_child_count(false); i++) {
+			Node* c_node = p_node->get_child(i, false);
+			if (!c_node->get_owner()) {
+				continue;
+			}
+
+			p_node->remove_child(c_node);
+			children.push_back(c_node);
+			clear = false;
+			break;
+		}
+
+		if (clear) {
+			break;
+		}
+	}
+
+	while (!children.is_empty()) {
+		Node *c_node = children.front()->get();
+		p_node->get_parent()->add_child(c_node);
+		children.pop_front();
+	}
+
+	p_node->get_parent()->remove_child(p_node);
+}
+
 void EditorWorldECS::clear_errors_warnings() {
 	for (int i = errors_warnings_container->get_child_count() - 1; i >= 0; i -= 1) {
 		Node *n = errors_warnings_container->get_child(i);
-		errors_warnings_container->get_child(i)->remove_and_skip();
+		remove_node_and_reparent_children(n);
 		memdelete(n);
 	}
 }
@@ -1304,7 +1337,7 @@ PipelineElementInfoBox *EditorWorldECS::pipeline_panel_add_entry() {
 void EditorWorldECS::pipeline_panel_clear() {
 	for (int i = pipeline_panel->get_child_count() - 1; i >= 0; i -= 1) {
 		Node *n = pipeline_panel->get_child(i);
-		pipeline_panel->get_child(i)->remove_and_skip();
+		remove_node_and_reparent_children(n);
 		memdelete(n);
 	}
 }
@@ -1318,7 +1351,7 @@ DispatcherPipelineView *EditorWorldECS::pipeline_view_add_dispatcher() {
 void EditorWorldECS::pipeline_view_clear() {
 	for (int i = pipeline_view_panel->get_child_count() - 1; i >= 0; i -= 1) {
 		Node *n = pipeline_view_panel->get_child(i);
-		pipeline_view_panel->get_child(i)->remove_and_skip();
+		remove_node_and_reparent_children(n);
 		memdelete(n);
 	}
 }
@@ -1326,12 +1359,12 @@ void EditorWorldECS::pipeline_view_clear() {
 WorldECSEditorPlugin::WorldECSEditorPlugin(EditorNode *p_node) :
 		editor(p_node) {
 	ecs_editor = memnew(EditorWorldECS(p_node));
-	editor->get_main_control()->add_child(ecs_editor);
+	editor->get_main_screen_control()->add_child(ecs_editor);
 	ecs_editor->hide_editor();
 }
 
 WorldECSEditorPlugin::~WorldECSEditorPlugin() {
-	editor->get_main_control()->remove_child(ecs_editor);
+	editor->get_main_screen_control()->remove_child(ecs_editor);
 	memdelete(ecs_editor);
 	ecs_editor = nullptr;
 }
diff --git a/modules/godot/editor_plugins/editor_world_ecs.h b/modules/godot/editor_plugins/editor_world_ecs.h
index 5fabde60..061af5bf 100644
--- a/modules/godot/editor_plugins/editor_world_ecs.h
+++ b/modules/godot/editor_plugins/editor_world_ecs.h
@@ -204,6 +204,7 @@ class EditorWorldECS : public PanelContainer {
 
 	DispatcherPipelineView *pipeline_view_add_dispatcher();
 	void pipeline_view_clear();
+	static void remove_node_and_reparent_children(Node *p_node);
 };
 
 class WorldECSEditorPlugin : public EditorPlugin {
diff --git a/modules/godot/nodes/ecs_world.cpp b/modules/godot/nodes/ecs_world.cpp
index 8a2ad428..e0ed01e2 100644
--- a/modules/godot/nodes/ecs_world.cpp
+++ b/modules/godot/nodes/ecs_world.cpp
@@ -414,8 +414,8 @@ World *WorldECS::get_world() const {
 	return world;
 }
 
-TypedArray<String> WorldECS::get_configuration_warnings() const {
-	TypedArray<String> warnings = Node::get_configuration_warnings();
+PackedStringArray WorldECS::get_configuration_warnings() const {
+	Vector<String> warnings = Node::get_configuration_warnings();
 
 	if (!is_inside_tree()) {
 		return warnings;
diff --git a/modules/godot/nodes/ecs_world.h b/modules/godot/nodes/ecs_world.h
index 172baad6..f7fe36b7 100644
--- a/modules/godot/nodes/ecs_world.h
+++ b/modules/godot/nodes/ecs_world.h
@@ -122,7 +122,7 @@ class WorldECS : public Node {
 	/// `ECS::get_singleton()->get_commands()`
 	World *get_world() const;
 
-	virtual TypedArray<String> get_configuration_warnings() const override;
+	virtual PackedStringArray get_configuration_warnings() const override;
 
 	void set_pipelines(Vector<Ref<PipelineECS>> p_pipelines);
 	const Vector<Ref<PipelineECS>> &get_pipelines() const;

From c5bba890e6905c2f495723eeaf4d8ef73ecb9996 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Thu, 3 Nov 2022 12:36:41 +0100
Subject: [PATCH 02/36] Update compatibility to
 889868cbbc8beac74d5f49f9b7ef41efc4ae7d5a

---
 README.md                                     |  2 +-
 modules/bullet_physics/components_gizmos.cpp  | 16 +++---
 modules/bullet_physics/debug_utilities.cpp    |  4 +-
 .../godot/editor_plugins/editor_world_ecs.cpp | 55 ++++++++++---------
 .../editor_plugins/entity_editor_plugin.cpp   | 37 +++++++------
 5 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/README.md b/README.md
index a1613e6c..e128a113 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Godex is a Godot Engine ecs library.
 **Disclaimer:** this module is still in development, open an [issues](https://github.com/GodotECS/godex/issues) to report any problem or a new [discussion](https://github.com/GodotECS/godex/discussions) if you need any help. Any form of contribution is welcome.
 
 ### The tested Godot version
-Is `master` `01ae26d31befb6679ecd92cd3c73aa5a76162e95`, please open an issue if the current master is not working or doesn't compile.
+Is `master` `889868cbbc8beac74d5f49f9b7ef41efc4ae7d5a`, please open an issue if the current master is not working or doesn't compile.
 
 ### What is ECS
 Shortened as ECS, the Entity Component System is an architectural design pattern that allow to organize the data in a way so that the workload can be split into small and easy programs.
diff --git a/modules/bullet_physics/components_gizmos.cpp b/modules/bullet_physics/components_gizmos.cpp
index d86eb9e2..d9788f4b 100644
--- a/modules/bullet_physics/components_gizmos.cpp
+++ b/modules/bullet_physics/components_gizmos.cpp
@@ -1,10 +1,10 @@
 #include "components_gizmos.h"
 
-#include "../godot/nodes/entity.h"
 #include "debug_utilities.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
-#include "scene/3d/camera_3d.h"
+#include "editor/editor_node.h"
+#include "editor/editor_undo_redo_manager.h"
 
 void BtBoxGizmo::init() {
 	const Color gizmo_color = EDITOR_DEF("editors/3d_gizmos/gizmo_colors/shape", Color(0.5, 0.7, 1));
@@ -127,7 +127,7 @@ void BtBoxGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, cons
 	if (p_cancel) {
 		entity->set_component_value(box_component_name, half_extents_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
 		ur->create_action(TTR("Change Shape Box Half Extent"));
 		ur->add_do_method(entity, "set_component_value", box_component_name, half_extents_name, half_extents);
 		Vector3 restore = half_extents;
@@ -253,7 +253,7 @@ void BtSphereGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, c
 	if (p_cancel) {
 		entity->set_component_value(sphere_component_name, radius_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
 		ur->create_action(TTR("Change Shape Sphere Radius"));
 		ur->add_do_method(entity, "set_component_value", sphere_component_name, radius_name, radius);
 		ur->add_undo_method(entity, "set_component_value", sphere_component_name, radius_name, p_restore);
@@ -423,7 +423,7 @@ void BtCapsuleGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx,
 	if (p_cancel) {
 		entity->set_component_value(capsule_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
 		ur->create_action(TTR("Change Shape Capsule Radius"));
 		ur->add_do_method(entity, "set_component_value", capsule_component_name, p_idx == 0 ? radius_name : height_name, v);
 		ur->add_undo_method(entity, "set_component_value", capsule_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
@@ -569,7 +569,7 @@ void BtConeGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, con
 	if (p_cancel) {
 		entity->set_component_value(cone_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
 		ur->create_action(TTR("Change Shape Cone Radius"));
 		ur->add_do_method(entity, "set_component_value", cone_component_name, p_idx == 0 ? radius_name : height_name, v);
 		ur->add_undo_method(entity, "set_component_value", cone_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
@@ -732,7 +732,7 @@ void BtCylinderGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx,
 	if (p_cancel) {
 		entity->set_component_value(cylinder_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
 		ur->create_action(TTR("Change Shape Capsule Radius"));
 		ur->add_do_method(entity, "set_component_value", cylinder_component_name, p_idx == 0 ? radius_name : height_name, v);
 		ur->add_undo_method(entity, "set_component_value", cylinder_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
@@ -1079,7 +1079,7 @@ void BtPawnGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, con
 	if (p_cancel) {
 		entity->set_component_value(pawn_component_name, prop_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = Node3DEditor::get_singleton()->get_undo_redo();
+		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
 		ur->create_action(TTR("Change Shape Capsule Radius"));
 		ur->add_do_method(entity, "set_component_value", pawn_component_name, prop_name, v);
 		ur->add_undo_method(entity, "set_component_value", pawn_component_name, prop_name, p_restore);
diff --git a/modules/bullet_physics/debug_utilities.cpp b/modules/bullet_physics/debug_utilities.cpp
index 477755f3..6ba43a38 100644
--- a/modules/bullet_physics/debug_utilities.cpp
+++ b/modules/bullet_physics/debug_utilities.cpp
@@ -66,8 +66,8 @@ Ref<ArrayMesh> generate_mesh_from_points(const Vector<Vector3> &p_points) {
 		if (err == OK) {
 			lines.resize(md.edges.size() * 2);
 			for (int i = 0; i < md.edges.size(); i++) {
-				lines.write[i * 2 + 0] = md.vertices[md.edges[i].a];
-				lines.write[i * 2 + 1] = md.vertices[md.edges[i].b];
+				lines.write[i * 2 + 0] = md.vertices[md.edges[i].vertex_a];
+				lines.write[i * 2 + 1] = md.vertices[md.edges[i].vertex_b];
 			}
 		}
 	}
diff --git a/modules/godot/editor_plugins/editor_world_ecs.cpp b/modules/godot/editor_plugins/editor_world_ecs.cpp
index f02c4cdd..17461d7d 100644
--- a/modules/godot/editor_plugins/editor_world_ecs.cpp
+++ b/modules/godot/editor_plugins/editor_world_ecs.cpp
@@ -11,6 +11,7 @@
 #include "scene/gui/color_rect.h"
 #include "scene/gui/reference_rect.h"
 #include "scene/gui/separator.h"
+#include "editor/editor_undo_redo_manager.h"
 
 PipelineElementInfoBox::PipelineElementInfoBox(EditorNode *p_editor, EditorWorldECS *p_editor_world_ecs) :
 		editor(p_editor),
@@ -841,10 +842,10 @@ void EditorWorldECS::pipeline_change_name(const String &p_name) {
 		return;
 	}
 
-	editor->get_undo_redo()->create_action(TTR("Change pipeline name"));
-	editor->get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("set_pipeline_name"), p_name);
-	editor->get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("set_pipeline_name"), pipeline->get_pipeline_name());
-	editor->get_undo_redo()->commit_action();
+	EditorNode::get_undo_redo()->create_action(TTR("Change pipeline name"));
+	EditorNode::get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("set_pipeline_name"), p_name);
+	EditorNode::get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("set_pipeline_name"), pipeline->get_pipeline_name());
+	EditorNode::get_undo_redo()->commit_action();
 }
 
 void EditorWorldECS::pipeline_list_update() {
@@ -914,10 +915,10 @@ void EditorWorldECS::pipeline_add() {
 	pip->set_pipeline_name(name);
 	set_pipeline(pip);
 
-	editor->get_undo_redo()->create_action(TTR("Add pipeline"));
-	editor->get_undo_redo()->add_do_method(world_ecs, SNAME("add_pipeline"), pip);
-	editor->get_undo_redo()->add_undo_method(world_ecs, SNAME("remove_pipeline"), pip);
-	editor->get_undo_redo()->commit_action();
+	EditorNode::get_undo_redo()->create_action(TTR("Add pipeline"));
+	EditorNode::get_undo_redo()->add_do_method(world_ecs, SNAME("add_pipeline"), pip);
+	EditorNode::get_undo_redo()->add_undo_method(world_ecs, SNAME("remove_pipeline"), pip);
+	EditorNode::get_undo_redo()->commit_action();
 }
 
 void EditorWorldECS::pipeline_rename_show_window() {
@@ -937,10 +938,10 @@ void EditorWorldECS::pipeline_remove() {
 		return;
 	}
 
-	editor->get_undo_redo()->create_action(TTR("Pipeline remove"));
-	editor->get_undo_redo()->add_do_method(world_ecs, SNAME("remove_pipeline"), pipeline);
-	editor->get_undo_redo()->add_undo_method(world_ecs, SNAME("add_pipeline"), pipeline);
-	editor->get_undo_redo()->commit_action();
+	EditorNode::get_undo_redo()->create_action(TTR("Pipeline remove"));
+	EditorNode::get_undo_redo()->add_do_method(world_ecs, SNAME("remove_pipeline"), pipeline);
+	EditorNode::get_undo_redo()->add_undo_method(world_ecs, SNAME("add_pipeline"), pipeline);
+	EditorNode::get_undo_redo()->commit_action();
 }
 
 void EditorWorldECS::pipeline_toggle_pipeline_view() {
@@ -1092,10 +1093,10 @@ void EditorWorldECS::pipeline_system_bundle_remove(const StringName &p_name) {
 		return;
 	}
 
-	editor->get_undo_redo()->create_action(TTR("Remove system"));
-	editor->get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("remove_system_bundle"), p_name);
-	editor->get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("add_system_bundle"), p_name);
-	editor->get_undo_redo()->commit_action();
+	EditorNode::get_undo_redo()->create_action(TTR("Remove system"));
+	EditorNode::get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("remove_system_bundle"), p_name);
+	EditorNode::get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("add_system_bundle"), p_name);
+	EditorNode::get_undo_redo()->commit_action();
 }
 
 void EditorWorldECS::pipeline_system_remove(const StringName &p_name) {
@@ -1103,10 +1104,10 @@ void EditorWorldECS::pipeline_system_remove(const StringName &p_name) {
 		return;
 	}
 
-	editor->get_undo_redo()->create_action(TTR("Remove system"));
-	editor->get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("remove_system"), p_name);
-	editor->get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("insert_system"), p_name);
-	editor->get_undo_redo()->commit_action();
+	EditorNode::get_undo_redo()->create_action(TTR("Remove system"));
+	EditorNode::get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("remove_system"), p_name);
+	EditorNode::get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("insert_system"), p_name);
+	EditorNode::get_undo_redo()->commit_action();
 }
 
 void EditorWorldECS::add_sys_show() {
@@ -1238,15 +1239,15 @@ void EditorWorldECS::add_sys_add() {
 	}
 
 	if (selected->has_meta("system_name")) {
-		editor->get_undo_redo()->create_action(TTR("Add system"));
-		editor->get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("insert_system"), selected->get_meta("system_name"));
-		editor->get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("remove_system"), selected->get_meta("system_name"));
+		EditorNode::get_undo_redo()->create_action(TTR("Add system"));
+		EditorNode::get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("insert_system"), selected->get_meta("system_name"));
+		EditorNode::get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("remove_system"), selected->get_meta("system_name"));
 	} else {
-		editor->get_undo_redo()->create_action(TTR("Add system bundle"));
-		editor->get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("add_system_bundle"), selected->get_meta("system_bundle_name"));
-		editor->get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("remove_system_bundle"), selected->get_meta("system_bundle_name"));
+		EditorNode::get_undo_redo()->create_action(TTR("Add system bundle"));
+		EditorNode::get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("add_system_bundle"), selected->get_meta("system_bundle_name"));
+		EditorNode::get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("remove_system_bundle"), selected->get_meta("system_bundle_name"));
 	}
-	editor->get_undo_redo()->commit_action();
+	EditorNode::get_undo_redo()->commit_action();
 }
 
 void EditorWorldECS::components_manage_show() {
diff --git a/modules/godot/editor_plugins/entity_editor_plugin.cpp b/modules/godot/editor_plugins/entity_editor_plugin.cpp
index b70fd2af..2fc31725 100644
--- a/modules/godot/editor_plugins/entity_editor_plugin.cpp
+++ b/modules/godot/editor_plugins/entity_editor_plugin.cpp
@@ -4,6 +4,7 @@
 #include "core/io/marshalls.h"
 #include "editor/editor_properties.h"
 #include "editor/editor_properties_array_dict.h"
+#include "editor/editor_undo_redo_manager.h"
 
 void EntityEditor::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("update_editors"), &EntityEditor::update_editors);
@@ -67,7 +68,7 @@ void EntityEditor::update_editors() {
 	if (components_section) {
 		// Remove old childs.
 		for (int i = components_section->get_vbox()->get_child_count() - 1; i >= 0; i -= 1) {
-			components_section->get_vbox()->get_child(i)->queue_delete(); // TODO is this enough to also destroy the internally created things?
+			components_section->get_vbox()->get_child(i)->queue_free(); // TODO is this enough to also destroy the internally created things?
 		}
 		components_properties.clear();
 
@@ -660,21 +661,21 @@ void EntityEditor::_add_component_pressed(uint32_t p_index) {
 		component_name = add_component_menu->get_popup()->get_item_text(p_index);
 	}
 
-	editor->get_undo_redo()->create_action(TTR("Add component"));
-	editor->get_undo_redo()->add_do_method(entity, SNAME("add_component"), component_name);
-	editor->get_undo_redo()->add_do_method(this, SNAME("update_editors"));
-	editor->get_undo_redo()->add_undo_method(entity, SNAME("remove_component"), component_name);
-	editor->get_undo_redo()->add_undo_method(this, SNAME("update_editors"));
-	editor->get_undo_redo()->commit_action();
+	EditorNode::get_undo_redo()->create_action(TTR("Add component"));
+	EditorNode::get_undo_redo()->add_do_method(entity, SNAME("add_component"), component_name);
+	EditorNode::get_undo_redo()->add_do_method(this, SNAME("update_editors"));
+	EditorNode::get_undo_redo()->add_undo_method(entity, SNAME("remove_component"), component_name);
+	EditorNode::get_undo_redo()->add_undo_method(this, SNAME("update_editors"));
+	EditorNode::get_undo_redo()->commit_action();
 }
 
 void EntityEditor::_remove_component_pressed(StringName p_component_name) {
-	editor->get_undo_redo()->create_action(TTR("Drop component"));
-	editor->get_undo_redo()->add_do_method(entity, SNAME("remove_component"), p_component_name);
-	editor->get_undo_redo()->add_do_method(this, SNAME("update_editors"));
-	editor->get_undo_redo()->add_undo_method(entity, SNAME("add_component"), p_component_name, entity_get_component_props_data(p_component_name));
-	editor->get_undo_redo()->add_undo_method(this, SNAME("update_editors"));
-	editor->get_undo_redo()->commit_action();
+	EditorNode::get_undo_redo()->create_action(TTR("Drop component"));
+	EditorNode::get_undo_redo()->add_do_method(entity, SNAME("remove_component"), p_component_name);
+	EditorNode::get_undo_redo()->add_do_method(this, SNAME("update_editors"));
+	EditorNode::get_undo_redo()->add_undo_method(entity, SNAME("add_component"), p_component_name, entity_get_component_props_data(p_component_name));
+	EditorNode::get_undo_redo()->add_undo_method(this, SNAME("update_editors"));
+	EditorNode::get_undo_redo()->commit_action();
 }
 
 void EntityEditor::_property_changed(const String &p_path, const Variant &p_value, const String &p_name, bool p_changing) {
@@ -683,11 +684,11 @@ void EntityEditor::_property_changed(const String &p_path, const Variant &p_valu
 		return;
 	}
 
-	editor->get_undo_redo()->create_action(TTR("Set component value"));
-	editor->get_undo_redo()->add_do_method(entity, SNAME("set"), p_path, p_value);
-	editor->get_undo_redo()->add_undo_method(entity, SNAME("set"), p_path, entity->get(p_path));
-	editor->get_undo_redo()->add_undo_method(this, SNAME("update_editors"));
-	editor->get_undo_redo()->commit_action();
+	EditorNode::get_undo_redo()->create_action(TTR("Set component value"));
+	EditorNode::get_undo_redo()->add_do_method(entity, SNAME("set"), p_path, p_value);
+	EditorNode::get_undo_redo()->add_undo_method(entity, SNAME("set"), p_path, entity->get(p_path));
+	EditorNode::get_undo_redo()->add_undo_method(this, SNAME("update_editors"));
+	EditorNode::get_undo_redo()->commit_action();
 
 	if (p_value.get_type() != Variant::STRING) {
 		// This is needed because string update is special: If string is updated

From b99963af22317837cf0e397ce32383b4cff6ad56 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Thu, 3 Nov 2022 20:36:40 +0100
Subject: [PATCH 03/36] Ignore script name when checking properties

---
 ecs.cpp                               | 3 +++
 modules/godot/nodes/ecs_utilities.cpp | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/ecs.cpp b/ecs.cpp
index 9c75da92..d1bfcda5 100644
--- a/ecs.cpp
+++ b/ecs.cpp
@@ -1070,6 +1070,9 @@ uint32_t ECS::register_or_update_script_component(
 
 	// Validate and initialize the parameters.
 	for (uint32_t i = 0; i < p_properties.size(); i += 1) {
+		if (p_properties[i].property.name == p_name) {
+			continue ;
+		}
 		// Is  type supported?
 		switch (p_properties[i].property.type) {
 			case Variant::NIL:
diff --git a/modules/godot/nodes/ecs_utilities.cpp b/modules/godot/nodes/ecs_utilities.cpp
index 7816ca53..ac87e28c 100644
--- a/modules/godot/nodes/ecs_utilities.cpp
+++ b/modules/godot/nodes/ecs_utilities.cpp
@@ -143,6 +143,12 @@ String System::validate_script(Ref<Script> p_script) {
 
 	List<PropertyInfo> properties;
 	p_script->get_script_property_list(&properties);
+	for (List<PropertyInfo>::Element *e = properties.front(); e; e = e->next()) {
+		if (e->get().name == p_script->get_class_category().name) {
+			properties.erase(e) ;
+		}
+	}
+
 	if (properties.size()) {
 		return TTR("The System script can't have any property in it. It possible to only access `Component`s and `Databag`s.");
 	}
@@ -332,6 +338,9 @@ String Component::validate_script(Ref<Script> p_script) {
 	List<PropertyInfo> properties;
 	p_script->get_script_property_list(&properties);
 	for (List<PropertyInfo>::Element *e = properties.front(); e; e = e->next()) {
+		if (e->get().name == p_script->get_class_category().name) {
+			continue ;
+		}
 		switch (e->get().type) {
 			case Variant::NIL:
 				return "(" + e->get().name + ") " + TTR("Please make sure all variables are typed.");

From f8db5b6c7eefd56558ebae9eade7d4a94353a221 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Thu, 3 Nov 2022 20:37:56 +0100
Subject: [PATCH 04/36] Temporarily disable registering scripts when running a
 project to fix crash

---
 modules/godot/register_types.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/godot/register_types.cpp b/modules/godot/register_types.cpp
index 08f5d0c4..a0d683ab 100644
--- a/modules/godot/register_types.cpp
+++ b/modules/godot/register_types.cpp
@@ -149,7 +149,7 @@ void initialize_godot_module(ModuleInitializationLevel p_level) {
 
 		} else {
 			// Load the Scripted Components/Databags/Systems
-			ScriptEcs::get_singleton()->register_runtime_scripts();
+//			ScriptEcs::get_singleton()->register_runtime_scripts();
 		}
 	}
 }

From f8bf505c6db97f0fb9366e57d77b73f4f4e0e697 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Sat, 5 Nov 2022 11:08:44 +0100
Subject: [PATCH 05/36] Fix loading of components from C# Remove VisualScript
 checking, as it was discontinued

---
 ecs.cpp                               | 8 ++++++--
 modules/godot/nodes/ecs_utilities.cpp | 6 +++++-
 modules/godot/nodes/script_ecs.cpp    | 3 +--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ecs.cpp b/ecs.cpp
index d1bfcda5..10fd80e7 100644
--- a/ecs.cpp
+++ b/ecs.cpp
@@ -1070,7 +1070,11 @@ uint32_t ECS::register_or_update_script_component(
 
 	// Validate and initialize the parameters.
 	for (uint32_t i = 0; i < p_properties.size(); i += 1) {
-		if (p_properties[i].property.name == p_name) {
+		if (
+				// Filter GDScript file name
+				p_properties[i].property.name == p_name
+				// Filter C# file name. It uses only the class name
+				|| p_properties[i].property.name + ".cs" == p_name) {
 			continue ;
 		}
 		// Is  type supported?
@@ -1081,7 +1085,7 @@ uint32_t ECS::register_or_update_script_component(
 			case Variant::SIGNAL:
 			case Variant::CALLABLE:
 				// TODO what about dictionary and arrays?
-				ERR_PRINT("The script component " + p_name + " is using a pointer variable. This is unsafe, so not supported. Please use a databag.");
+				ERR_PRINT("The property " + p_properties[i].property.name + " of script component " + p_name + " is using a pointer variable. This is unsafe, so not supported. Please use a databag.");
 				return UINT32_MAX;
 			default:
 				// Valid!
diff --git a/modules/godot/nodes/ecs_utilities.cpp b/modules/godot/nodes/ecs_utilities.cpp
index ac87e28c..523ee4dd 100644
--- a/modules/godot/nodes/ecs_utilities.cpp
+++ b/modules/godot/nodes/ecs_utilities.cpp
@@ -338,7 +338,11 @@ String Component::validate_script(Ref<Script> p_script) {
 	List<PropertyInfo> properties;
 	p_script->get_script_property_list(&properties);
 	for (List<PropertyInfo>::Element *e = properties.front(); e; e = e->next()) {
-		if (e->get().name == p_script->get_class_category().name) {
+		if (
+				// Filter GDScript file name
+				e->get().name == p_script->get_class_category().name
+				// Filter C# file name. It uses only the class name
+				|| p_script->get_path().ends_with(e->get().name + ".cs")) {
 			continue ;
 		}
 		switch (e->get().type) {
diff --git a/modules/godot/nodes/script_ecs.cpp b/modules/godot/nodes/script_ecs.cpp
index 3d794371..17158870 100644
--- a/modules/godot/nodes/script_ecs.cpp
+++ b/modules/godot/nodes/script_ecs.cpp
@@ -146,9 +146,8 @@ uint64_t ScriptEcs::load_scripts(EditorFileSystemDirectory *p_dir) {
 
 		if (p_dir->get_file_import_is_valid(i) &&
 				(file_type == "GDScript" ||
-						file_type == "VisualScript" ||
 						file_type == "NativeScript" ||
-						file_type == "C#" ||
+						file_type == "CSharpScript" ||
 						file_type == "Rust")) { // TODO add more?
 
 			const bool changed =

From 1a200e4ad09376387fe62550bf3675625fdd008d Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Fri, 6 Jan 2023 19:58:35 +0100
Subject: [PATCH 06/36] Update compatibility

---
 SCsub                                                 | 2 +-
 modules/bullet_physics/SCsub                          | 2 +-
 modules/godot/editor_plugins/editor_world_ecs.cpp     | 3 ++-
 modules/godot/editor_plugins/editor_world_ecs.h       | 6 ++++++
 modules/godot/editor_plugins/entity_editor_plugin.cpp | 8 ++++----
 modules/godot/editor_plugins/entity_editor_plugin.h   | 1 +
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/SCsub b/SCsub
index 97b6641c..4bf7e88a 100644
--- a/SCsub
+++ b/SCsub
@@ -6,7 +6,7 @@ Import("env")
 Import("env_modules")
 
 env_ecs = env_modules.Clone()
-if env_ecs["float"] == "64":
+if env_ecs["precision"] == "double":
     env_ecs.Append(CPPDEFINES=["BT_USE_DOUBLE_PRECISION=1"])
 
 methods_ecs.generate_system_structs()
diff --git a/modules/bullet_physics/SCsub b/modules/bullet_physics/SCsub
index 813129c2..2fabe348 100644
--- a/modules/bullet_physics/SCsub
+++ b/modules/bullet_physics/SCsub
@@ -208,7 +208,7 @@ if env["builtin_bullet"]:
     if env["target"] == "debug" or env["target"] == "release_debug":
         env_bullet.Append(CPPDEFINES=["DEBUG"])
 
-    if env["float"] == "64":
+    if env["precision"] == "double":
         env_bullet.Append(CPPDEFINES=["BT_USE_DOUBLE_PRECISION"])
 
     env_bullet.Append(CPPDEFINES=["BT_USE_OLD_DAMPING_METHOD"])
diff --git a/modules/godot/editor_plugins/editor_world_ecs.cpp b/modules/godot/editor_plugins/editor_world_ecs.cpp
index 17461d7d..73dbd388 100644
--- a/modules/godot/editor_plugins/editor_world_ecs.cpp
+++ b/modules/godot/editor_plugins/editor_world_ecs.cpp
@@ -8,10 +8,11 @@
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
+#include "editor/editor_undo_redo_manager.h"
 #include "scene/gui/color_rect.h"
 #include "scene/gui/reference_rect.h"
 #include "scene/gui/separator.h"
-#include "editor/editor_undo_redo_manager.h"
+#include "scene/gui/tree.h"
 
 PipelineElementInfoBox::PipelineElementInfoBox(EditorNode *p_editor, EditorWorldECS *p_editor_world_ecs) :
 		editor(p_editor),
diff --git a/modules/godot/editor_plugins/editor_world_ecs.h b/modules/godot/editor_plugins/editor_world_ecs.h
index 061af5bf..d039ee8c 100644
--- a/modules/godot/editor_plugins/editor_world_ecs.h
+++ b/modules/godot/editor_plugins/editor_world_ecs.h
@@ -2,6 +2,12 @@
 #define EDITORWORLDECS_H
 
 #include "editor/editor_plugin.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/margin_container.h"
+#include "scene/gui/panel_container.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/text_edit.h"
 
 class EditorNode;
 class WorldECS;
diff --git a/modules/godot/editor_plugins/entity_editor_plugin.cpp b/modules/godot/editor_plugins/entity_editor_plugin.cpp
index 2fc31725..ac40a8a5 100644
--- a/modules/godot/editor_plugins/entity_editor_plugin.cpp
+++ b/modules/godot/editor_plugins/entity_editor_plugin.cpp
@@ -4,6 +4,7 @@
 #include "core/io/marshalls.h"
 #include "editor/editor_properties.h"
 #include "editor/editor_properties_array_dict.h"
+#include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
 
 void EntityEditor::_bind_methods() {
@@ -185,6 +186,7 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 					} else {
 						EditorPropertyInteger *editor = memnew(EditorPropertyInteger);
 						int min = 0, max = 65535, step = 1;
+						bool hide_slider = false;
 						bool greater = true, lesser = true;
 
 						if (e.hint == PROPERTY_HINT_RANGE && e.hint_string.get_slice_count(",") >= 2) {
@@ -208,7 +210,7 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 							}
 						}
 
-						editor->setup(min, max, step, greater, lesser);
+						editor->setup(min, max, step, hide_slider, greater, lesser);
 						prop = editor;
 					}
 				} break;
@@ -387,15 +389,13 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 
 #define SETUP_MATH_RANGE(editor, prop_info, type)                                                   \
 	type min = -65535, max = 65535;                                                                 \
-	bool hide_slider = true;                                                                        \
                                                                                                     \
 	if (prop_info.hint == PROPERTY_HINT_RANGE && prop_info.hint_string.get_slice_count(",") >= 2) { \
 		min = e.hint_string.get_slice(",", 0).to_float();                                           \
 		max = e.hint_string.get_slice(",", 1).to_float();                                           \
-		hide_slider = false;                                                                        \
 	}                                                                                               \
                                                                                                     \
-	editor->setup(min, max, hide_slider);
+	editor->setup(min, max);
 
 #define SETUP_MATH_RANGE_WITH_STEP(editor, prop_info, type)                                         \
 	type min = -65535, max = 65535, step = default_float_step;                                      \
diff --git a/modules/godot/editor_plugins/entity_editor_plugin.h b/modules/godot/editor_plugins/entity_editor_plugin.h
index b049318d..7db101fa 100644
--- a/modules/godot/editor_plugins/entity_editor_plugin.h
+++ b/modules/godot/editor_plugins/entity_editor_plugin.h
@@ -2,6 +2,7 @@
 #define ENTITY_EDITOR_PLUGIN_H
 
 #include "core/templates/oa_hash_map.h"
+#include "editor/editor_inspector.h"
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
 

From 6d2a012e5951adb972cbee43f0376504a949d1ae Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Tue, 31 Jan 2023 07:00:19 +0100
Subject: [PATCH 07/36] Update compatibility

---
 modules/bullet_physics/components_gizmos.cpp  | 12 +--
 .../godot/editor_plugins/editor_world_ecs.cpp | 54 +++++++-------
 .../editor_plugins/entity_editor_plugin.cpp   | 74 +++++--------------
 3 files changed, 50 insertions(+), 90 deletions(-)

diff --git a/modules/bullet_physics/components_gizmos.cpp b/modules/bullet_physics/components_gizmos.cpp
index d9788f4b..7b255591 100644
--- a/modules/bullet_physics/components_gizmos.cpp
+++ b/modules/bullet_physics/components_gizmos.cpp
@@ -127,7 +127,7 @@ void BtBoxGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, cons
 	if (p_cancel) {
 		entity->set_component_value(box_component_name, half_extents_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
+		EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
 		ur->create_action(TTR("Change Shape Box Half Extent"));
 		ur->add_do_method(entity, "set_component_value", box_component_name, half_extents_name, half_extents);
 		Vector3 restore = half_extents;
@@ -253,7 +253,7 @@ void BtSphereGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, c
 	if (p_cancel) {
 		entity->set_component_value(sphere_component_name, radius_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
+		EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
 		ur->create_action(TTR("Change Shape Sphere Radius"));
 		ur->add_do_method(entity, "set_component_value", sphere_component_name, radius_name, radius);
 		ur->add_undo_method(entity, "set_component_value", sphere_component_name, radius_name, p_restore);
@@ -423,7 +423,7 @@ void BtCapsuleGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx,
 	if (p_cancel) {
 		entity->set_component_value(capsule_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
+		EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
 		ur->create_action(TTR("Change Shape Capsule Radius"));
 		ur->add_do_method(entity, "set_component_value", capsule_component_name, p_idx == 0 ? radius_name : height_name, v);
 		ur->add_undo_method(entity, "set_component_value", capsule_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
@@ -569,7 +569,7 @@ void BtConeGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, con
 	if (p_cancel) {
 		entity->set_component_value(cone_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
+		EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
 		ur->create_action(TTR("Change Shape Cone Radius"));
 		ur->add_do_method(entity, "set_component_value", cone_component_name, p_idx == 0 ? radius_name : height_name, v);
 		ur->add_undo_method(entity, "set_component_value", cone_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
@@ -732,7 +732,7 @@ void BtCylinderGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx,
 	if (p_cancel) {
 		entity->set_component_value(cylinder_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
+		EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
 		ur->create_action(TTR("Change Shape Capsule Radius"));
 		ur->add_do_method(entity, "set_component_value", cylinder_component_name, p_idx == 0 ? radius_name : height_name, v);
 		ur->add_undo_method(entity, "set_component_value", cylinder_component_name, p_idx == 0 ? radius_name : height_name, p_restore);
@@ -1079,7 +1079,7 @@ void BtPawnGizmo::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_idx, con
 	if (p_cancel) {
 		entity->set_component_value(pawn_component_name, prop_name, p_restore);
 	} else {
-		Ref<EditorUndoRedoManager> ur = EditorNode::get_undo_redo();
+		EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
 		ur->create_action(TTR("Change Shape Capsule Radius"));
 		ur->add_do_method(entity, "set_component_value", pawn_component_name, prop_name, v);
 		ur->add_undo_method(entity, "set_component_value", pawn_component_name, prop_name, p_restore);
diff --git a/modules/godot/editor_plugins/editor_world_ecs.cpp b/modules/godot/editor_plugins/editor_world_ecs.cpp
index 73dbd388..3932e150 100644
--- a/modules/godot/editor_plugins/editor_world_ecs.cpp
+++ b/modules/godot/editor_plugins/editor_world_ecs.cpp
@@ -843,10 +843,10 @@ void EditorWorldECS::pipeline_change_name(const String &p_name) {
 		return;
 	}
 
-	EditorNode::get_undo_redo()->create_action(TTR("Change pipeline name"));
-	EditorNode::get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("set_pipeline_name"), p_name);
-	EditorNode::get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("set_pipeline_name"), pipeline->get_pipeline_name());
-	EditorNode::get_undo_redo()->commit_action();
+	EditorUndoRedoManager::get_singleton()->create_action(TTR("Change pipeline name"));
+	EditorUndoRedoManager::get_singleton()->add_do_method(pipeline.ptr(), SNAME("set_pipeline_name"), p_name);
+	EditorUndoRedoManager::get_singleton()->add_undo_method(pipeline.ptr(), SNAME("set_pipeline_name"), pipeline->get_pipeline_name());
+	EditorUndoRedoManager::get_singleton()->commit_action();
 }
 
 void EditorWorldECS::pipeline_list_update() {
@@ -916,10 +916,10 @@ void EditorWorldECS::pipeline_add() {
 	pip->set_pipeline_name(name);
 	set_pipeline(pip);
 
-	EditorNode::get_undo_redo()->create_action(TTR("Add pipeline"));
-	EditorNode::get_undo_redo()->add_do_method(world_ecs, SNAME("add_pipeline"), pip);
-	EditorNode::get_undo_redo()->add_undo_method(world_ecs, SNAME("remove_pipeline"), pip);
-	EditorNode::get_undo_redo()->commit_action();
+	EditorUndoRedoManager::get_singleton()->create_action(TTR("Add pipeline"));
+	EditorUndoRedoManager::get_singleton()->add_do_method(world_ecs, SNAME("add_pipeline"), pip);
+	EditorUndoRedoManager::get_singleton()->add_undo_method(world_ecs, SNAME("remove_pipeline"), pip);
+	EditorUndoRedoManager::get_singleton()->commit_action();
 }
 
 void EditorWorldECS::pipeline_rename_show_window() {
@@ -939,10 +939,10 @@ void EditorWorldECS::pipeline_remove() {
 		return;
 	}
 
-	EditorNode::get_undo_redo()->create_action(TTR("Pipeline remove"));
-	EditorNode::get_undo_redo()->add_do_method(world_ecs, SNAME("remove_pipeline"), pipeline);
-	EditorNode::get_undo_redo()->add_undo_method(world_ecs, SNAME("add_pipeline"), pipeline);
-	EditorNode::get_undo_redo()->commit_action();
+	EditorUndoRedoManager::get_singleton()->create_action(TTR("Pipeline remove"));
+	EditorUndoRedoManager::get_singleton()->add_do_method(world_ecs, SNAME("remove_pipeline"), pipeline);
+	EditorUndoRedoManager::get_singleton()->add_undo_method(world_ecs, SNAME("add_pipeline"), pipeline);
+	EditorUndoRedoManager::get_singleton()->commit_action();
 }
 
 void EditorWorldECS::pipeline_toggle_pipeline_view() {
@@ -1094,10 +1094,10 @@ void EditorWorldECS::pipeline_system_bundle_remove(const StringName &p_name) {
 		return;
 	}
 
-	EditorNode::get_undo_redo()->create_action(TTR("Remove system"));
-	EditorNode::get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("remove_system_bundle"), p_name);
-	EditorNode::get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("add_system_bundle"), p_name);
-	EditorNode::get_undo_redo()->commit_action();
+	EditorUndoRedoManager::get_singleton()->create_action(TTR("Remove system"));
+	EditorUndoRedoManager::get_singleton()->add_do_method(pipeline.ptr(), SNAME("remove_system_bundle"), p_name);
+	EditorUndoRedoManager::get_singleton()->add_undo_method(pipeline.ptr(), SNAME("add_system_bundle"), p_name);
+	EditorUndoRedoManager::get_singleton()->commit_action();
 }
 
 void EditorWorldECS::pipeline_system_remove(const StringName &p_name) {
@@ -1105,10 +1105,10 @@ void EditorWorldECS::pipeline_system_remove(const StringName &p_name) {
 		return;
 	}
 
-	EditorNode::get_undo_redo()->create_action(TTR("Remove system"));
-	EditorNode::get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("remove_system"), p_name);
-	EditorNode::get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("insert_system"), p_name);
-	EditorNode::get_undo_redo()->commit_action();
+	EditorUndoRedoManager::get_singleton()->create_action(TTR("Remove system"));
+	EditorUndoRedoManager::get_singleton()->add_do_method(pipeline.ptr(), SNAME("remove_system"), p_name);
+	EditorUndoRedoManager::get_singleton()->add_undo_method(pipeline.ptr(), SNAME("insert_system"), p_name);
+	EditorUndoRedoManager::get_singleton()->commit_action();
 }
 
 void EditorWorldECS::add_sys_show() {
@@ -1240,15 +1240,15 @@ void EditorWorldECS::add_sys_add() {
 	}
 
 	if (selected->has_meta("system_name")) {
-		EditorNode::get_undo_redo()->create_action(TTR("Add system"));
-		EditorNode::get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("insert_system"), selected->get_meta("system_name"));
-		EditorNode::get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("remove_system"), selected->get_meta("system_name"));
+		EditorUndoRedoManager::get_singleton()->create_action(TTR("Add system"));
+		EditorUndoRedoManager::get_singleton()->add_do_method(pipeline.ptr(), SNAME("insert_system"), selected->get_meta("system_name"));
+		EditorUndoRedoManager::get_singleton()->add_undo_method(pipeline.ptr(), SNAME("remove_system"), selected->get_meta("system_name"));
 	} else {
-		EditorNode::get_undo_redo()->create_action(TTR("Add system bundle"));
-		EditorNode::get_undo_redo()->add_do_method(pipeline.ptr(), SNAME("add_system_bundle"), selected->get_meta("system_bundle_name"));
-		EditorNode::get_undo_redo()->add_undo_method(pipeline.ptr(), SNAME("remove_system_bundle"), selected->get_meta("system_bundle_name"));
+		EditorUndoRedoManager::get_singleton()->create_action(TTR("Add system bundle"));
+		EditorUndoRedoManager::get_singleton()->add_do_method(pipeline.ptr(), SNAME("add_system_bundle"), selected->get_meta("system_bundle_name"));
+		EditorUndoRedoManager::get_singleton()->add_undo_method(pipeline.ptr(), SNAME("remove_system_bundle"), selected->get_meta("system_bundle_name"));
 	}
-	EditorNode::get_undo_redo()->commit_action();
+	EditorUndoRedoManager::get_singleton()->commit_action();
 }
 
 void EditorWorldECS::components_manage_show() {
diff --git a/modules/godot/editor_plugins/entity_editor_plugin.cpp b/modules/godot/editor_plugins/entity_editor_plugin.cpp
index ac40a8a5..e4db0c6f 100644
--- a/modules/godot/editor_plugins/entity_editor_plugin.cpp
+++ b/modules/godot/editor_plugins/entity_editor_plugin.cpp
@@ -338,46 +338,6 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 							editor->set_save_mode();
 						}
 						prop = editor;
-
-					} else if (e.hint == PROPERTY_HINT_METHOD_OF_VARIANT_TYPE ||
-							   e.hint == PROPERTY_HINT_METHOD_OF_BASE_TYPE ||
-							   e.hint == PROPERTY_HINT_METHOD_OF_INSTANCE ||
-							   e.hint == PROPERTY_HINT_METHOD_OF_SCRIPT ||
-							   e.hint == PROPERTY_HINT_PROPERTY_OF_VARIANT_TYPE ||
-							   e.hint == PROPERTY_HINT_PROPERTY_OF_BASE_TYPE ||
-							   e.hint == PROPERTY_HINT_PROPERTY_OF_INSTANCE ||
-							   e.hint == PROPERTY_HINT_PROPERTY_OF_SCRIPT) {
-						EditorPropertyMember *editor = memnew(EditorPropertyMember);
-
-						EditorPropertyMember::Type type = EditorPropertyMember::MEMBER_METHOD_OF_BASE_TYPE;
-						switch (e.hint) {
-							case PROPERTY_HINT_METHOD_OF_BASE_TYPE:
-								type = EditorPropertyMember::MEMBER_METHOD_OF_BASE_TYPE;
-								break;
-							case PROPERTY_HINT_METHOD_OF_INSTANCE:
-								type = EditorPropertyMember::MEMBER_METHOD_OF_INSTANCE;
-								break;
-							case PROPERTY_HINT_METHOD_OF_SCRIPT:
-								type = EditorPropertyMember::MEMBER_METHOD_OF_SCRIPT;
-								break;
-							case PROPERTY_HINT_PROPERTY_OF_VARIANT_TYPE:
-								type = EditorPropertyMember::MEMBER_PROPERTY_OF_VARIANT_TYPE;
-								break;
-							case PROPERTY_HINT_PROPERTY_OF_BASE_TYPE:
-								type = EditorPropertyMember::MEMBER_PROPERTY_OF_BASE_TYPE;
-								break;
-							case PROPERTY_HINT_PROPERTY_OF_INSTANCE:
-								type = EditorPropertyMember::MEMBER_PROPERTY_OF_INSTANCE;
-								break;
-							case PROPERTY_HINT_PROPERTY_OF_SCRIPT:
-								type = EditorPropertyMember::MEMBER_PROPERTY_OF_SCRIPT;
-								break;
-							default: {
-							}
-						}
-						editor->setup(type, e.hint_string);
-						prop = editor;
-
 					} else {
 						EditorPropertyText *editor = memnew(EditorPropertyText);
 						if (e.hint == PROPERTY_HINT_PLACEHOLDER_TEXT) {
@@ -661,21 +621,21 @@ void EntityEditor::_add_component_pressed(uint32_t p_index) {
 		component_name = add_component_menu->get_popup()->get_item_text(p_index);
 	}
 
-	EditorNode::get_undo_redo()->create_action(TTR("Add component"));
-	EditorNode::get_undo_redo()->add_do_method(entity, SNAME("add_component"), component_name);
-	EditorNode::get_undo_redo()->add_do_method(this, SNAME("update_editors"));
-	EditorNode::get_undo_redo()->add_undo_method(entity, SNAME("remove_component"), component_name);
-	EditorNode::get_undo_redo()->add_undo_method(this, SNAME("update_editors"));
-	EditorNode::get_undo_redo()->commit_action();
+	EditorUndoRedoManager::get_singleton()->create_action(TTR("Add component"));
+	EditorUndoRedoManager::get_singleton()->add_do_method(entity, SNAME("add_component"), component_name);
+	EditorUndoRedoManager::get_singleton()->add_do_method(this, SNAME("update_editors"));
+	EditorUndoRedoManager::get_singleton()->add_undo_method(entity, SNAME("remove_component"), component_name);
+	EditorUndoRedoManager::get_singleton()->add_undo_method(this, SNAME("update_editors"));
+	EditorUndoRedoManager::get_singleton()->commit_action();
 }
 
 void EntityEditor::_remove_component_pressed(StringName p_component_name) {
-	EditorNode::get_undo_redo()->create_action(TTR("Drop component"));
-	EditorNode::get_undo_redo()->add_do_method(entity, SNAME("remove_component"), p_component_name);
-	EditorNode::get_undo_redo()->add_do_method(this, SNAME("update_editors"));
-	EditorNode::get_undo_redo()->add_undo_method(entity, SNAME("add_component"), p_component_name, entity_get_component_props_data(p_component_name));
-	EditorNode::get_undo_redo()->add_undo_method(this, SNAME("update_editors"));
-	EditorNode::get_undo_redo()->commit_action();
+	EditorUndoRedoManager::get_singleton()->create_action(TTR("Drop component"));
+	EditorUndoRedoManager::get_singleton()->add_do_method(entity, SNAME("remove_component"), p_component_name);
+	EditorUndoRedoManager::get_singleton()->add_do_method(this, SNAME("update_editors"));
+	EditorUndoRedoManager::get_singleton()->add_undo_method(entity, SNAME("add_component"), p_component_name, entity_get_component_props_data(p_component_name));
+	EditorUndoRedoManager::get_singleton()->add_undo_method(this, SNAME("update_editors"));
+	EditorUndoRedoManager::get_singleton()->commit_action();
 }
 
 void EntityEditor::_property_changed(const String &p_path, const Variant &p_value, const String &p_name, bool p_changing) {
@@ -684,11 +644,11 @@ void EntityEditor::_property_changed(const String &p_path, const Variant &p_valu
 		return;
 	}
 
-	EditorNode::get_undo_redo()->create_action(TTR("Set component value"));
-	EditorNode::get_undo_redo()->add_do_method(entity, SNAME("set"), p_path, p_value);
-	EditorNode::get_undo_redo()->add_undo_method(entity, SNAME("set"), p_path, entity->get(p_path));
-	EditorNode::get_undo_redo()->add_undo_method(this, SNAME("update_editors"));
-	EditorNode::get_undo_redo()->commit_action();
+	EditorUndoRedoManager::get_singleton()->create_action(TTR("Set component value"));
+	EditorUndoRedoManager::get_singleton()->add_do_method(entity, SNAME("set"), p_path, p_value);
+	EditorUndoRedoManager::get_singleton()->add_undo_method(entity, SNAME("set"), p_path, entity->get(p_path));
+	EditorUndoRedoManager::get_singleton()->add_undo_method(this, SNAME("update_editors"));
+	EditorUndoRedoManager::get_singleton()->commit_action();
 
 	if (p_value.get_type() != Variant::STRING) {
 		// This is needed because string update is special: If string is updated

From f3a5fd2bb361d4db602e2401c914d90b50e2eae4 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Sat, 11 Feb 2023 22:07:01 +0100
Subject: [PATCH 08/36] Move register_runtime_scripts to
 NOTIFICATION_POSTINITIALIZE

---
 README.md                          |  2 +-
 modules/godot/nodes/ecs_world.cpp  | 13 ++++++++-----
 modules/godot/nodes/script_ecs.cpp |  2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e128a113..baa00795 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Godex is a Godot Engine ecs library.
 **Disclaimer:** this module is still in development, open an [issues](https://github.com/GodotECS/godex/issues) to report any problem or a new [discussion](https://github.com/GodotECS/godex/discussions) if you need any help. Any form of contribution is welcome.
 
 ### The tested Godot version
-Is `master` `889868cbbc8beac74d5f49f9b7ef41efc4ae7d5a`, please open an issue if the current master is not working or doesn't compile.
+Is `master` `c4fb119f03477ad9a494ba6cdad211b35a8efcce`, please open an issue if the current master is not working or doesn't compile.
 
 ### What is ECS
 Shortened as ECS, the Entity Component System is an architectural design pattern that allow to organize the data in a way so that the workload can be split into small and easy programs.
diff --git a/modules/godot/nodes/ecs_world.cpp b/modules/godot/nodes/ecs_world.cpp
index e0ed01e2..3d72ffe8 100644
--- a/modules/godot/nodes/ecs_world.cpp
+++ b/modules/godot/nodes/ecs_world.cpp
@@ -166,7 +166,9 @@ const ExecutionGraph *PipelineECS::editor_get_execution_graph_or_null() const {
 }
 
 void PipelineECS::editor_reload_execution_graph() {
-	editor_clear_execution_graph();
+	if (Engine::get_singleton()->is_editor_hint()) {
+		editor_clear_execution_graph();
+	}
 	// Re-build the execution graph.
 	editor_get_execution_graph();
 }
@@ -326,6 +328,11 @@ void WorldECS::_get_property_list(List<PropertyInfo> *p_list) const {
 
 void WorldECS::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_POSTINITIALIZE:
+			// Make sure to register all scripted components/databags/systems
+			// at this point.
+			ScriptEcs::get_singleton()->register_runtime_scripts();
+			break;
 		case NOTIFICATION_READY:
 #ifdef TOOLS_ENABLED
 			if (Engine::get_singleton()->is_editor_hint()) {
@@ -335,10 +342,6 @@ void WorldECS::_notification(int p_what) {
 			}
 #endif
 
-			// Make sure to register all scripted components/databags/systems
-			// at this point.
-			ScriptEcs::get_singleton()->register_runtime_scripts(); // TODO do I need this?
-
 			add_to_group("_world_ecs");
 			if (Engine::get_singleton()->is_editor_hint() == false) {
 				active_world();
diff --git a/modules/godot/nodes/script_ecs.cpp b/modules/godot/nodes/script_ecs.cpp
index 17158870..93d6f6d3 100644
--- a/modules/godot/nodes/script_ecs.cpp
+++ b/modules/godot/nodes/script_ecs.cpp
@@ -445,6 +445,8 @@ void ScriptEcs::flush_scripts_preparation() {
 }
 
 void ScriptEcs::save_script(const String &p_setting_list_name, const String &p_script_path) {
+	if (!Engine::get_singleton()->is_editor_hint())
+		return;
 	ERR_FAIL_COND_MSG(EditorNode::get_singleton() == nullptr, "The editor is not defined.");
 
 	Array scripts;

From 1412b3c730bf00915e7a05dc299f0a22abc68e20 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Sun, 12 Feb 2023 11:50:40 +0100
Subject: [PATCH 09/36] Call register_runtime_scripts in NOTIFICATION_READY as
 well.

---
 modules/godot/nodes/ecs_world.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/godot/nodes/ecs_world.cpp b/modules/godot/nodes/ecs_world.cpp
index 3d72ffe8..216e3452 100644
--- a/modules/godot/nodes/ecs_world.cpp
+++ b/modules/godot/nodes/ecs_world.cpp
@@ -342,6 +342,7 @@ void WorldECS::_notification(int p_what) {
 			}
 #endif
 
+			ScriptEcs::get_singleton()->register_runtime_scripts();
 			add_to_group("_world_ecs");
 			if (Engine::get_singleton()->is_editor_hint() == false) {
 				active_world();

From 5291ad1b354fa7300e8f16e155e33f9c0d9bcfb8 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Tue, 14 Feb 2023 15:23:05 +0100
Subject: [PATCH 10/36] Fix formatting

---
 ecs.cpp                                           | 2 +-
 modules/bullet_physics/components_gizmos.cpp      | 4 ++--
 modules/godot/editor_plugins/editor_world_ecs.cpp | 2 +-
 modules/godot/editor_plugins/editor_world_ecs.h   | 2 +-
 modules/godot/nodes/ecs_utilities.cpp             | 4 ++--
 modules/godot/register_types.cpp                  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ecs.cpp b/ecs.cpp
index 10fd80e7..5fae0f46 100644
--- a/ecs.cpp
+++ b/ecs.cpp
@@ -1075,7 +1075,7 @@ uint32_t ECS::register_or_update_script_component(
 				p_properties[i].property.name == p_name
 				// Filter C# file name. It uses only the class name
 				|| p_properties[i].property.name + ".cs" == p_name) {
-			continue ;
+			continue;
 		}
 		// Is  type supported?
 		switch (p_properties[i].property.type) {
diff --git a/modules/bullet_physics/components_gizmos.cpp b/modules/bullet_physics/components_gizmos.cpp
index 7b255591..2e7b91d0 100644
--- a/modules/bullet_physics/components_gizmos.cpp
+++ b/modules/bullet_physics/components_gizmos.cpp
@@ -1,10 +1,10 @@
 #include "components_gizmos.h"
 
 #include "debug_utilities.h"
-#include "editor/editor_settings.h"
-#include "editor/plugins/node_3d_editor_plugin.h"
 #include "editor/editor_node.h"
+#include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
 
 void BtBoxGizmo::init() {
 	const Color gizmo_color = EDITOR_DEF("editors/3d_gizmos/gizmo_colors/shape", Color(0.5, 0.7, 1));
diff --git a/modules/godot/editor_plugins/editor_world_ecs.cpp b/modules/godot/editor_plugins/editor_world_ecs.cpp
index 3932e150..f6c0d447 100644
--- a/modules/godot/editor_plugins/editor_world_ecs.cpp
+++ b/modules/godot/editor_plugins/editor_world_ecs.cpp
@@ -1285,7 +1285,7 @@ void EditorWorldECS::remove_node_and_reparent_children(Node *p_node) {
 	while (true) {
 		bool clear = true;
 		for (int i = 0; i < p_node->get_child_count(false); i++) {
-			Node* c_node = p_node->get_child(i, false);
+			Node *c_node = p_node->get_child(i, false);
 			if (!c_node->get_owner()) {
 				continue;
 			}
diff --git a/modules/godot/editor_plugins/editor_world_ecs.h b/modules/godot/editor_plugins/editor_world_ecs.h
index d039ee8c..03067672 100644
--- a/modules/godot/editor_plugins/editor_world_ecs.h
+++ b/modules/godot/editor_plugins/editor_world_ecs.h
@@ -5,8 +5,8 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/panel_container.h"
 #include "scene/gui/option_button.h"
+#include "scene/gui/panel_container.h"
 #include "scene/gui/text_edit.h"
 
 class EditorNode;
diff --git a/modules/godot/nodes/ecs_utilities.cpp b/modules/godot/nodes/ecs_utilities.cpp
index 523ee4dd..52fb1e7c 100644
--- a/modules/godot/nodes/ecs_utilities.cpp
+++ b/modules/godot/nodes/ecs_utilities.cpp
@@ -145,7 +145,7 @@ String System::validate_script(Ref<Script> p_script) {
 	p_script->get_script_property_list(&properties);
 	for (List<PropertyInfo>::Element *e = properties.front(); e; e = e->next()) {
 		if (e->get().name == p_script->get_class_category().name) {
-			properties.erase(e) ;
+			properties.erase(e);
 		}
 	}
 
@@ -343,7 +343,7 @@ String Component::validate_script(Ref<Script> p_script) {
 				e->get().name == p_script->get_class_category().name
 				// Filter C# file name. It uses only the class name
 				|| p_script->get_path().ends_with(e->get().name + ".cs")) {
-			continue ;
+			continue;
 		}
 		switch (e->get().type) {
 			case Variant::NIL:
diff --git a/modules/godot/register_types.cpp b/modules/godot/register_types.cpp
index a0d683ab..63bb8649 100644
--- a/modules/godot/register_types.cpp
+++ b/modules/godot/register_types.cpp
@@ -149,7 +149,7 @@ void initialize_godot_module(ModuleInitializationLevel p_level) {
 
 		} else {
 			// Load the Scripted Components/Databags/Systems
-//			ScriptEcs::get_singleton()->register_runtime_scripts();
+			// ScriptEcs::get_singleton()->register_runtime_scripts();
 		}
 	}
 }

From 9ab9ed54fd469afb476c9bf2c2592f2e88bc273b Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Tue, 21 Feb 2023 22:44:30 +0100
Subject: [PATCH 11/36] Compatibility changes Handle WorldECSEditorPlugin::edit
 being called with nullptr Move adding Components3DGizmoPlugin to _editor_init
 Reset default properties when destructing ScriptEcs

---
 .../godot/editor_plugins/editor_world_ecs.cpp |  3 +++
 modules/godot/nodes/script_ecs.cpp            | 24 +++++++++++++++++++
 modules/godot/nodes/script_ecs.h              |  1 +
 modules/godot/register_types.cpp              | 10 ++++----
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/modules/godot/editor_plugins/editor_world_ecs.cpp b/modules/godot/editor_plugins/editor_world_ecs.cpp
index f6c0d447..6e38f27d 100644
--- a/modules/godot/editor_plugins/editor_world_ecs.cpp
+++ b/modules/godot/editor_plugins/editor_world_ecs.cpp
@@ -1372,6 +1372,9 @@ WorldECSEditorPlugin::~WorldECSEditorPlugin() {
 }
 
 void WorldECSEditorPlugin::edit(Object *p_object) {
+	if (p_object == nullptr) {
+		return;
+	}
 	world_ecs = Object::cast_to<WorldECS>(p_object);
 	ERR_FAIL_COND_MSG(world_ecs == nullptr, "The object should be of type WorldECS [BUG].");
 	ecs_editor->set_world_ecs(world_ecs);
diff --git a/modules/godot/nodes/script_ecs.cpp b/modules/godot/nodes/script_ecs.cpp
index 93d6f6d3..102df79d 100644
--- a/modules/godot/nodes/script_ecs.cpp
+++ b/modules/godot/nodes/script_ecs.cpp
@@ -26,6 +26,7 @@ ScriptEcs *ScriptEcs::get_singleton() {
 }
 
 ScriptEcs::~ScriptEcs() {
+	reset_editor_default_component_properties();
 	singleton = nullptr;
 
 	__empty_scripts();
@@ -190,6 +191,29 @@ void ScriptEcs::define_editor_default_component_properties() {
 	}
 }
 
+void ScriptEcs::reset_editor_default_component_properties() {
+	const StringName entity_3d_name = Entity3D::get_class_static();
+	const StringName entity_2d_name = Entity2D::get_class_static();
+
+	for (godex::component_id id = 0; id < ECS::get_components_count(); id += 1) {
+		const LocalVector<PropertyInfo> *props = ECS::component_get_static_properties(id);
+		for (uint32_t p = 0; p < props->size(); p += 1) {
+			ClassDB::set_property_default_value(entity_3d_name, StringName(String(ECS::get_component_name(id)) + "/" + (*props)[p].name), Variant());
+			ClassDB::set_property_default_value(entity_2d_name, StringName(String(ECS::get_component_name(id)) + "/" + (*props)[p].name), Variant());
+		}
+	}
+
+	// Register the scripted component defaults.
+	for (uint32_t i = 0; i < components.size(); i += 1) {
+		List<PropertyInfo> props;
+		components[i]->get_property_list(&props);
+		for (List<PropertyInfo>::Element *e = props.front(); e; e = e->next()) {
+			ClassDB::set_property_default_value(entity_3d_name, StringName(String(component_names[i]) + "/" + e->get().name), Variant());
+			ClassDB::set_property_default_value(entity_2d_name, StringName(String(component_names[i]) + "/" + e->get().name), Variant());
+		}
+	}
+}
+
 void ScriptEcs::register_runtime_scripts() {
 	if (Engine::get_singleton()->is_editor_hint()) {
 		// Only when the editor is off the Scripted components are registered.
diff --git a/modules/godot/nodes/script_ecs.h b/modules/godot/nodes/script_ecs.h
index 05e6b8fc..0eac40ba 100644
--- a/modules/godot/nodes/script_ecs.h
+++ b/modules/godot/nodes/script_ecs.h
@@ -87,6 +87,7 @@ class ScriptEcs : public Object {
 	uint64_t load_scripts(EditorFileSystemDirectory *p_dir);
 
 	void define_editor_default_component_properties();
+	void reset_editor_default_component_properties();
 
 	void register_runtime_scripts();
 
diff --git a/modules/godot/register_types.cpp b/modules/godot/register_types.cpp
index 63bb8649..269930af 100644
--- a/modules/godot/register_types.cpp
+++ b/modules/godot/register_types.cpp
@@ -25,6 +25,8 @@
 
 #include "editor/plugins/node_3d_editor_plugin.h"
 
+extern Ref<Components3DGizmoPlugin> component_gizmo;
+
 static void _editor_init() {
 	EditorNode *p_editor = EditorNode::get_singleton();
 	ERR_FAIL_COND_MSG(p_editor == nullptr, "The editor is not defined.");
@@ -34,6 +36,9 @@ static void _editor_init() {
 
 	WorldECSEditorPlugin *worldecs_plugin = memnew(WorldECSEditorPlugin(p_editor));
 	EditorNode::get_singleton()->add_editor_plugin(worldecs_plugin);
+
+	Node3DEditor::get_singleton()->add_gizmo_plugin(Ref<Components3DGizmoPlugin>(Components3DGizmoPlugin::get_singleton()));
+	component_gizmo = Ref<Components3DGizmoPlugin>();
 }
 
 void initialize_godot_module(ModuleInitializationLevel p_level) {
@@ -138,11 +143,6 @@ void initialize_godot_module(ModuleInitializationLevel p_level) {
 		if (Engine::get_singleton()->is_editor_hint()) {
 			EditorNode::add_init_callback(_editor_init);
 
-			if (Node3DEditor::get_singleton() != nullptr) {
-				// Add component gizmos:
-				Node3DEditor::get_singleton()->add_gizmo_plugin(Ref<Components3DGizmoPlugin>(Components3DGizmoPlugin::get_singleton()));
-			}
-
 			// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Gizmos
 			Components3DGizmoPlugin::get_singleton()->add_component_gizmo(memnew(TransformComponentGizmo));
 			Components3DGizmoPlugin::get_singleton()->add_component_gizmo(memnew(MeshComponentGizmo));

From 0069914c18089c29bb72f5e3e17e1994423691c4 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Mon, 13 Feb 2023 07:35:34 +0100
Subject: [PATCH 12/36] Change godot version to check out

---
 .github/workflows/linux_builds.yml   | 4 ++--
 .github/workflows/windows_builds.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 873a5594..01b96b6c 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -33,8 +33,8 @@ jobs:
     - name: Clone godot for godex
       uses: actions/checkout@v2
       with:
-       repository: GodotECS/godot
-       ref: refs/heads/godex_version
+       repository: godotengine/godot
+       ref: c4fb119f03477ad9a494ba6cdad211b35a8efcce
        path: godot
 
     # Azure repositories are not reliable, we need to prevent azure giving us packages.
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index c2571948..b3010cbc 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -36,8 +36,8 @@ jobs:
     - name: Clone godot for godex
       uses: actions/checkout@v2
       with:
-       repository: GodotECS/godot
-       ref: refs/heads/godex_version
+       repository: godotengine/godot
+       ref: c4fb119f03477ad9a494ba6cdad211b35a8efcce
        path: godot
 
     # Upload cache on completion and check it out now

From 27d873bb3875b174a12626f62118e787c1ab1bc2 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Mon, 13 Feb 2023 07:37:49 +0100
Subject: [PATCH 13/36] Adjust target

---
 .github/workflows/linux_builds.yml   | 4 ++--
 .github/workflows/windows_builds.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 01b96b6c..7490384b 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   linux-editor:
     runs-on: "ubuntu-20.04"
-    name: Editor (target=release_debug, tools=yes, tests=yes)
+    name: Editor (target=editor, tools=yes, tests=yes)
 
     steps:
     - name: Make godot dir
@@ -84,7 +84,7 @@ jobs:
         SCONS_CACHE: ${{github.workspace}}/.scons_cache/
       run: |
        cd godot
-       scons tools=yes tests=yes target=release_debug custom_modules="../modules" -j2
+       scons tools=yes tests=yes target=editor custom_modules="../modules" -j2
        ls -l bin/
 
     # Execute unit tests for the editor
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index b3010cbc..2909a64a 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -19,7 +19,7 @@ jobs:
   windows-editor:
     # Windows 10 with latest image
     runs-on: "windows-latest"
-    name: Editor (target=release_debug, tools=yes, tests=yes)
+    name: Editor (target=editor, tools=yes, tests=yes)
 
     steps:
     - name: Make dir
@@ -76,7 +76,7 @@ jobs:
         SCONS_CACHE: ${{github.workspace}}/.scons_cache/
       run: |
         cd godot
-        scons tools=yes tests=yes target=release_debug custom_modules="../modules"
+        scons tools=yes tests=yes target=editor custom_modules="../modules"
         ls -l bin/
 
     # Execute unit tests for the editor

From 9c282c262e3668fe940732e36b12d42bbda8772b Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Mon, 13 Feb 2023 10:43:24 +0100
Subject: [PATCH 14/36] Update patch

---
 patches/add_custom_iterator.patch | 99 +++++++++++++++++--------------
 1 file changed, 56 insertions(+), 43 deletions(-)

diff --git a/patches/add_custom_iterator.patch b/patches/add_custom_iterator.patch
index a6ce6a3e..855dc2b7 100644
--- a/patches/add_custom_iterator.patch
+++ b/patches/add_custom_iterator.patch
@@ -1,43 +1,18 @@
-diff --git a/SConstruct b/SConstruct
-index 9dcc6c554f..6e98983e18 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -646,6 +646,15 @@ if selected_platform in platform_list:
-                 env.module_icons_paths.append(path + "/" + "icons")
-             modules_enabled[name] = path
- 
-+            if getattr(config, "has_custom_iterator", False) and config.has_custom_iterator():
-+                env.AppendUnique(CPPDEFINES=["CUSTOM_ITERATOR"])
-+
-+            if getattr(config, "has_custom_physics_iterator", False) and config.has_custom_physics_iterator():
-+                env.AppendUnique(CPPDEFINES=["CUSTOM_PHYSICS_ITERATOR"])
-+
-+            if getattr(config, "has_custom_audio_iterator", False) and config.has_custom_audio_iterator():
-+                env.AppendUnique(CPPDEFINES=["CUSTOM_AUDIO_ITERATOR"])
-+
-         sys.path.remove(path)
-         sys.modules.pop("config")
+Subject: [PATCH] Add custom iterator
+---
+Index: main/main.cpp
+diff --git a/main/main.cpp b/main/main.cpp
+--- a/main/main.cpp	(revision c4fb119f03477ad9a494ba6cdad211b35a8efcce)
++++ b/main/main.cpp	(date 1676280765409)
+@@ -3058,7 +3058,6 @@
  
-diff --git a/core/config/engine.h b/core/config/engine.h
-index ae33acede2..045a5215b6 100644
---- a/core/config/engine.h
-+++ b/core/config/engine.h
-@@ -92,8 +92,10 @@ public:
+ 	uint64_t physics_process_ticks = 0;
+ 	uint64_t process_ticks = 0;
+-	uint64_t navigation_process_ticks = 0;
  
- 	uint64_t get_frames_drawn();
+ 	frame += ticks_elapsed;
  
-+	void set_physics_frames(uint32_t p_physics_frames) { _physics_frames = p_physics_frames; }
- 	uint64_t get_physics_frames() const { return _physics_frames; }
- 	uint64_t get_process_frames() const { return _process_frames; }
-+	void set_in_physics_frame(bool p_in_physics) { _in_physics = p_in_physics; }
- 	bool is_in_physics_frame() const { return _in_physics; }
- 	uint64_t get_frame_ticks() const { return _frame_ticks; }
- 	double get_process_step() const { return _process_step; }
-diff --git a/main/main.cpp b/main/main.cpp
-index 9b7f960660..449fb531f4 100644
---- a/main/main.cpp
-+++ b/main/main.cpp
-@@ -2639,6 +2639,13 @@ bool Main::iteration() {
+@@ -3075,6 +3074,15 @@
  	// process all our active interfaces
  	XRServer::get_singleton()->_process();
  
@@ -46,12 +21,14 @@ index 9b7f960660..449fb531f4 100644
 +#endif
 +
 +#ifndef CUSTOM_PHYSICS_ITERATOR
++	uint64_t navigation_process_ticks = 0;
++
 +	Engine::get_singleton()->_in_physics = true;
 +
  	for (int iters = 0; iters < advance.physics_steps; ++iters) {
  		if (Input::get_singleton()->is_using_input_buffering() && agile_input_event_flushing) {
  			Input::get_singleton()->flush_buffered_events();
-@@ -2681,6 +2688,8 @@ bool Main::iteration() {
+@@ -3125,6 +3133,8 @@
  	if (Input::get_singleton()->is_using_input_buffering() && agile_input_event_flushing) {
  		Input::get_singleton()->flush_buffered_events();
  	}
@@ -60,7 +37,7 @@ index 9b7f960660..449fb531f4 100644
  
  	uint64_t process_begin = OS::get_singleton()->get_ticks_usec();
  
-@@ -2713,7 +2722,9 @@ bool Main::iteration() {
+@@ -3157,7 +3167,9 @@
  		ScriptServer::get_language(i)->frame();
  	}
  
@@ -70,11 +47,11 @@ index 9b7f960660..449fb531f4 100644
  
  	if (EngineDebugger::is_active()) {
  		EngineDebugger::get_singleton()->iteration(frame_time, process_ticks, physics_process_ticks, physics_step);
+Index: main/main.h
 diff --git a/main/main.h b/main/main.h
-index 4911ff42b4..9441d7fc85 100644
---- a/main/main.h
-+++ b/main/main.h
-@@ -56,6 +56,9 @@ public:
+--- a/main/main.h	(revision c4fb119f03477ad9a494ba6cdad211b35a8efcce)
++++ b/main/main.h	(date 1676280742081)
+@@ -68,6 +68,9 @@
  #endif
  	static bool start();
  
@@ -84,3 +61,39 @@ index 4911ff42b4..9441d7fc85 100644
  	static bool iteration();
  	static void force_redraw();
  
+Index: SConstruct
+diff --git a/SConstruct b/SConstruct
+--- a/SConstruct	(revision c4fb119f03477ad9a494ba6cdad211b35a8efcce)
++++ b/SConstruct	(date 1676280742080)
+@@ -813,6 +813,15 @@
+                 env.module_icons_paths.append(path + "/" + "icons")
+             modules_enabled[name] = path
+ 
++            if getattr(config, "has_custom_iterator", False) and config.has_custom_iterator():
++                env.AppendUnique(CPPDEFINES=["CUSTOM_ITERATOR"])
++
++            if getattr(config, "has_custom_physics_iterator", False) and config.has_custom_physics_iterator():
++                env.AppendUnique(CPPDEFINES=["CUSTOM_PHYSICS_ITERATOR"])
++
++            if getattr(config, "has_custom_audio_iterator", False) and config.has_custom_audio_iterator():
++                env.AppendUnique(CPPDEFINES=["CUSTOM_AUDIO_ITERATOR"])
++
+         sys.path.remove(path)
+         sys.modules.pop("config")
+ 
+Index: core/config/engine.h
+===================================================================
+diff --git a/core/config/engine.h b/core/config/engine.h
+--- a/core/config/engine.h	(revision c4fb119f03477ad9a494ba6cdad211b35a8efcce)
++++ b/core/config/engine.h	(date 1676280742081)
+@@ -107,8 +107,10 @@
+ 
+ 	uint64_t get_frames_drawn();
+ 
++	void set_physics_frames(uint32_t p_physics_frames) { _physics_frames = p_physics_frames; }
+ 	uint64_t get_physics_frames() const { return _physics_frames; }
+ 	uint64_t get_process_frames() const { return _process_frames; }
++	void set_in_physics_frame(bool p_in_physics) { _in_physics = p_in_physics; }
+ 	bool is_in_physics_frame() const { return _in_physics; }
+ 	uint64_t get_frame_ticks() const { return _frame_ticks; }
+ 	double get_process_step() const { return _process_step; }

From abb7ed4fe2d676f27671d8246c7005d28c25c896 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Mon, 13 Feb 2023 13:09:41 +0100
Subject: [PATCH 15/36] Fix g++ warnings

---
 modules/bullet_physics/debug_utilities.cpp        | 2 +-
 modules/godot/editor_plugins/editor_world_ecs.cpp | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/bullet_physics/debug_utilities.cpp b/modules/bullet_physics/debug_utilities.cpp
index 6ba43a38..cd8a0a76 100644
--- a/modules/bullet_physics/debug_utilities.cpp
+++ b/modules/bullet_physics/debug_utilities.cpp
@@ -65,7 +65,7 @@ Ref<ArrayMesh> generate_mesh_from_points(const Vector<Vector3> &p_points) {
 		Error err = QuickHull::build(varr, md);
 		if (err == OK) {
 			lines.resize(md.edges.size() * 2);
-			for (int i = 0; i < md.edges.size(); i++) {
+			for (uint32_t i = 0; i < md.edges.size(); i++) {
 				lines.write[i * 2 + 0] = md.vertices[md.edges[i].vertex_a];
 				lines.write[i * 2 + 1] = md.vertices[md.edges[i].vertex_b];
 			}
diff --git a/modules/godot/editor_plugins/editor_world_ecs.cpp b/modules/godot/editor_plugins/editor_world_ecs.cpp
index 6e38f27d..4d833523 100644
--- a/modules/godot/editor_plugins/editor_world_ecs.cpp
+++ b/modules/godot/editor_plugins/editor_world_ecs.cpp
@@ -1278,8 +1278,6 @@ void EditorWorldECS::add_warning(const String &p_msg) {
 }
 
 void EditorWorldECS::remove_node_and_reparent_children(Node *p_node) {
-	Node *new_owner = p_node->get_owner();
-
 	List<Node *> children;
 
 	while (true) {

From dc228d86d2f3a4ba6613b93bf6ecfd0c474b85fd Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Mon, 13 Feb 2023 09:50:10 +0100
Subject: [PATCH 16/36] Fixing builds Remove explicit -j option and let the
 godot build system automatically find the best

---
 .github/workflows/linux_builds.yml   | 13 +++++++++----
 .github/workflows/windows_builds.yml |  9 +++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 7490384b..9fae8edf 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -10,7 +10,7 @@ on:
 # Global Settings
 env:
   GODOT_BASE_BRANCH: master
-  SCONSFLAGS: platform=linuxbsd verbose=yes warnings=extra werror=yes debug_symbols=no --jobs=2 module_text_server_fb_enabled=yes
+  SCONSFLAGS: platform=linuxbsd verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_LIMIT: 4096
 
 jobs:
@@ -36,7 +36,12 @@ jobs:
        repository: godotengine/godot
        ref: c4fb119f03477ad9a494ba6cdad211b35a8efcce
        path: godot
-
+    
+    - name: Apply patch
+      run: |
+        cd godot
+        git apply ../modules/godex/patches/add_custom_iterator.patch --reject --ignore-space-change --ignore-whitespace    
+    
     # Azure repositories are not reliable, we need to prevent azure giving us packages.
     - name: Make apt sources.list use the default Ubuntu repositories
       run: |
@@ -84,14 +89,14 @@ jobs:
         SCONS_CACHE: ${{github.workspace}}/.scons_cache/
       run: |
        cd godot
-       scons tools=yes tests=yes target=editor custom_modules="../modules" -j2
+       scons tools=yes tests=yes target=editor custom_modules="../modules"
        ls -l bin/
 
     # Execute unit tests for the editor
     - name: Unit Tests
       run: |
         cd ./godot
-        ./bin/godot.linuxbsd.opt.tools.64 --test
+        ./bin/godot.linuxbsd.editor.x86_64 --test
         cd ../
 
     - uses: actions/upload-artifact@v2
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index 2909a64a..de17f014 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -11,7 +11,7 @@ on:
 # SCONS_CACHE for windows must be set in the build environment
 env:
   GODOT_BASE_BRANCH: master
-  SCONSFLAGS: platform=windows verbose=yes warnings=all werror=yes debug_symbols=no --jobs=2 module_text_server_fb_enabled=yes
+  SCONSFLAGS: platform=windows verbose=yes warnings=all werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_MSVC_CONFIG: true
   SCONS_CACHE_LIMIT: 3072
 
@@ -40,6 +40,11 @@ jobs:
        ref: c4fb119f03477ad9a494ba6cdad211b35a8efcce
        path: godot
 
+    - name: Apply patch
+      run: |
+        cd godot
+        git apply ../modules/godex/patches/add_custom_iterator.patch --reject --ignore-space-change --ignore-whitespace
+
     # Upload cache on completion and check it out now
     # Editing this is pretty dangerous for Windows since it can break and needs to be properly tested with a fresh cache.
     - name: Load .scons_cache directory
@@ -83,7 +88,7 @@ jobs:
     - name: Unit Tests
       run: |
         cd ./godot
-        ./bin/godot.windows.opt.tools.64.exe --test
+        ./bin/godot.windows.editor.x86_64.exe --test
         cd ../
 
     - uses: actions/upload-artifact@v2

From 3b7098ee25092ac7eec4c152d5683eafc444d2cb Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Tue, 14 Feb 2023 15:23:05 +0100
Subject: [PATCH 17/36] Fix formatting

---
 .github/workflows/linux_builds.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 9fae8edf..7234f874 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -36,12 +36,12 @@ jobs:
        repository: godotengine/godot
        ref: c4fb119f03477ad9a494ba6cdad211b35a8efcce
        path: godot
-    
+
     - name: Apply patch
       run: |
         cd godot
-        git apply ../modules/godex/patches/add_custom_iterator.patch --reject --ignore-space-change --ignore-whitespace    
-    
+        git apply ../modules/godex/patches/add_custom_iterator.patch --reject --ignore-space-change --ignore-whitespace
+
     # Azure repositories are not reliable, we need to prevent azure giving us packages.
     - name: Make apt sources.list use the default Ubuntu repositories
       run: |

From b8514f0ea7264f713a98a6553a6529a69774f08b Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 15 Feb 2023 14:43:17 +0100
Subject: [PATCH 18/36] Fix godot tests

---
 iterators/dynamic_query.cpp       | 2 +-
 modules/godot/nodes/ecs_world.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/iterators/dynamic_query.cpp b/iterators/dynamic_query.cpp
index ea9d3668..f697a2bf 100644
--- a/iterators/dynamic_query.cpp
+++ b/iterators/dynamic_query.cpp
@@ -13,7 +13,7 @@ void DynamicQuery::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("not_component", "component_id"), &DynamicQuery::not_component);
 
 	ClassDB::bind_method(D_METHOD("is_valid"), &DynamicQuery::is_valid);
-	ClassDB::bind_method(D_METHOD("prepare_world"), &DynamicQuery::prepare_world_script);
+	ClassDB::bind_method(D_METHOD("prepare_world", "world"), &DynamicQuery::prepare_world_script);
 	ClassDB::bind_method(D_METHOD("reset"), &DynamicQuery::reset);
 	ClassDB::bind_method(D_METHOD("get_component", "index"), &DynamicQuery::get_access_by_index_gd);
 
diff --git a/modules/godot/nodes/ecs_world.cpp b/modules/godot/nodes/ecs_world.cpp
index 216e3452..b498c1e1 100644
--- a/modules/godot/nodes/ecs_world.cpp
+++ b/modules/godot/nodes/ecs_world.cpp
@@ -187,7 +187,7 @@ void WorldECS::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_system_dispatchers_map", "map"), &WorldECS::set_system_dispatchers_map);
 	ClassDB::bind_method(D_METHOD("get_system_dispatchers_map"), &WorldECS::get_system_dispatchers_map);
-	ClassDB::bind_method(D_METHOD("set_system_dispatchers_pipeline"), &WorldECS::set_system_dispatchers_pipeline);
+	ClassDB::bind_method(D_METHOD("set_system_dispatchers_pipeline", "system_name", "name"), &WorldECS::set_system_dispatchers_pipeline);
 
 	ClassDB::bind_method(D_METHOD("set_active_pipeline", "name"), &WorldECS::set_active_pipeline);
 	ClassDB::bind_method(D_METHOD("get_active_pipeline"), &WorldECS::get_active_pipeline);
@@ -207,8 +207,8 @@ void WorldECS::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("create_entity_from_prefab", "entity_node"), &WorldECS::create_entity_from_prefab);
 
-	ClassDB::bind_method(D_METHOD("add_component_by_name", "component_name", "data"), &WorldECS::add_component_by_name);
-	ClassDB::bind_method(D_METHOD("add_component", "component_id", "data"), &WorldECS::add_component);
+	ClassDB::bind_method(D_METHOD("add_component_by_name", "entity_id", "component_name", "data"), &WorldECS::add_component_by_name);
+	ClassDB::bind_method(D_METHOD("add_component", "entity_id", "component_id", "data"), &WorldECS::add_component);
 
 	ClassDB::bind_method(D_METHOD("remove_component_by_name", "component_name", "data"), &WorldECS::remove_component_by_name);
 	ClassDB::bind_method(D_METHOD("remove_component", "component_id", "data"), &WorldECS::remove_component);

From e0c8e08b46fd7c083c63ebfdb947a4911cf607cd Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 22 Feb 2023 07:46:57 +0100
Subject: [PATCH 19/36] Fix tests

---
 tests/test_ecs_pipeline_builder.h | 76 +++++++++++++++++--------------
 tests/test_ecs_spawner.h          |  3 +-
 tests/test_ecs_system.h           | 39 ++++++++++------
 tests/test_utilities.h            | 59 +++++++++++++++++-------
 4 files changed, 111 insertions(+), 66 deletions(-)

diff --git a/tests/test_ecs_pipeline_builder.h b/tests/test_ecs_pipeline_builder.h
index 824a9b1f..296d2797 100644
--- a/tests/test_ecs_pipeline_builder.h
+++ b/tests/test_ecs_pipeline_builder.h
@@ -86,9 +86,10 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_Z_system_3.gd", code));
+		CHECK(register_ecs_script("test_Z_system_3.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	Vector<StringName> system_bundles;
@@ -140,7 +141,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_A_system_8.gd", code));
+		CHECK(register_ecs_script("test_A_system_8.gd", code));
 	}
 
 	ECS::register_system(test_A_system_1, "test_A_system_1");
@@ -162,7 +163,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_A_system_0.gd", code));
+		CHECK(register_ecs_script("test_A_system_0.gd", code));
 	}
 
 	{
@@ -180,7 +181,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_A_system_2.gd", code));
+		CHECK(register_ecs_script("test_A_system_2.gd", code));
 	}
 
 	ECS::register_system(test_A_system_3, "test_A_system_3");
@@ -200,7 +201,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_A_system_4.gd", code));
+		CHECK(register_ecs_script("test_A_system_4.gd", code));
 	}
 
 	ECS::register_system(test_A_system_5, "test_A_system_5");
@@ -221,7 +222,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_A_system_6.gd", code));
+		CHECK(register_ecs_script("test_A_system_6.gd", code));
 	}
 
 	{
@@ -241,7 +242,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_A_system_7.gd", code));
+		CHECK(register_ecs_script("test_A_system_7.gd", code));
 	}
 
 	{
@@ -261,7 +262,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_A_system_9.gd", code));
+		CHECK(register_ecs_script("test_A_system_9.gd", code));
 	}
 
 	{
@@ -280,7 +281,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_A_system_10.gd", code));
+		CHECK(register_ecs_script("test_A_system_10.gd", code));
 	}
 	{
 		// Create the script.
@@ -298,7 +299,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_A_system_11.gd", code));
+		CHECK(register_ecs_script("test_A_system_11.gd", code));
 	}
 	{
 		// Create the script.
@@ -315,7 +316,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_A_system_12.gd", code));
+		CHECK(register_ecs_script("test_A_system_12.gd", code));
 	}
 	{
 		// Create the script.
@@ -333,9 +334,11 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder takes into account implicit
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_A_system_13.gd", code));
+		CHECK(register_ecs_script("test_A_system_13.gd", code));
 	}
 
+	build_scripts();
+
 	ECS::register_system(test_A_system_14, "test_A_system_14")
 			.before("test_A_system_9.gd");
 
@@ -505,7 +508,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder bundles.") {
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_B_system_5.gd", code));
+		CHECK(register_ecs_script("test_B_system_5.gd", code));
 	}
 	{
 		// Create the script.
@@ -521,7 +524,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder bundles.") {
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_B_system_6.gd", code));
+		CHECK(register_ecs_script("test_B_system_6.gd", code));
 	}
 	{
 		// Create the script.
@@ -533,7 +536,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder bundles.") {
 		code += "	add(ECS.test_B_system_6_gd)\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("GDSBundle.gd", code));
+		CHECK(register_ecs_script("GDSBundle.gd", code));
 	}
 
 	// -- GDS that uses C++ --
@@ -553,7 +556,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder bundles.") {
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_B_system_7.gd", code));
+		CHECK(register_ecs_script("test_B_system_7.gd", code));
 	}
 	{
 		// Create the script.
@@ -570,7 +573,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder bundles.") {
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_B_system_8.gd", code));
+		CHECK(register_ecs_script("test_B_system_8.gd", code));
 	}
 
 	ECS::register_system(test_B_system_9, "test_B_system_9");
@@ -590,7 +593,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder bundles.") {
 		code += "	add(ECS.test_B_system_10)\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("GDSUsesCppBundle.gd", code));
+		CHECK(register_ecs_script("GDSUsesCppBundle.gd", code));
 	}
 
 	{
@@ -607,9 +610,10 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder bundles.") {
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_B_system_11.gd", code));
+		CHECK(register_ecs_script("test_B_system_11.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	Vector<StringName> system_bundles;
@@ -735,7 +739,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder put the systems that fetch
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_C_system_8.gd", code));
+		CHECK(register_ecs_script("test_C_system_8.gd", code));
 	}
 	{
 		// Create the script.
@@ -752,7 +756,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder put the systems that fetch
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_C_system_9.gd", code));
+		CHECK(register_ecs_script("test_C_system_9.gd", code));
 	}
 	{
 		// Create the script.
@@ -768,7 +772,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder put the systems that fetch
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_C_system_10.gd", code));
+		CHECK(register_ecs_script("test_C_system_10.gd", code));
 	}
 	{
 		// Create the script.
@@ -784,7 +788,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder put the systems that fetch
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_C_system_11.gd", code));
+		CHECK(register_ecs_script("test_C_system_11.gd", code));
 	}
 
 	{
@@ -800,7 +804,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder put the systems that fetch
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_C_system_15.gd", code));
+		CHECK(register_ecs_script("test_C_system_15.gd", code));
 	}
 
 	{
@@ -816,9 +820,10 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder put the systems that fetch
 		code += "	add(ECS.test_C_system_15_gd)\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestC_GDSBundle.gd", code));
+		CHECK(register_ecs_script("TestC_GDSBundle.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	Vector<StringName> system_bundles;
@@ -988,7 +993,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder is able to detect cyclic de
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_D_system_4.gd", code));
+		CHECK(register_ecs_script("test_D_system_4.gd", code));
 	}
 	{
 		// Create the script.
@@ -1005,7 +1010,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder is able to detect cyclic de
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_D_system_5.gd", code));
+		CHECK(register_ecs_script("test_D_system_5.gd", code));
 	}
 	{
 		// Create the script.
@@ -1017,9 +1022,10 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder is able to detect cyclic de
 		code += "	add(ECS.test_D_system_5_gd)\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestD_GDSBundle.gd", code));
+		CHECK(register_ecs_script("TestD_GDSBundle.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	Vector<StringName> system_bundles;
@@ -1067,7 +1073,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder is able to detect cyclic de
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_D_system_4.gd", code));
+		CHECK(register_ecs_script("test_D_system_4.gd", code));
 	}
 	{
 		// Create the script.
@@ -1084,7 +1090,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder is able to detect cyclic de
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_D_system_5.gd", code));
+		CHECK(register_ecs_script("test_D_system_5.gd", code));
 	}
 	{
 		// Create the script.
@@ -1096,9 +1102,10 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder is able to detect cyclic de
 		code += "	add(ECS.test_D_system_5_gd)\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestD_GDSBundle.gd", code));
+		CHECK(register_ecs_script("TestD_GDSBundle.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	Vector<StringName> system_bundles;
@@ -1184,7 +1191,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder is able to compose sub pipe
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_G_sub1_system_5.gd", code));
+		CHECK(register_ecs_script("test_G_sub1_system_5.gd", code));
 	}
 
 	{
@@ -1202,7 +1209,7 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder is able to compose sub pipe
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("test_G_sub2_system_6.gd", code));
+		CHECK(register_ecs_script("test_G_sub2_system_6.gd", code));
 	}
 
 	{
@@ -1216,9 +1223,10 @@ TEST_CASE("[Modules][ECS] Verify the PipelineBuilder is able to compose sub pipe
 		code += "	add(ECS.test_G_sub2_system_6_gd)\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestG_GDSBundle.gd", code));
+		CHECK(register_ecs_script("TestG_GDSBundle.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	Vector<StringName> system_bundles;
diff --git a/tests/test_ecs_spawner.h b/tests/test_ecs_spawner.h
index c489b307..cba99264 100644
--- a/tests/test_ecs_spawner.h
+++ b/tests/test_ecs_spawner.h
@@ -89,9 +89,10 @@ TEST_CASE("[Modules][ECS] Test spawner Script registration.") {
 		code += "var bb: int = 0\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script(component_name, code));
+		CHECK(register_ecs_script(component_name, code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	// Compose the script component
diff --git a/tests/test_ecs_system.h b/tests/test_ecs_system.h
index ddf70a05..1e94156d 100644
--- a/tests/test_ecs_system.h
+++ b/tests/test_ecs_system.h
@@ -196,7 +196,7 @@ TEST_CASE("[Modules][ECS] Test dynamic system using a script.") {
 		code += "var variable_2: bool = false\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestDynamicSystemComponent1.gd", code));
+		CHECK(register_ecs_script("TestDynamicSystemComponent1.gd", code));
 	}
 
 	{
@@ -221,9 +221,10 @@ TEST_CASE("[Modules][ECS] Test dynamic system using a script.") {
 		code += "			q[1].set(\"variable_2\", Transform3D())\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestDynamicSystem1.gd", code));
+		CHECK(register_ecs_script("TestDynamicSystem1.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	World world;
@@ -325,7 +326,7 @@ TEST_CASE("[Modules][ECS] Test dynamic system with sub pipeline C++.") {
 		code += "	test_databag.iterations += 1\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestSubPip_System.gd", code));
+		CHECK(register_ecs_script("TestSubPip_System.gd", code));
 	}
 	{
 		// Create the script.
@@ -340,9 +341,10 @@ TEST_CASE("[Modules][ECS] Test dynamic system with sub pipeline C++.") {
 		code += "	test_databag.sub_iterations += 1\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestSubPip_SubSystem.gd", code));
+		CHECK(register_ecs_script("TestSubPip_SubSystem.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	// ~~ Main pipeline ~~
@@ -482,9 +484,10 @@ TEST_CASE("[Modules][ECS] Test system databag fetch with dynamic query.") {
 		code += "	test_databag.exe_count = 10\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestDatabagDynamicSystem.gd", code));
+		CHECK(register_ecs_script("TestDatabagDynamicSystem.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	World world;
@@ -845,9 +848,10 @@ TEST_CASE("[Modules][ECS] Test system and hierarchy.") {
 			code += "			query[\"TransformComponent\"].origin.x = 10.0\n";
 			code += "\n";
 
-			CHECK(build_and_register_ecs_script("TestMoveHierarchySystem.gd", code));
+			CHECK(register_ecs_script("TestMoveHierarchySystem.gd", code));
 		}
 
+		build_scripts();
 		flush_ecs_script_preparation();
 
 		PipelineBuilder pipeline_builder;
@@ -915,7 +919,7 @@ TEST_CASE("[Modules][ECS] Test Add/remove from dynamic system.") {
 		code += "	comp_storage.insert(entity_3)\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestSpawnDynamicSystem.gd", code));
+		CHECK(register_ecs_script("TestSpawnDynamicSystem.gd", code));
 	}
 	{
 		// Create the script.
@@ -931,9 +935,10 @@ TEST_CASE("[Modules][ECS] Test Add/remove from dynamic system.") {
 		code += "	comp_storage.remove(1)\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestRemoveDynamicSystem.gd", code));
+		CHECK(register_ecs_script("TestRemoveDynamicSystem.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	World world;
@@ -1014,9 +1019,10 @@ TEST_CASE("[Modules][ECS] Test fetch changed from dynamic system.") {
 		code += "		query[0].transform.origin.x = 100.0\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestChangedDynamicSystem.gd", code));
+		CHECK(register_ecs_script("TestChangedDynamicSystem.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	World world;
@@ -1142,9 +1148,10 @@ TEST_CASE("[Modules][ECS] Test fetch entity from nodepath, using a dynamic syste
 		code += "		query[0].a = 1000\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestFetchEntityFromNodePath.gd", code));
+		CHECK(register_ecs_script("TestFetchEntityFromNodePath.gd", code));
 	}
 
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	World world;
@@ -1280,7 +1287,7 @@ TEST_CASE("[Modules][ECS] Make sure the events storages are automatically create
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestAEventEmitterSystem.gd", code));
+		CHECK(register_ecs_script("TestAEventEmitterSystem.gd", code));
 	}
 	{
 		// Create the script.
@@ -1294,8 +1301,10 @@ TEST_CASE("[Modules][ECS] Make sure the events storages are automatically create
 		code += "	pass\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestAEventReceiverSystem.gd", code));
+		CHECK(register_ecs_script("TestAEventReceiverSystem.gd", code));
 	}
+
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	{
@@ -1382,7 +1391,7 @@ TEST_CASE("[Modules][ECS] Test EventEmitter and EventReceiver") {
 		code += "	event_emitter.emit(\"Test1\", {'a': 10})\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestBEventEmitterSystem.gd", code));
+		CHECK(register_ecs_script("TestBEventEmitterSystem.gd", code));
 	}
 	{
 		// Create the script.
@@ -1401,8 +1410,10 @@ TEST_CASE("[Modules][ECS] Test EventEmitter and EventReceiver") {
 		code += "	assert(count == 1)\n";
 		code += "\n";
 
-		CHECK(build_and_register_ecs_script("TestBEventReceiverSystem.gd", code));
+		CHECK(register_ecs_script("TestBEventReceiverSystem.gd", code));
 	}
+
+	build_scripts();
 	flush_ecs_script_preparation();
 
 	{
diff --git a/tests/test_utilities.h b/tests/test_utilities.h
index 3bf1d54a..3ea90e74 100644
--- a/tests/test_utilities.h
+++ b/tests/test_utilities.h
@@ -7,6 +7,7 @@
 #include "modules/gdscript/gdscript_parser.h"
 
 bool script_initialized = false;
+HashMap<String, String> scripts;
 
 void initialize_script_ecs() {
 	ScriptServer::init_languages();
@@ -17,36 +18,60 @@ void finalize_script_ecs() {
 	ScriptEcs::get_singleton()->__empty_scripts();
 	ScriptServer::finish_languages();
 	script_initialized = false;
+	scripts.clear();
 }
 
-bool build_and_register_ecs_script(const StringName &p_script_name, const String &p_code) {
+bool register_ecs_script(const StringName &p_script_name, const String &p_code) {
 	CRASH_COND_MSG(script_initialized == false, "Please call `initialize_script_ecs` before executing the function. So call the function `finalize_script_ecs` at the end.");
 
-	Ref<GDScript> script;
-	script.instantiate();
 	GDScriptParser parser;
 	Error err = parser.parse(p_code, "res://test/justs/a/test/path/" + p_script_name, false);
 	ERR_FAIL_COND_V(err != OK, false);
 
-	GDScriptAnalyzer analyzer(&parser);
-	err = analyzer.analyze();
-	if (err != OK) {
-		print_line("Error in analyzer:");
-		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
-		for (const List<GDScriptParser::ParserError>::Element *E = errors.front(); E != nullptr; E = E->next()) {
-			const GDScriptParser::ParserError &error = E->get();
-			print_line(vformat("%02d:%02d: %s", error.line, error.column, error.message));
+	for (auto extends : parser.get_tree()->extends) {
+		if (extends == "System") {
+			ECS::register_dynamic_system(p_script_name);
 		}
-		return false;
 	}
 
-	script->set_path("res://test/justs/a/test/path/" + p_script_name);
+	scripts[p_script_name] = p_code;
+	return true;
+}
 
-	GDScriptCompiler compiler;
-	err = compiler.compile(&parser, script.ptr(), false);
-	ERR_FAIL_COND_V(err != OK, false);
+bool build_scripts() {
+	for (auto item : scripts) {
+		auto script_name = item.key;
+		auto code = item.value;
+
+		Ref<GDScript> script;
+		script.instantiate();
+
+		GDScriptParser parser;
+		parser.parse(code, "res://test/justs/a/test/path/" + script_name, false);
+
+		GDScriptAnalyzer analyzer(&parser);
+		Error err = analyzer.analyze();
+		if (err != OK) {
+			print_line("Error in analyzer:");
+			const List<GDScriptParser::ParserError> &errors = parser.get_errors();
+			for (const List<GDScriptParser::ParserError>::Element *E = errors.front(); E != nullptr; E = E->next()) {
+				const GDScriptParser::ParserError &error = E->get();
+				print_line(vformat("%02d:%02d: %s", error.line, error.column, error.message));
+			}
+			return false;
+		}
+
+		script->set_path("res://test/justs/a/test/path/" + script_name);
+
+		GDScriptCompiler compiler;
+		err = compiler.compile(&parser, script.ptr(), false);
+		ERR_FAIL_COND_V(err != OK, false);
 
-	return ScriptEcs::get_singleton()->__reload_script(script, "res://test/justs/a/test/path/" + p_script_name, p_script_name);
+		if (!ScriptEcs::get_singleton()->__reload_script(script, "res://test/justs/a/test/path/" + script_name, script_name)) {
+			return false;
+		}
+	}
+	return true;
 }
 
 void flush_ecs_script_preparation() {

From eac4c95add44a61706aec41101d011f833cf96fe Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 22 Feb 2023 07:41:16 +0100
Subject: [PATCH 20/36] Preload scripts for registering system and component
 names

---
 ecs.cpp                            | 71 ++++++++++++++++++++++++------
 ecs.h                              |  3 ++
 modules/godot/nodes/script_ecs.cpp |  1 +
 modules/godot/register_types.cpp   |  2 +
 4 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/ecs.cpp b/ecs.cpp
index 5fae0f46..c71a4815 100644
--- a/ecs.cpp
+++ b/ecs.cpp
@@ -1,5 +1,8 @@
 
 #include "ecs.h"
+#include <core/config/project_settings.h>
+#include <core/io/dir_access.h>
+#include <modules/gdscript/gdscript_parser.h>
 
 #include "components/dynamic_component.h"
 #include "core/object/message_queue.h"
@@ -159,6 +162,43 @@ ECS::ECS() :
 	}
 }
 
+void get_script_files(const String &p_path, Vector<String> &scripts) {
+	for (const auto &directory : DirAccess::get_directories_at(p_path)) {
+		get_script_files(p_path.path_join(directory), scripts);
+	}
+	for (const auto &file : DirAccess::get_files_at(p_path)) {
+		auto file_path = p_path.path_join(file);
+		if (ResourceLoader::get_resource_type(file_path) == "GDScript") {
+			scripts.push_back(file_path);
+		}
+	}
+}
+
+void ECS::preload_scripts() {
+	if (Engine::get_singleton()->is_project_manager_hint()) {
+		return;
+	}
+
+	Vector<String> scripts;
+
+	get_script_files("res://", scripts);
+
+	for (const auto &script : scripts) {
+		auto code = FileAccess::get_file_as_string(script);
+		GDScriptParser parser;
+		if (parser.parse(code, script, false) == OK) {
+			auto tree = parser.get_tree();
+			if (tree->extends.has("System")) {
+				register_dynamic_system(script.get_file());
+			}
+
+			if (tree->extends.has("Component")) {
+				register_or_get_id_for_component_name(script.get_file());
+			}
+		}
+	}
+}
+
 ECS::~ECS() {
 }
 
@@ -1041,11 +1081,7 @@ const LocalVector<godex::component_id> &ECS::get_spawnable_components(godex::spa
 	return spawners_info[p_spawner].components;
 }
 
-uint32_t ECS::register_or_update_script_component(
-		const StringName &p_name,
-		const LocalVector<ScriptProperty> &p_properties,
-		StorageType p_storage_type,
-		Vector<StringName> p_spawners) {
+uint32_t ECS::register_or_get_id_for_component_name(const StringName &p_name) {
 	godex::component_id id = get_component_id(p_name);
 	DynamicComponentInfo *info;
 
@@ -1058,12 +1094,25 @@ uint32_t ECS::register_or_update_script_component(
 		components.push_back(p_name);
 		components_info.push_back(ComponentInfo());
 		components_info[id].dynamic_component_info = info;
-	} else {
-		// This is an old component, verify is a script component.
-		ERR_FAIL_COND_V_MSG(components_info[id].dynamic_component_info == nullptr, godex::COMPONENT_NONE, "This component " + p_name + " is not a script component and can't be updated. Your component must be an unique name.");
-		info = components_info[id].dynamic_component_info;
+
+		// Add a new scripting constant, for fast and easy `component` access.
+		ClassDB::bind_integer_constant(get_class_static(), StringName(), String(p_name).replace(".", "_"), id);
+		print_line("ComponentScript: " + p_name + " registered with ID: " + itos(id));
 	}
 
+	return id;
+}
+
+uint32_t ECS::register_or_update_script_component(
+		const StringName &p_name,
+		const LocalVector<ScriptProperty> &p_properties,
+		StorageType p_storage_type,
+		Vector<StringName> p_spawners) {
+	godex::component_id id = register_or_get_id_for_component_name(p_name);
+	DynamicComponentInfo *info;
+	ERR_FAIL_COND_V_MSG(components_info[id].dynamic_component_info == nullptr, godex::COMPONENT_NONE, "This component " + p_name + " is not a script component and can't be updated. Your component must be an unique name.");
+	info = components_info[id].dynamic_component_info;
+
 	info->property_map.resize(p_properties.size());
 	info->properties.resize(p_properties.size());
 	info->defaults.resize(p_properties.size());
@@ -1115,10 +1164,6 @@ uint32_t ECS::register_or_update_script_component(
 		spawners_info[spawner].components.push_back(info->component_id);
 	}
 
-	// Add a new scripting constant, for fast and easy `component` access.
-	ClassDB::bind_integer_constant(get_class_static(), StringName(), String(p_name).replace(".", "_"), id);
-	print_line("ComponentScript: " + p_name + " registered with ID: " + itos(id));
-
 	return id;
 }
 
diff --git a/ecs.h b/ecs.h
index 505f70c2..73922f9f 100644
--- a/ecs.h
+++ b/ecs.h
@@ -224,6 +224,7 @@ class ECS : public Object {
 	template <class C>
 	static void register_component(StorageBase *(*create_storage)());
 
+	static uint32_t register_or_get_id_for_component_name(const StringName &p_name);
 	static uint32_t register_or_update_script_component(const StringName &p_name, const LocalVector<ScriptProperty> &p_properties, StorageType p_storage_type, Vector<StringName> p_spawners);
 
 	static uint32_t get_components_count();
@@ -488,6 +489,8 @@ class ECS : public Object {
 	/// time, making the pipeline switch immediate.
 	static void system_set_active_system(godex::system_id p_id, uint8_t *p_mem, bool p_active);
 
+	static void preload_scripts();
+
 private:
 	static void clear_emitters_for_system(godex::system_id p_id);
 
diff --git a/modules/godot/nodes/script_ecs.cpp b/modules/godot/nodes/script_ecs.cpp
index 102df79d..34df97ea 100644
--- a/modules/godot/nodes/script_ecs.cpp
+++ b/modules/godot/nodes/script_ecs.cpp
@@ -1,4 +1,5 @@
 #include "script_ecs.h"
+#include <modules/gdscript/gdscript_parser.h>
 
 #include "../../../ecs.h"
 #include "../../../systems/dynamic_system.h"
diff --git a/modules/godot/register_types.cpp b/modules/godot/register_types.cpp
index 269930af..11a6d43f 100644
--- a/modules/godot/register_types.cpp
+++ b/modules/godot/register_types.cpp
@@ -137,6 +137,8 @@ void initialize_godot_module(ModuleInitializationLevel p_level) {
 
 		ClassDB::register_class<SharedComponentResource>();
 
+		ECS::preload_scripts();
+
 		memnew(ScriptEcs());
 
 	} else if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {

From d62c5f28b4a092ef356c8297bd1744993f4f6ee6 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 22 Feb 2023 08:00:08 +0100
Subject: [PATCH 21/36] Wait for static checks

---
 .github/workflows/linux_builds.yml   | 7 +++++++
 .github/workflows/windows_builds.yml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 7234f874..3be01bc9 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -19,6 +19,13 @@ jobs:
     name: Editor (target=editor, tools=yes, tests=yes)
 
     steps:
+    - name: Wait for static checks
+      uses: lewagon/wait-on-check-action@v1.3.1
+      with:
+       ref: ${{ github.ref }}
+       check-name: 'Static Checks (clang-format, black format, file format, documentation checks)'
+       repo-token: ${{ secrets.GITHUB_TOKEN }}
+       wait-interval: 10
     - name: Make godot dir
       run: |
        mkdir godot
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index de17f014..0c50b33a 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -22,6 +22,13 @@ jobs:
     name: Editor (target=editor, tools=yes, tests=yes)
 
     steps:
+    - name: Wait for static checks
+      uses: lewagon/wait-on-check-action@v1.3.1
+      with:
+       ref: ${{ github.ref }}
+       check-name: 'Static Checks (clang-format, black format, file format, documentation checks)'
+       repo-token: ${{ secrets.GITHUB_TOKEN }}
+       wait-interval: 10
     - name: Make dir
       run: |
        mkdir godot

From d19166a086ffd2f195c4c745a7d901c98eef851e Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 22 Feb 2023 08:17:20 +0100
Subject: [PATCH 22/36] Update ref

---
 .github/workflows/linux_builds.yml   | 12 ++++++------
 .github/workflows/windows_builds.yml | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 3be01bc9..948d5c4f 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -9,7 +9,7 @@ on:
 
 # Global Settings
 env:
-  GODOT_BASE_BRANCH: master
+  GODOT_REF: d2699dc7ab96fbd75faccc1f32f55baebf1d84dc
   SCONSFLAGS: platform=linuxbsd verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_LIMIT: 4096
 
@@ -41,7 +41,7 @@ jobs:
       uses: actions/checkout@v2
       with:
        repository: godotengine/godot
-       ref: c4fb119f03477ad9a494ba6cdad211b35a8efcce
+       ref: ${{ env.GODOT_REF }}
        path: godot
 
     - name: Apply patch
@@ -68,11 +68,11 @@ jobs:
       uses: actions/cache@v2
       with:
        path: ${{github.workspace}}/.scons_cache/
-       key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+       key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-{{env.GODOT_REF}}-${{github.ref}}-${{github.sha}}
        restore-keys: |
-        ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-        ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-        ${{github.job}}-${{env.GODOT_BASE_BRANCH}}
+        ${{github.job}}-{{env.GODOT_REF}}-${{github.ref}}-${{github.sha}}
+        ${{github.job}}-{{env.GODOT_REF}}-${{github.ref}}
+        ${{github.job}}-{{env.GODOT_REF}}
 
     # Use python 3.x release (works cross platform; best to keep self contained in it's own step)
     - name: Set up Python 3.x
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index 0c50b33a..68e85d21 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -10,7 +10,7 @@ on:
 # Global Settings
 # SCONS_CACHE for windows must be set in the build environment
 env:
-  GODOT_BASE_BRANCH: master
+  GODOT_REF: d2699dc7ab96fbd75faccc1f32f55baebf1d84dc
   SCONSFLAGS: platform=windows verbose=yes warnings=all werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_MSVC_CONFIG: true
   SCONS_CACHE_LIMIT: 3072
@@ -44,7 +44,7 @@ jobs:
       uses: actions/checkout@v2
       with:
        repository: godotengine/godot
-       ref: c4fb119f03477ad9a494ba6cdad211b35a8efcce
+       ref: ${{ env.GODOT_REF }}
        path: godot
 
     - name: Apply patch
@@ -61,9 +61,9 @@ jobs:
         path: ${{github.workspace}}/.scons_cache/
         key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
         restore-keys: |
-          ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-          ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-          ${{github.job}}-${{env.GODOT_BASE_BRANCH}}
+          ${{github.job}}-${{env.GODOT_REF}}-${{github.ref}}-${{github.sha}}
+          ${{github.job}}-${{env.GODOT_REF}}-${{github.ref}}
+          ${{github.job}}-${{env.GODOT_REF}}
 
     # Use python 3.x release (works cross platform; best to keep self contained in it's own step)
     - name: Set up Python 3.x

From ccba0eec76efd3226e7abe1696560299b5255382 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 22 Feb 2023 10:02:31 +0100
Subject: [PATCH 23/36] Run tests with headless

---
 .github/workflows/linux_builds.yml   | 2 +-
 .github/workflows/windows_builds.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 948d5c4f..2adc2ab9 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -103,7 +103,7 @@ jobs:
     - name: Unit Tests
       run: |
         cd ./godot
-        ./bin/godot.linuxbsd.editor.x86_64 --test
+        ./bin/godot.linuxbsd.editor.x86_64 --test --headless
         cd ../
 
     - uses: actions/upload-artifact@v2
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index 68e85d21..3fbae8b7 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -95,7 +95,7 @@ jobs:
     - name: Unit Tests
       run: |
         cd ./godot
-        ./bin/godot.windows.editor.x86_64.exe --test
+        ./bin/godot.windows.editor.x86_64.exe --test --headless
         cd ../
 
     - uses: actions/upload-artifact@v2

From 7d87207b26a3e8c7225c940a5dc3627b463c0872 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 22 Feb 2023 12:24:15 +0100
Subject: [PATCH 24/36] Print message when preloading scripts

---
 ecs.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ecs.cpp b/ecs.cpp
index c71a4815..b00ab532 100644
--- a/ecs.cpp
+++ b/ecs.cpp
@@ -180,10 +180,11 @@ void ECS::preload_scripts() {
 	}
 
 	Vector<String> scripts;
-
+	print_line("Preloading component and system scripts");
 	get_script_files("res://", scripts);
 
 	for (const auto &script : scripts) {
+		print_line(script);
 		auto code = FileAccess::get_file_as_string(script);
 		GDScriptParser parser;
 		if (parser.parse(code, script, false) == OK) {

From 57117e85985e497869ed8708cf16a35201daa09d Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 22 Feb 2023 14:16:06 +0100
Subject: [PATCH 25/36] Don't preload scripts for tests in debug mode

---
 modules/godot/register_types.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/godot/register_types.cpp b/modules/godot/register_types.cpp
index 11a6d43f..dc99dc10 100644
--- a/modules/godot/register_types.cpp
+++ b/modules/godot/register_types.cpp
@@ -137,8 +137,14 @@ void initialize_godot_module(ModuleInitializationLevel p_level) {
 
 		ClassDB::register_class<SharedComponentResource>();
 
+#ifdef DEBUG_ENABLED
+		// TS is nullptr at this point when running tests in debug mode, and it causes a crash. I did not find a better way to check for that.
+		if (TS != nullptr) {
+			ECS::preload_scripts();
+		}
+#else
 		ECS::preload_scripts();
-
+#endif
 		memnew(ScriptEcs());
 
 	} else if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {

From 92513e79371776dc48d835e40fb93b8ad1e9a255 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 22 Feb 2023 16:37:21 +0100
Subject: [PATCH 26/36] Update commit to 4.0 RC3

---
 .github/workflows/linux_builds.yml   | 2 +-
 .github/workflows/windows_builds.yml | 2 +-
 README.md                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 2adc2ab9..25f58ea4 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -9,7 +9,7 @@ on:
 
 # Global Settings
 env:
-  GODOT_REF: d2699dc7ab96fbd75faccc1f32f55baebf1d84dc
+  GODOT_REF: 7e79aead99a53ee7cdf383add9a6a2aea4f15beb
   SCONSFLAGS: platform=linuxbsd verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_LIMIT: 4096
 
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index 3fbae8b7..f55dadcb 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -10,7 +10,7 @@ on:
 # Global Settings
 # SCONS_CACHE for windows must be set in the build environment
 env:
-  GODOT_REF: d2699dc7ab96fbd75faccc1f32f55baebf1d84dc
+  GODOT_REF: 7e79aead99a53ee7cdf383add9a6a2aea4f15beb
   SCONSFLAGS: platform=windows verbose=yes warnings=all werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_MSVC_CONFIG: true
   SCONS_CACHE_LIMIT: 3072
diff --git a/README.md b/README.md
index baa00795..56871b47 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Godex is a Godot Engine ecs library.
 **Disclaimer:** this module is still in development, open an [issues](https://github.com/GodotECS/godex/issues) to report any problem or a new [discussion](https://github.com/GodotECS/godex/discussions) if you need any help. Any form of contribution is welcome.
 
 ### The tested Godot version
-Is `master` `c4fb119f03477ad9a494ba6cdad211b35a8efcce`, please open an issue if the current master is not working or doesn't compile.
+Is `master` `7e79aead99a53ee7cdf383add9a6a2aea4f15beb`, please open an issue if the current master is not working or doesn't compile.
 
 ### What is ECS
 Shortened as ECS, the Entity Component System is an architectural design pattern that allow to organize the data in a way so that the workload can be split into small and easy programs.

From 4439dd988a329945b26b263b315ca270786b70e0 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 22 Feb 2023 16:43:22 +0100
Subject: [PATCH 27/36] Don't run tests with headless on windows.

---
 .github/workflows/windows_builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index f55dadcb..f7538c73 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -95,7 +95,7 @@ jobs:
     - name: Unit Tests
       run: |
         cd ./godot
-        ./bin/godot.windows.editor.x86_64.exe --test --headless
+        ./bin/godot.windows.editor.x86_64.exe --test
         cd ../
 
     - uses: actions/upload-artifact@v2

From d2f0ecc65310daf3e89b77409c3610725ca6e50f Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 22 Feb 2023 19:24:48 +0100
Subject: [PATCH 28/36] Remove left over debug statement

---
 ecs.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ecs.cpp b/ecs.cpp
index b00ab532..d3d19b6f 100644
--- a/ecs.cpp
+++ b/ecs.cpp
@@ -184,7 +184,6 @@ void ECS::preload_scripts() {
 	get_script_files("res://", scripts);
 
 	for (const auto &script : scripts) {
-		print_line(script);
 		auto code = FileAccess::get_file_as_string(script);
 		GDScriptParser parser;
 		if (parser.parse(code, script, false) == OK) {

From 27b6469545c171edffecdf860287a7507c264073 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 22 Feb 2023 21:09:10 +0100
Subject: [PATCH 29/36] Move resetting of default values to fix crash with mono
 builds.

---
 modules/godot/nodes/script_ecs.cpp | 1 -
 modules/godot/register_types.cpp   | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/godot/nodes/script_ecs.cpp b/modules/godot/nodes/script_ecs.cpp
index 34df97ea..d7ebd3ef 100644
--- a/modules/godot/nodes/script_ecs.cpp
+++ b/modules/godot/nodes/script_ecs.cpp
@@ -27,7 +27,6 @@ ScriptEcs *ScriptEcs::get_singleton() {
 }
 
 ScriptEcs::~ScriptEcs() {
-	reset_editor_default_component_properties();
 	singleton = nullptr;
 
 	__empty_scripts();
diff --git a/modules/godot/register_types.cpp b/modules/godot/register_types.cpp
index dc99dc10..9725572c 100644
--- a/modules/godot/register_types.cpp
+++ b/modules/godot/register_types.cpp
@@ -164,6 +164,13 @@ void initialize_godot_module(ModuleInitializationLevel p_level) {
 
 void uninitialize_godot_module(ModuleInitializationLevel p_level) {
 	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
+		if (!Engine::get_singleton()->is_editor_hint()) {
+			ScriptEcs::get_singleton()->reset_editor_default_component_properties();
+		}
 		memdelete(ScriptEcs::get_singleton());
+	} else if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
+		if (Engine::get_singleton()->is_editor_hint()) {
+			ScriptEcs::get_singleton()->reset_editor_default_component_properties();
+		}
 	}
 }

From 816bf034b4a230ea0a0cf4d3886319cddca985b0 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Thu, 23 Feb 2023 21:20:35 +0100
Subject: [PATCH 30/36] Fix building with clang

---
 modules/bullet_physics/SCsub | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/bullet_physics/SCsub b/modules/bullet_physics/SCsub
index 2fabe348..511d919b 100644
--- a/modules/bullet_physics/SCsub
+++ b/modules/bullet_physics/SCsub
@@ -2,12 +2,15 @@
 
 Import("env")
 Import("env_modules")
+import methods
 
 env_bullet = env_modules.Clone()
 
 thirdparty_obj = []
 
 env.Append(builtin_bullet=True)
+if methods.using_clang(env_bullet) or methods.using_emcc(env_bullet):
+    env_bullet.Append(CXXFLAGS=["-frelaxed-template-template-args"])
 
 # Add bullet header, no need to compile Bullet third party, because it's
 # already done by the godot bullet module.

From 76b6755e8f84521f9fa3f23ac0cc83a034b011bb Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Thu, 23 Feb 2023 22:00:09 +0100
Subject: [PATCH 31/36] Use newer black version

---
 .github/workflows/static_checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml
index 923c4940..b9e2b7c5 100644
--- a/.github/workflows/static_checks.yml
+++ b/.github/workflows/static_checks.yml
@@ -20,7 +20,7 @@ jobs:
           sudo apt-get install -qq dos2unix recode clang-format-11
           sudo update-alternatives --remove-all clang-format
           sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-11 100
-          sudo pip3 install black==20.8b1 pygments
+          sudo pip3 install black==22.3.0 pygments
       - name: File formatting checks (file_format.sh)
         run: |
           bash ./misc/scripts/file_format.sh

From f6768958e4822d253a01dfa5737a3b703cdf0ff3 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 1 Mar 2023 19:58:22 +0100
Subject: [PATCH 32/36] Updated godot version to
 92bee43adba8d2401ef40e2480e53087bcb1eaf1 (4.0-stable)

---
 .github/workflows/linux_builds.yml   | 2 +-
 .github/workflows/windows_builds.yml | 2 +-
 README.md                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 25f58ea4..41e9c28e 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -9,7 +9,7 @@ on:
 
 # Global Settings
 env:
-  GODOT_REF: 7e79aead99a53ee7cdf383add9a6a2aea4f15beb
+  GODOT_REF: 92bee43adba8d2401ef40e2480e53087bcb1eaf1
   SCONSFLAGS: platform=linuxbsd verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_LIMIT: 4096
 
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index f7538c73..81037df4 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -10,7 +10,7 @@ on:
 # Global Settings
 # SCONS_CACHE for windows must be set in the build environment
 env:
-  GODOT_REF: 7e79aead99a53ee7cdf383add9a6a2aea4f15beb
+  GODOT_REF: 92bee43adba8d2401ef40e2480e53087bcb1eaf1
   SCONSFLAGS: platform=windows verbose=yes warnings=all werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_MSVC_CONFIG: true
   SCONS_CACHE_LIMIT: 3072
diff --git a/README.md b/README.md
index 56871b47..224d066d 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Godex is a Godot Engine ecs library.
 **Disclaimer:** this module is still in development, open an [issues](https://github.com/GodotECS/godex/issues) to report any problem or a new [discussion](https://github.com/GodotECS/godex/discussions) if you need any help. Any form of contribution is welcome.
 
 ### The tested Godot version
-Is `master` `7e79aead99a53ee7cdf383add9a6a2aea4f15beb`, please open an issue if the current master is not working or doesn't compile.
+Is `master` `92bee43adba8d2401ef40e2480e53087bcb1eaf1`, please open an issue if the current master is not working or doesn't compile.
 
 ### What is ECS
 Shortened as ECS, the Entity Component System is an architectural design pattern that allow to organize the data in a way so that the workload can be split into small and easy programs.

From 9c4b85b64e4afc93022aff38f902a90e4b3b9222 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Tue, 11 Apr 2023 21:21:27 +0200
Subject: [PATCH 33/36] Updated version to
 7a0977ce2c558fe6219f0a14f8bd4d05aea8f019 (4.0.2-stable)

---
 .github/workflows/linux_builds.yml   | 2 +-
 .github/workflows/windows_builds.yml | 2 +-
 README.md                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 41e9c28e..28e02f5a 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -9,7 +9,7 @@ on:
 
 # Global Settings
 env:
-  GODOT_REF: 92bee43adba8d2401ef40e2480e53087bcb1eaf1
+  GODOT_REF: 7a0977ce2c558fe6219f0a14f8bd4d05aea8f019
   SCONSFLAGS: platform=linuxbsd verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_LIMIT: 4096
 
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index 81037df4..e04fa09e 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -10,7 +10,7 @@ on:
 # Global Settings
 # SCONS_CACHE for windows must be set in the build environment
 env:
-  GODOT_REF: 92bee43adba8d2401ef40e2480e53087bcb1eaf1
+  GODOT_REF: 7a0977ce2c558fe6219f0a14f8bd4d05aea8f019
   SCONSFLAGS: platform=windows verbose=yes warnings=all werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_MSVC_CONFIG: true
   SCONS_CACHE_LIMIT: 3072
diff --git a/README.md b/README.md
index 224d066d..6457d33f 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Godex is a Godot Engine ecs library.
 **Disclaimer:** this module is still in development, open an [issues](https://github.com/GodotECS/godex/issues) to report any problem or a new [discussion](https://github.com/GodotECS/godex/discussions) if you need any help. Any form of contribution is welcome.
 
 ### The tested Godot version
-Is `master` `92bee43adba8d2401ef40e2480e53087bcb1eaf1`, please open an issue if the current master is not working or doesn't compile.
+Is `master` `7a0977ce2c558fe6219f0a14f8bd4d05aea8f019`, please open an issue if the current master is not working or doesn't compile.
 
 ### What is ECS
 Shortened as ECS, the Entity Component System is an architectural design pattern that allow to organize the data in a way so that the workload can be split into small and easy programs.

From 369a473c769ad70fd3d5c52988616837d5a568bb Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 12 Apr 2023 09:16:14 +0200
Subject: [PATCH 34/36] Update compatibility to
 ab7cb2a95d060a6533e6ff5111c11f71972ab43f

---
 .github/workflows/linux_builds.yml   |  2 +-
 .github/workflows/windows_builds.yml |  2 +-
 README.md                            |  2 +-
 ecs.cpp                              | 14 +++++++++-----
 tests/test_utilities.h               |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 28e02f5a..5abddb23 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -9,7 +9,7 @@ on:
 
 # Global Settings
 env:
-  GODOT_REF: 7a0977ce2c558fe6219f0a14f8bd4d05aea8f019
+  GODOT_REF: ab7cb2a95d060a6533e6ff5111c11f71972ab43f
   SCONSFLAGS: platform=linuxbsd verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_LIMIT: 4096
 
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index e04fa09e..e2ab928e 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -10,7 +10,7 @@ on:
 # Global Settings
 # SCONS_CACHE for windows must be set in the build environment
 env:
-  GODOT_REF: 7a0977ce2c558fe6219f0a14f8bd4d05aea8f019
+  GODOT_REF: ab7cb2a95d060a6533e6ff5111c11f71972ab43f
   SCONSFLAGS: platform=windows verbose=yes warnings=all werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_MSVC_CONFIG: true
   SCONS_CACHE_LIMIT: 3072
diff --git a/README.md b/README.md
index 6457d33f..c473f798 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Godex is a Godot Engine ecs library.
 **Disclaimer:** this module is still in development, open an [issues](https://github.com/GodotECS/godex/issues) to report any problem or a new [discussion](https://github.com/GodotECS/godex/discussions) if you need any help. Any form of contribution is welcome.
 
 ### The tested Godot version
-Is `master` `7a0977ce2c558fe6219f0a14f8bd4d05aea8f019`, please open an issue if the current master is not working or doesn't compile.
+Is `master` `ab7cb2a95d060a6533e6ff5111c11f71972ab43f`, please open an issue if the current master is not working or doesn't compile.
 
 ### What is ECS
 Shortened as ECS, the Entity Component System is an architectural design pattern that allow to organize the data in a way so that the workload can be split into small and easy programs.
diff --git a/ecs.cpp b/ecs.cpp
index d3d19b6f..e5538aaa 100644
--- a/ecs.cpp
+++ b/ecs.cpp
@@ -188,12 +188,16 @@ void ECS::preload_scripts() {
 		GDScriptParser parser;
 		if (parser.parse(code, script, false) == OK) {
 			auto tree = parser.get_tree();
-			if (tree->extends.has("System")) {
-				register_dynamic_system(script.get_file());
-			}
 
-			if (tree->extends.has("Component")) {
-				register_or_get_id_for_component_name(script.get_file());
+			for (auto extend : tree->extends) {
+				if (extend->name == "System") {
+					register_dynamic_system(script.get_file());
+					break;
+				}
+				if (extend->name == "Component") {
+					register_or_get_id_for_component_name(script.get_file());
+					break;
+				}
 			}
 		}
 	}
diff --git a/tests/test_utilities.h b/tests/test_utilities.h
index 3ea90e74..6199da65 100644
--- a/tests/test_utilities.h
+++ b/tests/test_utilities.h
@@ -29,7 +29,7 @@ bool register_ecs_script(const StringName &p_script_name, const String &p_code)
 	ERR_FAIL_COND_V(err != OK, false);
 
 	for (auto extends : parser.get_tree()->extends) {
-		if (extends == "System") {
+		if (extends->name == "System") {
 			ECS::register_dynamic_system(p_script_name);
 		}
 	}

From f919dff8e53f49e6ef9473c3fe3a0098a8d6ee42 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Wed, 12 Apr 2023 16:33:22 +0200
Subject: [PATCH 35/36] Fix builds for PRs

---
 .github/workflows/linux_builds.yml   | 2 +-
 .github/workflows/windows_builds.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 5abddb23..de0e735c 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Wait for static checks
       uses: lewagon/wait-on-check-action@v1.3.1
       with:
-       ref: ${{ github.ref }}
+       ref: ${{ github.event_name != 'pull_request' && github.sha || github.event.pull_request.head.sha }}
        check-name: 'Static Checks (clang-format, black format, file format, documentation checks)'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        wait-interval: 10
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index e2ab928e..75382ddc 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Wait for static checks
       uses: lewagon/wait-on-check-action@v1.3.1
       with:
-       ref: ${{ github.ref }}
+       ref: ${{ github.event_name != 'pull_request' && github.sha || github.event.pull_request.head.sha }}
        check-name: 'Static Checks (clang-format, black format, file format, documentation checks)'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        wait-interval: 10

From d3296687d8013332006ee3bf33654d7144110ee3 Mon Sep 17 00:00:00 2001
From: Karsten Bock <KarstenBock@gmx.net>
Date: Fri, 26 May 2023 07:18:17 +0200
Subject: [PATCH 36/36] Fix shadow warnigs

---
 ecs.h                                         |  10 +-
 iterators/dynamic_query.cpp                   |  12 +-
 iterators/query.h                             |   8 +-
 modules/bullet_physics/bt_def_type.h          |   8 +-
 .../bullet_collision_dispatcher.cpp           |   4 +-
 .../bullet_physics/components_rigid_body.cpp  |   2 +-
 .../editor_plugins/entity_editor_plugin.cpp   | 262 +++++++++---------
 modules/godot/nodes/ecs_utilities.cpp         |  24 +-
 modules/godot/nodes/script_ecs.cpp            |  16 +-
 .../NarrowPhaseCollision/shared/b3ClipFaces.h |  18 +-
 .../shared/b3ContactConvexConvexSAT.h         |   9 +-
 .../shared/b3FindConcaveSatAxis.h             |  18 +-
 .../btCompoundCollisionAlgorithm.h            |   4 +-
 .../CollisionShapes/btTriangleShape.h         |   6 +-
 14 files changed, 202 insertions(+), 199 deletions(-)

diff --git a/ecs.h b/ecs.h
index 73922f9f..38aee047 100644
--- a/ecs.h
+++ b/ecs.h
@@ -633,11 +633,11 @@ void ECS::register_component(StorageBase *(*create_storage)()) {
 		get_storage_config = C::_get_storage_config;
 	}
 
-	LocalVector<godex::spawner_id> spawners;
+	LocalVector<godex::spawner_id> tmp_spawners;
 	if constexpr (godex_has_get_spawners<C>::value) {
-		spawners = C::get_spawners();
-		for (uint32_t i = 0; i < spawners.size(); i += 1) {
-			spawners_info[spawners[i]].components.push_back(C::component_id);
+		tmp_spawners = C::get_spawners();
+		for (uint32_t i = 0; i < tmp_spawners.size(); i += 1) {
+			spawners_info[tmp_spawners[i]].components.push_back(C::component_id);
 		}
 	}
 
@@ -651,7 +651,7 @@ void ECS::register_component(StorageBase *(*create_storage)()) {
 					nullptr,
 					notify_release_write,
 					shared_component_storage,
-					spawners,
+					tmp_spawners,
 					DataAccessorFuncs{
 							C::get_static_properties,
 							C::get_property_list,
diff --git a/iterators/dynamic_query.cpp b/iterators/dynamic_query.cpp
index f697a2bf..3566b4d6 100644
--- a/iterators/dynamic_query.cpp
+++ b/iterators/dynamic_query.cpp
@@ -110,15 +110,15 @@ void DynamicQuery::get_system_info(SystemExeInfo *p_info) const {
 }
 
 void DynamicQuery::prepare_world_script(Object *p_world) {
-	WorldECS *world = Object::cast_to<WorldECS>(p_world);
-	ERR_FAIL_COND_MSG(world == nullptr, "The given object is not a `WorldECS`.");
-	prepare_world(world->get_world());
+	WorldECS *tmp_world = Object::cast_to<WorldECS>(p_world);
+	ERR_FAIL_COND_MSG(tmp_world == nullptr, "The given object is not a `WorldECS`.");
+	prepare_world(tmp_world->get_world());
 }
 
 void DynamicQuery::begin_script(Object *p_world) {
-	WorldECS *world = Object::cast_to<WorldECS>(p_world);
-	ERR_FAIL_COND_MSG(world == nullptr, "The given object is not a `WorldECS`.");
-	initiate_process(world->get_world());
+	WorldECS *tmp_world = Object::cast_to<WorldECS>(p_world);
+	ERR_FAIL_COND_MSG(tmp_world == nullptr, "The given object is not a `WorldECS`.");
+	initiate_process(tmp_world->get_world());
 }
 
 void DynamicQuery::end_script() {
diff --git a/iterators/query.h b/iterators/query.h
index 1a5e22b4..3ffbdd8b 100644
--- a/iterators/query.h
+++ b/iterators/query.h
@@ -825,8 +825,8 @@ struct QueryStorage<I, Changed<C>, Cs...> : public QueryStorage<I + 1, Cs...> {
 		if (unlikely(storage == nullptr)) {
 			return o_entities;
 		}
-		const EntitiesBuffer entities(changed.size(), changed.get_entities_ptr());
-		return entities.count < o_entities.count ? entities : o_entities;
+		const EntitiesBuffer tmp_entities(changed.size(), changed.get_entities_ptr());
+		return tmp_entities.count < o_entities.count ? tmp_entities : o_entities;
 	}
 
 	bool filter_satisfied(EntityID p_entity) const {
@@ -1321,8 +1321,8 @@ struct QueryStorage<I, C, Cs...> : QueryStorage<I + 1, Cs...> {
 		if (unlikely(storage == nullptr)) {
 			return o_entities;
 		}
-		const EntitiesBuffer entities = storage->get_stored_entities();
-		return entities.count < o_entities.count ? entities : o_entities;
+		const EntitiesBuffer tmp_entities = storage->get_stored_entities();
+		return tmp_entities.count < o_entities.count ? tmp_entities : o_entities;
 	}
 
 	bool filter_satisfied(EntityID p_entity) const {
diff --git a/modules/bullet_physics/bt_def_type.h b/modules/bullet_physics/bt_def_type.h
index 775c577e..4e163c05 100644
--- a/modules/bullet_physics/bt_def_type.h
+++ b/modules/bullet_physics/bt_def_type.h
@@ -11,8 +11,8 @@ enum BtSpaceIndex : int {
 };
 
 enum BtBodyType : int {
-	TYPE_AREA = 0,
-	TYPE_RIGID_BODY,
-	TYPE_SOFT_BODY,
-	TYPE_KINEMATIC_GHOST_BODY
+	BODY_TYPE_AREA = 0,
+	BODY_TYPE_RIGID_BODY,
+	BODY_TYPE_SOFT_BODY,
+	BODY_TYPE_KINEMATIC_GHOST_BODY
 };
diff --git a/modules/bullet_physics/bullet_collision_dispatcher.cpp b/modules/bullet_physics/bullet_collision_dispatcher.cpp
index 295834ec..6483b1bc 100644
--- a/modules/bullet_physics/bullet_collision_dispatcher.cpp
+++ b/modules/bullet_physics/bullet_collision_dispatcher.cpp
@@ -6,7 +6,7 @@ GodexBtCollisionDispatcher::GodexBtCollisionDispatcher(btCollisionConfiguration
 		btCollisionDispatcher(collisionConfiguration) {}
 
 bool GodexBtCollisionDispatcher::needsCollision(const btCollisionObject *body0, const btCollisionObject *body1) {
-	if (body0->getUserIndex() == BtBodyType::TYPE_AREA || body1->getUserIndex() == BtBodyType::TYPE_AREA) {
+	if (body0->getUserIndex() == BtBodyType::BODY_TYPE_AREA || body1->getUserIndex() == BtBodyType::BODY_TYPE_AREA) {
 		// Avoid area narrow phase
 		return false;
 	}
@@ -14,7 +14,7 @@ bool GodexBtCollisionDispatcher::needsCollision(const btCollisionObject *body0,
 }
 
 bool GodexBtCollisionDispatcher::needsResponse(const btCollisionObject *body0, const btCollisionObject *body1) {
-	if (body0->getUserIndex() == BtBodyType::TYPE_AREA || body1->getUserIndex() == BtBodyType::TYPE_AREA) {
+	if (body0->getUserIndex() == BtBodyType::BODY_TYPE_AREA || body1->getUserIndex() == BtBodyType::BODY_TYPE_AREA) {
 		// Avoid area narrow phase
 		return false;
 	}
diff --git a/modules/bullet_physics/components_rigid_body.cpp b/modules/bullet_physics/components_rigid_body.cpp
index 5b20378f..2e158136 100644
--- a/modules/bullet_physics/components_rigid_body.cpp
+++ b/modules/bullet_physics/components_rigid_body.cpp
@@ -45,7 +45,7 @@ void BtRigidBody::_get_storage_config(Dictionary &r_config) {
 BtRigidBody::BtRigidBody() {
 	body.setUserPointer(this);
 	// Used by `GodotCollisionDispatcher`
-	body.setUserIndex(BtBodyType::TYPE_RIGID_BODY);
+	body.setUserIndex(BtBodyType::BODY_TYPE_RIGID_BODY);
 }
 
 btRigidBody *BtRigidBody::get_body() {
diff --git a/modules/godot/editor_plugins/entity_editor_plugin.cpp b/modules/godot/editor_plugins/entity_editor_plugin.cpp
index e4db0c6f..091eb6e8 100644
--- a/modules/godot/editor_plugins/entity_editor_plugin.cpp
+++ b/modules/godot/editor_plugins/entity_editor_plugin.cpp
@@ -145,16 +145,16 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 				} break;
 				case Variant::INT: {
 					if (e.hint == PROPERTY_HINT_ENUM) {
-						EditorPropertyEnum *editor = memnew(EditorPropertyEnum);
+						EditorPropertyEnum *property_enum = memnew(EditorPropertyEnum);
 						Vector<String> options = e.hint_string.split(",");
-						editor->setup(options);
-						prop = editor;
+						property_enum->setup(options);
+						prop = property_enum;
 
 					} else if (e.hint == PROPERTY_HINT_FLAGS) {
-						EditorPropertyFlags *editor = memnew(EditorPropertyFlags);
+						EditorPropertyFlags *property_flags = memnew(EditorPropertyFlags);
 						Vector<String> options = e.hint_string.split(",");
-						editor->setup(options);
-						prop = editor;
+						property_flags->setup(options);
+						prop = property_flags;
 
 					} else if (e.hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || e.hint == PROPERTY_HINT_LAYERS_2D_RENDER || e.hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || e.hint == PROPERTY_HINT_LAYERS_3D_RENDER) {
 						EditorPropertyLayers::LayerType lt = EditorPropertyLayers::LAYER_RENDER_2D;
@@ -174,17 +174,17 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 							default: {
 							}
 						}
-						EditorPropertyLayers *editor = memnew(EditorPropertyLayers);
-						editor->setup(lt);
-						prop = editor;
+						EditorPropertyLayers *property_layers = memnew(EditorPropertyLayers);
+						property_layers->setup(lt);
+						prop = property_layers;
 
 					} else if (e.hint == PROPERTY_HINT_OBJECT_ID) {
-						EditorPropertyObjectID *editor = memnew(EditorPropertyObjectID);
-						editor->setup("Object");
-						prop = editor;
+						EditorPropertyObjectID *property_object_id = memnew(EditorPropertyObjectID);
+						property_object_id->setup("Object");
+						prop = property_object_id;
 
 					} else {
-						EditorPropertyInteger *editor = memnew(EditorPropertyInteger);
+						EditorPropertyInteger *property_integer = memnew(EditorPropertyInteger);
 						int min = 0, max = 65535, step = 1;
 						bool hide_slider = false;
 						bool greater = true, lesser = true;
@@ -210,13 +210,13 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 							}
 						}
 
-						editor->setup(min, max, step, hide_slider, greater, lesser);
-						prop = editor;
+						property_integer->setup(min, max, step, hide_slider, greater, lesser);
+						prop = property_integer;
 					}
 				} break;
 				case Variant::FLOAT: {
 					if (e.hint == PROPERTY_HINT_EXP_EASING) {
-						EditorPropertyEasing *editor = memnew(EditorPropertyEasing);
+						EditorPropertyEasing *property_easing = memnew(EditorPropertyEasing);
 						bool full = true;
 						bool flip = false;
 						Vector<String> hints = e.hint_string.split(",");
@@ -230,11 +230,11 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 							}
 						}
 
-						editor->setup(full, flip);
-						prop = editor;
+						property_easing->setup(full, flip);
+						prop = property_easing;
 
 					} else {
-						EditorPropertyFloat *editor = memnew(EditorPropertyFloat);
+						EditorPropertyFloat *property_float = memnew(EditorPropertyFloat);
 						double min = -65535, max = 65535, step = default_float_step;
 						bool hide_slider = true;
 						bool exp_range = false;
@@ -264,17 +264,17 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 							}
 						}
 
-						editor->setup(min, max, step, hide_slider, exp_range, greater, lesser);
-						prop = editor;
+						property_float->setup(min, max, step, hide_slider, exp_range, greater, lesser);
+						prop = property_float;
 					}
 
 				} break;
 				case Variant::STRING: {
 					if (e.hint == PROPERTY_HINT_ENUM) {
-						EditorPropertyTextEnum *editor = memnew(EditorPropertyTextEnum);
+						EditorPropertyTextEnum *property_text_enum = memnew(EditorPropertyTextEnum);
 						Vector<String> options = e.hint_string.split(",");
-						editor->setup(options);
-						prop = editor;
+						property_text_enum->setup(options);
+						prop = property_text_enum;
 
 					} else if (e.hint == godex::PROPERTY_HINT_ECS_EVENT_EMITTER) {
 						// Show a full list of available event emitters for this event.
@@ -295,9 +295,9 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 							}
 						}
 
-						EditorPropertyTextEnum *editor = memnew(EditorPropertyTextEnum);
-						editor->setup(enum_component_list, false);
-						prop = editor;
+						EditorPropertyTextEnum *property_text_enum = memnew(EditorPropertyTextEnum);
+						property_text_enum->setup(enum_component_list, false);
+						prop = property_text_enum;
 
 					} else if (e.hint == godex::PROPERTY_HINT_ECS_SPAWNER) {
 						// Show the full list of available spawners for this component.
@@ -314,36 +314,36 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 							}
 						}
 
-						EditorPropertyTextEnum *editor = memnew(EditorPropertyTextEnum);
-						editor->setup(enum_component_list, false);
-						prop = editor;
+						EditorPropertyTextEnum *property_text_enum = memnew(EditorPropertyTextEnum);
+						property_text_enum->setup(enum_component_list, false);
+						prop = property_text_enum;
 
 					} else if (e.hint == PROPERTY_HINT_MULTILINE_TEXT) {
-						EditorPropertyMultilineText *editor = memnew(EditorPropertyMultilineText);
-						prop = editor;
+						EditorPropertyMultilineText *property_multiline_text = memnew(EditorPropertyMultilineText);
+						prop = property_multiline_text;
 
 					} else if (e.hint == PROPERTY_HINT_TYPE_STRING) {
-						EditorPropertyClassName *editor = memnew(EditorPropertyClassName);
-						editor->setup("Object", e.hint_string);
-						prop = editor;
+						EditorPropertyClassName *property_class_name = memnew(EditorPropertyClassName);
+						property_class_name->setup("Object", e.hint_string);
+						prop = property_class_name;
 
 					} else if (e.hint == PROPERTY_HINT_DIR || e.hint == PROPERTY_HINT_FILE || e.hint == PROPERTY_HINT_SAVE_FILE || e.hint == PROPERTY_HINT_GLOBAL_DIR || e.hint == PROPERTY_HINT_GLOBAL_FILE) {
 						Vector<String> extensions = e.hint_string.split(",");
 						bool global = e.hint == PROPERTY_HINT_GLOBAL_DIR || e.hint == PROPERTY_HINT_GLOBAL_FILE;
 						bool folder = e.hint == PROPERTY_HINT_DIR || e.hint == PROPERTY_HINT_GLOBAL_DIR;
 						bool save = e.hint == PROPERTY_HINT_SAVE_FILE;
-						EditorPropertyPath *editor = memnew(EditorPropertyPath);
-						editor->setup(extensions, folder, global);
+						EditorPropertyPath *property_path = memnew(EditorPropertyPath);
+						property_path->setup(extensions, folder, global);
 						if (save) {
-							editor->set_save_mode();
+							property_path->set_save_mode();
 						}
-						prop = editor;
+						prop = property_path;
 					} else {
-						EditorPropertyText *editor = memnew(EditorPropertyText);
+						EditorPropertyText *property_text = memnew(EditorPropertyText);
 						if (e.hint == PROPERTY_HINT_PLACEHOLDER_TEXT) {
-							editor->set_placeholder(e.hint_string);
+							property_text->set_placeholder(e.hint_string);
 						}
-						prop = editor;
+						prop = property_text;
 					}
 				} break;
 
@@ -373,91 +373,91 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 	editor->setup(min, max, step, hide_slider);
 				// math types
 				case Variant::VECTOR2: {
-					EditorPropertyVector2 *editor = memnew(EditorPropertyVector2);
-					SETUP_MATH_RANGE_WITH_STEP(editor, e, double);
-					prop = editor;
+					EditorPropertyVector2 *property_vector2 = memnew(EditorPropertyVector2);
+					SETUP_MATH_RANGE_WITH_STEP(property_vector2, e, double);
+					prop = property_vector2;
 
 				} break;
 				case Variant::VECTOR2I: {
-					EditorPropertyVector2i *editor = memnew(EditorPropertyVector2i);
-					SETUP_MATH_RANGE(editor, e, int);
-					prop = editor;
+					EditorPropertyVector2i *property_vector2i = memnew(EditorPropertyVector2i);
+					SETUP_MATH_RANGE(property_vector2i, e, int);
+					prop = property_vector2i;
 
 				} break;
 				case Variant::RECT2: {
-					EditorPropertyRect2 *editor = memnew(EditorPropertyRect2);
-					SETUP_MATH_RANGE_WITH_STEP(editor, e, double);
-					prop = editor;
+					EditorPropertyRect2 *property_rect2 = memnew(EditorPropertyRect2);
+					SETUP_MATH_RANGE_WITH_STEP(property_rect2, e, double);
+					prop = property_rect2;
 
 				} break;
 				case Variant::RECT2I: {
-					EditorPropertyRect2i *editor = memnew(EditorPropertyRect2i);
-					SETUP_MATH_RANGE(editor, e, int);
-					prop = editor;
+					EditorPropertyRect2i *property_rect2i = memnew(EditorPropertyRect2i);
+					SETUP_MATH_RANGE(property_rect2i, e, int);
+					prop = property_rect2i;
 
 				} break;
 				case Variant::VECTOR3: {
-					EditorPropertyVector3 *editor = memnew(EditorPropertyVector3);
-					SETUP_MATH_RANGE_WITH_STEP(editor, e, double);
-					prop = editor;
+					EditorPropertyVector3 *property_vector3 = memnew(EditorPropertyVector3);
+					SETUP_MATH_RANGE_WITH_STEP(property_vector3, e, double);
+					prop = property_vector3;
 
 				} break;
 				case Variant::VECTOR3I: {
-					EditorPropertyVector3i *editor = memnew(EditorPropertyVector3i);
-					SETUP_MATH_RANGE(editor, e, int);
-					prop = editor;
+					EditorPropertyVector3i *property_vector3i = memnew(EditorPropertyVector3i);
+					SETUP_MATH_RANGE(property_vector3i, e, int);
+					prop = property_vector3i;
 
 				} break;
 				case Variant::TRANSFORM2D: {
-					EditorPropertyTransform2D *editor = memnew(EditorPropertyTransform2D);
-					SETUP_MATH_RANGE_WITH_STEP(editor, e, double);
-					prop = editor;
+					EditorPropertyTransform2D *transform_2d = memnew(EditorPropertyTransform2D);
+					SETUP_MATH_RANGE_WITH_STEP(transform_2d, e, double);
+					prop = transform_2d;
 
 				} break;
 				case Variant::PLANE: {
-					EditorPropertyPlane *editor = memnew(EditorPropertyPlane);
-					SETUP_MATH_RANGE_WITH_STEP(editor, e, double);
-					prop = editor;
+					EditorPropertyPlane *property_plane = memnew(EditorPropertyPlane);
+					SETUP_MATH_RANGE_WITH_STEP(property_plane, e, double);
+					prop = property_plane;
 
 				} break;
 				case Variant::QUATERNION: {
-					EditorPropertyQuaternion *editor = memnew(EditorPropertyQuaternion);
-					SETUP_MATH_RANGE_WITH_STEP(editor, e, double);
-					prop = editor;
+					EditorPropertyQuaternion *property_quaternion = memnew(EditorPropertyQuaternion);
+					SETUP_MATH_RANGE_WITH_STEP(property_quaternion, e, double);
+					prop = property_quaternion;
 
 				} break;
 				case Variant::AABB: {
-					EditorPropertyAABB *editor = memnew(EditorPropertyAABB);
-					SETUP_MATH_RANGE_WITH_STEP(editor, e, double);
-					prop = editor;
+					EditorPropertyAABB *property_aabb = memnew(EditorPropertyAABB);
+					SETUP_MATH_RANGE_WITH_STEP(property_aabb, e, double);
+					prop = property_aabb;
 
 				} break;
 				case Variant::BASIS: {
-					EditorPropertyBasis *editor = memnew(EditorPropertyBasis);
-					SETUP_MATH_RANGE_WITH_STEP(editor, e, double);
-					prop = editor;
+					EditorPropertyBasis *property_basis = memnew(EditorPropertyBasis);
+					SETUP_MATH_RANGE_WITH_STEP(property_basis, e, double);
+					prop = property_basis;
 
 				} break;
 				case Variant::TRANSFORM3D: {
-					EditorPropertyTransform3D *editor = memnew(EditorPropertyTransform3D);
-					SETUP_MATH_RANGE_WITH_STEP(editor, e, double);
-					prop = editor;
+					EditorPropertyTransform3D *transform_3d = memnew(EditorPropertyTransform3D);
+					SETUP_MATH_RANGE_WITH_STEP(transform_3d, e, double);
+					prop = transform_3d;
 
 				} break;
 
 				// misc types
 				case Variant::COLOR: {
-					EditorPropertyColor *editor = memnew(EditorPropertyColor);
-					editor->setup(e.hint != PROPERTY_HINT_COLOR_NO_ALPHA);
-					prop = editor;
+					EditorPropertyColor *property_color = memnew(EditorPropertyColor);
+					property_color->setup(e.hint != PROPERTY_HINT_COLOR_NO_ALPHA);
+					prop = property_color;
 
 				} break;
 				case Variant::STRING_NAME: {
 					if (e.hint == PROPERTY_HINT_ENUM) {
-						EditorPropertyTextEnum *editor = memnew(EditorPropertyTextEnum);
+						EditorPropertyTextEnum *property_text_enum = memnew(EditorPropertyTextEnum);
 						Vector<String> options = e.hint_string.split(",");
-						editor->setup(options, true);
-						prop = editor;
+						property_text_enum->setup(options, true);
+						prop = property_text_enum;
 
 					} else if (e.hint == godex::PROPERTY_HINT_ECS_SPAWNER) {
 						const StringName spawner_name = e.hint_string;
@@ -473,32 +473,32 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 							}
 						}
 
-						EditorPropertyTextEnum *editor = memnew(EditorPropertyTextEnum);
-						editor->setup(enum_component_list, true);
-						prop = editor;
+						EditorPropertyTextEnum *property_text_enum = memnew(EditorPropertyTextEnum);
+						property_text_enum->setup(enum_component_list, true);
+						prop = property_text_enum;
 
 					} else {
-						EditorPropertyText *editor = memnew(EditorPropertyText);
+						EditorPropertyText *property_text = memnew(EditorPropertyText);
 						if (e.hint == PROPERTY_HINT_PLACEHOLDER_TEXT) {
-							editor->set_placeholder(e.hint_string);
+							property_text->set_placeholder(e.hint_string);
 						}
-						editor->set_string_name(true);
-						prop = editor;
+						property_text->set_string_name(true);
+						prop = property_text;
 					}
 
 				} break;
 				case Variant::NODE_PATH: {
-					EditorPropertyNodePath *editor = memnew(EditorPropertyNodePath);
-					const int usage = 0; // TODO how to integrate this? check /modules/godot/editor/editor_properties.cpp::parse_property
+					EditorPropertyNodePath *property_node_path = memnew(EditorPropertyNodePath);
+					const int usage = 0; // TODO how to integrate this? check /modules/godot/property_node_path/editor_properties.cpp::parse_property
 					if (e.hint == PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE && e.hint_string != String()) {
-						editor->setup(e.hint_string, Vector<StringName>(), (usage & PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT));
+						property_node_path->setup(e.hint_string, Vector<StringName>(), (usage & PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT));
 					}
 					if (e.hint == PROPERTY_HINT_NODE_PATH_VALID_TYPES && e.hint_string != String()) {
 						Vector<String> types = e.hint_string.split(",", false);
 						Vector<StringName> sn = Variant(types); // convert via variant
-						editor->setup(NodePath(), sn, (usage & PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT));
+						property_node_path->setup(NodePath(), sn, (usage & PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT));
 					}
-					prop = editor;
+					prop = property_node_path;
 
 				} break;
 				case Variant::RID: {
@@ -506,23 +506,23 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 
 				} break;
 				case Variant::OBJECT: {
-					EditorPropertyResource *editor = memnew(EditorPropertyResource);
+					EditorPropertyResource *property_resource = memnew(EditorPropertyResource);
 					if (e.hint == PROPERTY_HINT_RESOURCE_TYPE) {
-						editor->setup(entity, entity ? entity->get_path() : NodePath(), e.hint_string);
+						property_resource->setup(entity, entity ? entity->get_path() : NodePath(), e.hint_string);
 						const String open_in_new = EDITOR_GET("interface/inspector/resources_to_open_in_new_inspector");
 						for (int i = 0; i < open_in_new.get_slice_count(","); i++) {
 							const String type = open_in_new.get_slicec(',', i).strip_edges();
 							for (int j = 0; j < e.hint_string.get_slice_count(","); j++) {
 								String inherits = e.hint_string.get_slicec(',', j);
 								if (ClassDB::is_parent_class(inherits, type)) {
-									editor->set_use_sub_inspector(false);
+									property_resource->set_use_sub_inspector(false);
 								}
 							}
 						}
 					} else {
-						editor->setup(entity, entity ? entity->get_path() : NodePath(), "Resource");
+						property_resource->setup(entity, entity ? entity->get_path() : NodePath(), "Resource");
 					}
-					prop = editor;
+					prop = property_resource;
 
 				} break;
 				case Variant::DICTIONARY: {
@@ -530,56 +530,56 @@ void EntityEditor::create_component_inspector(StringName p_component_name, const
 
 				} break;
 				case Variant::ARRAY: {
-					EditorPropertyArray *editor = memnew(EditorPropertyArray);
-					editor->setup(Variant::ARRAY, e.hint_string);
-					prop = editor;
+					EditorPropertyArray *property_array = memnew(EditorPropertyArray);
+					property_array->setup(Variant::ARRAY, e.hint_string);
+					prop = property_array;
 				} break;
 
 				// arrays
 				case Variant::PACKED_BYTE_ARRAY: {
-					EditorPropertyArray *editor = memnew(EditorPropertyArray);
-					editor->setup(Variant::PACKED_BYTE_ARRAY, e.hint_string);
-					prop = editor;
+					EditorPropertyArray *property_array = memnew(EditorPropertyArray);
+					property_array->setup(Variant::PACKED_BYTE_ARRAY, e.hint_string);
+					prop = property_array;
 				} break;
 				case Variant::PACKED_INT32_ARRAY: {
-					EditorPropertyArray *editor = memnew(EditorPropertyArray);
-					editor->setup(Variant::PACKED_INT32_ARRAY, e.hint_string);
-					prop = editor;
+					EditorPropertyArray *property_array = memnew(EditorPropertyArray);
+					property_array->setup(Variant::PACKED_INT32_ARRAY, e.hint_string);
+					prop = property_array;
 				} break;
 				case Variant::PACKED_FLOAT32_ARRAY: {
-					EditorPropertyArray *editor = memnew(EditorPropertyArray);
-					editor->setup(Variant::PACKED_FLOAT32_ARRAY, e.hint_string);
-					prop = editor;
+					EditorPropertyArray *property_array = memnew(EditorPropertyArray);
+					property_array->setup(Variant::PACKED_FLOAT32_ARRAY, e.hint_string);
+					prop = property_array;
 				} break;
 				case Variant::PACKED_INT64_ARRAY: {
-					EditorPropertyArray *editor = memnew(EditorPropertyArray);
-					editor->setup(Variant::PACKED_INT64_ARRAY, e.hint_string);
-					prop = editor;
+					EditorPropertyArray *property_array = memnew(EditorPropertyArray);
+					property_array->setup(Variant::PACKED_INT64_ARRAY, e.hint_string);
+					prop = property_array;
 				} break;
 				case Variant::PACKED_FLOAT64_ARRAY: {
-					EditorPropertyArray *editor = memnew(EditorPropertyArray);
-					editor->setup(Variant::PACKED_FLOAT64_ARRAY, e.hint_string);
-					prop = editor;
+					EditorPropertyArray *property_array = memnew(EditorPropertyArray);
+					property_array->setup(Variant::PACKED_FLOAT64_ARRAY, e.hint_string);
+					prop = property_array;
 				} break;
 				case Variant::PACKED_STRING_ARRAY: {
-					EditorPropertyArray *editor = memnew(EditorPropertyArray);
-					editor->setup(Variant::PACKED_STRING_ARRAY, e.hint_string);
-					prop = editor;
+					EditorPropertyArray *property_array = memnew(EditorPropertyArray);
+					property_array->setup(Variant::PACKED_STRING_ARRAY, e.hint_string);
+					prop = property_array;
 				} break;
 				case Variant::PACKED_VECTOR2_ARRAY: {
-					EditorPropertyArray *editor = memnew(EditorPropertyArray);
-					editor->setup(Variant::PACKED_VECTOR2_ARRAY, e.hint_string);
-					prop = editor;
+					EditorPropertyArray *property_array = memnew(EditorPropertyArray);
+					property_array->setup(Variant::PACKED_VECTOR2_ARRAY, e.hint_string);
+					prop = property_array;
 				} break;
 				case Variant::PACKED_VECTOR3_ARRAY: {
-					EditorPropertyArray *editor = memnew(EditorPropertyArray);
-					editor->setup(Variant::PACKED_VECTOR3_ARRAY, e.hint_string);
-					prop = editor;
+					EditorPropertyArray *property_array = memnew(EditorPropertyArray);
+					property_array->setup(Variant::PACKED_VECTOR3_ARRAY, e.hint_string);
+					prop = property_array;
 				} break;
 				case Variant::PACKED_COLOR_ARRAY: {
-					EditorPropertyArray *editor = memnew(EditorPropertyArray);
-					editor->setup(Variant::PACKED_COLOR_ARRAY, e.hint_string);
-					prop = editor;
+					EditorPropertyArray *property_array = memnew(EditorPropertyArray);
+					property_array->setup(Variant::PACKED_COLOR_ARRAY, e.hint_string);
+					prop = property_array;
 				} break;
 				default: {
 				}
diff --git a/modules/godot/nodes/ecs_utilities.cpp b/modules/godot/nodes/ecs_utilities.cpp
index 52fb1e7c..de819dea 100644
--- a/modules/godot/nodes/ecs_utilities.cpp
+++ b/modules/godot/nodes/ecs_utilities.cpp
@@ -43,9 +43,9 @@ System::~System() {}
 void System::execute_in(Phase p_phase, uint32_t p_dispatcher_id) {
 	ERR_FAIL_COND_MSG(info == nullptr, "No info set. This function can be called only within the `_prepare`.");
 	if (p_dispatcher_id != godex::SYSTEM_NONE) {
-		const StringName name = ECS::get_system_name(p_dispatcher_id);
-		ERR_FAIL_COND(name == StringName());
-		info->execute_in(p_phase, name);
+		const StringName system_name = ECS::get_system_name(p_dispatcher_id);
+		ERR_FAIL_COND(system_name == StringName());
+		info->execute_in(p_phase, system_name);
 	} else {
 		info->execute_in(p_phase);
 	}
@@ -53,16 +53,16 @@ void System::execute_in(Phase p_phase, uint32_t p_dispatcher_id) {
 
 void System::execute_after(uint32_t p_system) {
 	ERR_FAIL_COND_MSG(info == nullptr, "No info set. This function can be called only within the `_prepare`.");
-	const StringName name = ECS::get_system_name(p_system);
-	ERR_FAIL_COND(name == StringName());
-	info->execute_after(name);
+	const StringName system_name = ECS::get_system_name(p_system);
+	ERR_FAIL_COND(system_name == StringName());
+	info->execute_after(system_name);
 }
 
 void System::execute_before(uint32_t p_system) {
 	ERR_FAIL_COND_MSG(info == nullptr, "No info set. This function can be called only within the `_prepare`.");
-	const StringName name = ECS::get_system_name(p_system);
-	ERR_FAIL_COND(name == StringName());
-	info->execute_before(name);
+	const StringName system_name = ECS::get_system_name(p_system);
+	ERR_FAIL_COND(system_name == StringName());
+	info->execute_before(system_name);
 }
 
 void System::with_query_gd(Object *p_query) {
@@ -290,12 +290,12 @@ StringName Component::get_name() const {
 }
 
 void Component::get_component_property_list(List<PropertyInfo> *r_info) {
-	Ref<Script> script = get_script();
-	if (script.is_null()) {
+	Ref<Script> tmp_script = get_script();
+	if (tmp_script.is_null()) {
 		return;
 	}
 
-	script->get_script_property_list(r_info);
+	tmp_script->get_script_property_list(r_info);
 }
 
 Variant Component::get_property_default_value(StringName p_property_name) {
diff --git a/modules/godot/nodes/script_ecs.cpp b/modules/godot/nodes/script_ecs.cpp
index d7ebd3ef..952aa2e6 100644
--- a/modules/godot/nodes/script_ecs.cpp
+++ b/modules/godot/nodes/script_ecs.cpp
@@ -252,8 +252,8 @@ void ScriptEcs::__empty_scripts() {
 
 bool ScriptEcs::__reload_script(const String &p_path, const String &p_name, const bool p_force_reload) {
 	if (p_force_reload) {
-		Ref<Script> script = ResourceLoader::load(p_path);
-		return __reload_script(script, p_path, p_name);
+		Ref<Script> tmp_script = ResourceLoader::load(p_path);
+		return __reload_script(tmp_script, p_path, p_name);
 	} else {
 		Ref<System> system = get_script_system(p_name);
 		if (system.is_valid()) {
@@ -276,19 +276,19 @@ bool ScriptEcs::__reload_script(const String &p_path, const String &p_name, cons
 	return false;
 }
 
-bool ScriptEcs::__reload_script(Ref<Script> script, const String &p_path, const String &p_name) {
+bool ScriptEcs::__reload_script(Ref<Script> p_script, const String &p_path, const String &p_name) {
 	bool is_valid = false;
-	ERR_FAIL_COND_V(script.is_null(), false);
+	ERR_FAIL_COND_V(p_script.is_null(), false);
 
-	const StringName base_type = script->get_instance_base_type();
+	const StringName base_type = p_script->get_instance_base_type();
 	if (base_type == "System") {
-		Ref<System> system = __reload_system(script, p_path, p_name);
+		Ref<System> system = __reload_system(p_script, p_path, p_name);
 		if (system.is_valid()) {
 			system->verified = true;
 			is_valid = true;
 		}
 	} else if (base_type == "Component") {
-		Ref<Component> component = __reload_component(script, p_path, p_name);
+		Ref<Component> component = __reload_component(p_script, p_path, p_name);
 		if (component.is_valid()) {
 			component->verified = true;
 			is_valid = true;
@@ -310,7 +310,7 @@ bool ScriptEcs::__reload_script(Ref<Script> script, const String &p_path, const
 			}
 		}
 	} else if (base_type == "SystemBundle") {
-		Ref<SystemBundle> bundle = __reload_system_bundle(script, p_path, p_name);
+		Ref<SystemBundle> bundle = __reload_system_bundle(p_script, p_path, p_name);
 		if (bundle.is_valid()) {
 			bundle->verified = true;
 			is_valid = true;
diff --git a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3ClipFaces.h b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3ClipFaces.h
index 0d9b13f1..7fdc661d 100644
--- a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3ClipFaces.h
+++ b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3ClipFaces.h
@@ -74,19 +74,19 @@ __kernel void clipFacesAndFindContactsKernel(__global const b3Float4* separating
 											 int vertexFaceCapacity,
 											 int pairIndex)
 {
-	//    int i = get_global_id(0);
-	//int pairIndex = i;
-	int i = pairIndex;
+	//    int index = get_global_id(0);
+	//int pairIndex = index;
+	int index = pairIndex;
 
 	float minDist = -1e30f;
 	float maxDist = 0.02f;
 
-	//	if (i<numPairs)
+	//	if (index<numPairs)
 	{
-		if (hasSeparatingAxis[i])
+		if (hasSeparatingAxis[index])
 		{
-			//			int bodyIndexA = pairs[i].x;
-			//		int bodyIndexB = pairs[i].y;
+			//			int bodyIndexA = pairs[index].x;
+			//		int bodyIndexB = pairs[index].y;
 
 			int numLocalContactsOut = 0;
 
@@ -164,8 +164,8 @@ __kernel void clipFacesAndFindContactsKernel(__global const b3Float4* separating
 			for (int i = 0; i < numLocalContactsOut; i++)
 				pVtxIn[i] = pVtxOut[i];
 
-		}  //		if (hasSeparatingAxis[i])
-	}      //	if (i<numPairs)
+		}  //		if (hasSeparatingAxis[index])
+	}      //	if (index<numPairs)
 }
 
 #endif  //B3_CLIP_FACES_H
diff --git a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h
index ca68f4bc..338d3703 100644
--- a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h
+++ b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h
@@ -349,10 +349,13 @@ inline int b3ClipHullHullSingle(
 
 		if (numContactsOut > 0)
 		{
-			B3_PROFILE("overlap");
+			b3Float4 normalOnSurfaceB;
+			{
+				B3_PROFILE("overlap");
 
-			b3Float4 normalOnSurfaceB = (b3Float4&)hostNormal;
-			//			b3Float4 centerOut;
+				normalOnSurfaceB = (b3Float4 &)hostNormal;
+				//			b3Float4 centerOut;
+			}
 
 			b3Int4 contactIdx;
 			contactIdx.x = 0;
diff --git a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h
index 983554eb..50a96626 100644
--- a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h
+++ b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h
@@ -523,15 +523,15 @@ __kernel void b3FindConcaveSeparatingAxisKernel(__global b3Int4* concavePairs,
 												int numConcavePairs,
 												int pairIdx)
 {
-	int i = pairIdx;
-	/*	int i = get_global_id(0);
-	if (i>=numConcavePairs)
+	int idx = pairIdx;
+	/*	int idx = get_global_id(0);
+	if (idx>=numConcavePairs)
 		return;
-	int pairIdx = i;
+	int pairIdx = idx;
 	*/
 
-	int bodyIndexA = concavePairs[i].x;
-	int bodyIndexB = concavePairs[i].y;
+	int bodyIndexA = concavePairs[idx].x;
+	int bodyIndexB = concavePairs[idx].y;
 
 	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
 	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
@@ -546,12 +546,12 @@ __kernel void b3FindConcaveSeparatingAxisKernel(__global b3Int4* concavePairs,
 		return;
 	}
 
-	hasSeparatingNormals[i] = 0;
+	hasSeparatingNormals[idx] = 0;
 
 	//	int numFacesA = convexShapes[shapeIndexA].m_numFaces;
 	int numActualConcaveConvexTests = 0;
 
-	int f = concavePairs[i].z;
+	int f = concavePairs[idx].z;
 
 	bool overlap = false;
 
@@ -753,7 +753,7 @@ __kernel void b3FindConcaveSeparatingAxisKernel(__global b3Int4* concavePairs,
 
 		if (hasSeparatingAxis)
 		{
-			hasSeparatingNormals[i] = 1;
+			hasSeparatingNormals[idx] = 1;
 			sepAxis.w = dmin;
 			concaveSeparatingNormalsOut[pairIdx] = sepAxis;
 
diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
index 4ea5e771..358b55ec 100644
--- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
+++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
@@ -67,13 +67,13 @@ class btCompoundCollisionAlgorithm : public btActivatingCollisionAlgorithm
 
 	btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
 
-	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	virtual void getAllContactManifolds(btManifoldArray&p_manifoldArray)
 	{
 		int i;
 		for (i = 0; i < m_childCollisionAlgorithms.size(); i++)
 		{
 			if (m_childCollisionAlgorithms[i])
-				m_childCollisionAlgorithms[i]->getAllContactManifolds(manifoldArray);
+				m_childCollisionAlgorithms[i]->getAllContactManifolds(p_manifoldArray);
 		}
 	}
 
diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleShape.h b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleShape.h
index 190cbdae..813961c2 100644
--- a/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleShape.h
+++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btTriangleShape.h
@@ -141,10 +141,10 @@ btTriangleShape : public btPolyhedralConvexShape
 				btVector3 edge = pb - pa;
 				btVector3 edgeNormal = edge.cross(normal);
 				edgeNormal.normalize();
-				btScalar dist = pt.dot(edgeNormal);
+				btScalar tmp_dist = pt.dot(edgeNormal);
 				btScalar edgeConst = pa.dot(edgeNormal);
-				dist -= edgeConst;
-				if (dist < -tolerance)
+				tmp_dist -= edgeConst;
+				if (tmp_dist < -tolerance)
 					return false;
 			}