Merge pull request #10 from csprance/zombies-ate-my-neighbors

merge 3.1.1 to Main for release

addons/gecs/plugin.cfg

@@ -2,5 +2,5 @@
 name="GECS"
 description="GECS - Godot Entity Component System"
 author="Quantum Tangent Games"
-version="3.1.1"
+version="3.1.2"
 script="plugin.gd"

addons/gecs/query_builder.gd

@@ -277,9 +277,15 @@ func matches(entities: Array) -> Array:
 
 func combine(other: QueryBuilder) -> QueryBuilder:
 	_all_components += other._all_components
+	_all_components_queries += other._all_components_queries
 	_any_components += other._any_components
+	_any_components_queries += other._any_components_queries
 	_exclude_components += other._exclude_components
+	# If you have exclude component queries, include them as well
+	# _exclude_components_queries += other._exclude_components_queries
+	_relationships += other._relationships
+	_exclude_relationships += other._exclude_relationships
 	return self
 
 func as_array() -> Array:
-	return [_all_components, _any_components, _exclude_components]
+	return [_all_components, _any_components, _exclude_components, _relationships, _exclude_relationships]

addons/gecs/tests/test_query_builder.gd

@@ -563,3 +563,12 @@ func test_query_with_component_queries():
 		{C_TestC: {"non_existent": {"_eq": 10}}}
 	]).execute()
 	assert_array(result).has_size(0)  # Should match no entities
+
+	# Test empty world query with component query property
+	result = QueryBuilder.new(world).with_all([
+		{C_TestC: {"non_existent": {"_eq": 10}}},
+		C_TestD, C_TestE, C_TestA
+	]).execute()
+	assert_array(result).has_size(0)  # Should match no entities
+
+

game/assets/characters/models/characterLargeFemale.fbx.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://c0nsen6dpnk77"
+path="res://.godot/imported/characterLargeFemale.fbx-0fd573d46ca6e20ba88cc58ac7e1d079.scn"
+
+[deps]
+
+source_file="res://game/assets/characters/models/characterLargeFemale.fbx"
+dest_files=["res://.godot/imported/characterLargeFemale.fbx-0fd573d46ca6e20ba88cc58ac7e1d079.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+fbx/importer=1
+fbx/allow_geometry_helper_nodes=false
+fbx/embedded_image_handling=1