diff --git a/HEADS b/HEADS index 691fae8e..f361a60b 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "9636deac553969ffd83cb6ba9da54a394daa0718"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "378ebcff23e5ab0a04c0e92119d26391de4be139"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "dbf3c59a9c52f155f0d98b567d571708e8b3f253"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "780ec90655423ce25ab387095db05b0a6341e648"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "0eee4dba90e486ee7abd8039220d86f742a2fb6a"}, "mesh_utils": {"master": "6725a4906c0a039eaff4c46c8dea00f6b1b99045"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "0d269756789dac6f20c55569fa656ac6cc809a29"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "9636deac553969ffd83cb6ba9da54a394daa0718"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "378ebcff23e5ab0a04c0e92119d26391de4be139"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "dbf3c59a9c52f155f0d98b567d571708e8b3f253"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "02c6802286c3b51c153d8077669cd3fe5fa64ede"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "0eee4dba90e486ee7abd8039220d86f742a2fb6a"}, "mesh_utils": {"master": "29c5cc9a75af4506dfd44ae4c919a0771240dfb0"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "0d269756789dac6f20c55569fa656ac6cc809a29"}} \ No newline at end of file diff --git a/game/modules/species/Human/Female/character_models/huf_calf_left.gltf.import b/game/modules/species/Human/Female/character_models/huf_calf_left.gltf.import index 4f967ee3..136b6926 100644 --- a/game/modules/species/Human/Female/character_models/huf_calf_left.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_calf_left.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_calf_left.gltf-8e616bf74161c9cc3335bb03a6585c30. [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_finger.gltf.import b/game/modules/species/Human/Female/character_models/huf_finger.gltf.import index ee20ea63..5fe74206 100644 --- a/game/modules/species/Human/Female/character_models/huf_finger.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_finger.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_finger.gltf-fc6a4109f05e60059f0a11b7ba33b0ea.res [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_fingers.gltf.import b/game/modules/species/Human/Female/character_models/huf_fingers.gltf.import index d03df517..530d6eb4 100644 --- a/game/modules/species/Human/Female/character_models/huf_fingers.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_fingers.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_fingers.gltf-db10298fea679155f38e09be0e9528ba.re [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_foot_left.gltf.import b/game/modules/species/Human/Female/character_models/huf_foot_left.gltf.import index 65c29410..cc660331 100644 --- a/game/modules/species/Human/Female/character_models/huf_foot_left.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_foot_left.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_foot_left.gltf-f05ae177d93fd866b85bdc979f084a3e. [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_forearm.gltf.import b/game/modules/species/Human/Female/character_models/huf_forearm.gltf.import index 97ca4998..08fc5b29 100644 --- a/game/modules/species/Human/Female/character_models/huf_forearm.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_forearm.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_forearm.gltf-8b78258ea9daca7cc382c76da07171af.re [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_hand.gltf.import b/game/modules/species/Human/Female/character_models/huf_hand.gltf.import index 90bdef47..e8b7384f 100644 --- a/game/modules/species/Human/Female/character_models/huf_hand.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_hand.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_hand.gltf-fcf6ee970e736831a55e77cbf1e6bfcd.res" [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_handl.gltf.import b/game/modules/species/Human/Female/character_models/huf_handl.gltf.import index 3205a3a6..a04643f3 100644 --- a/game/modules/species/Human/Female/character_models/huf_handl.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_handl.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_handl.gltf-9e3cf6d88e445ef9c1ccd02373d98266.res" [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_head.gltf.import b/game/modules/species/Human/Female/character_models/huf_head.gltf.import index 5bb9ce44..29c982a2 100644 --- a/game/modules/species/Human/Female/character_models/huf_head.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_head.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_head.gltf-f0b5ec17eb5bf5da6946f16df53024b2.res" [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_neck.gltf.import b/game/modules/species/Human/Female/character_models/huf_neck.gltf.import index f2f95cc9..dbefd377 100644 --- a/game/modules/species/Human/Female/character_models/huf_neck.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_neck.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_neck.gltf-d56952b61ff8a42dece5b949ad0f9a7f.res" [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_pelvis.gltf.import b/game/modules/species/Human/Female/character_models/huf_pelvis.gltf.import index 7841a4ef..391d2f16 100644 --- a/game/modules/species/Human/Female/character_models/huf_pelvis.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_pelvis.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_pelvis.gltf-baa4b0d9142b08da9d67512c62b46f55.res [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_spine.gltf.import b/game/modules/species/Human/Female/character_models/huf_spine.gltf.import index 66161949..ff1024d4 100644 --- a/game/modules/species/Human/Female/character_models/huf_spine.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_spine.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_spine.gltf-1872146be20593ed8d52842436b52a43.res" [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_spine1.gltf.import b/game/modules/species/Human/Female/character_models/huf_spine1.gltf.import index ca79a98e..b20fa273 100644 --- a/game/modules/species/Human/Female/character_models/huf_spine1.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_spine1.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_spine1.gltf-84f91ea882551fffc99bde3501e66a5e.res [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_spine2.gltf.import b/game/modules/species/Human/Female/character_models/huf_spine2.gltf.import index 74e80e26..ae674e15 100644 --- a/game/modules/species/Human/Female/character_models/huf_spine2.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_spine2.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_spine2.gltf-c26b5ef93a0effb389f435f55f147f23.res [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_thigh_left.gltf.import b/game/modules/species/Human/Female/character_models/huf_thigh_left.gltf.import index d5807ab9..0981a717 100644 --- a/game/modules/species/Human/Female/character_models/huf_thigh_left.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_thigh_left.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_thigh_left.gltf-f967ea8aff882be703adaf054058d4f8 [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_thigh_right.gltf.import b/game/modules/species/Human/Female/character_models/huf_thigh_right.gltf.import index 035d7b6c..2c8c218b 100644 --- a/game/modules/species/Human/Female/character_models/huf_thigh_right.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_thigh_right.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_thigh_right.gltf-9b46efec2793396d125292492f104d4 [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/species/Human/Female/character_models/huf_upperarm.gltf.import b/game/modules/species/Human/Female/character_models/huf_upperarm.gltf.import index 072b5bb9..e7d6516d 100644 --- a/game/modules/species/Human/Female/character_models/huf_upperarm.gltf.import +++ b/game/modules/species/Human/Female/character_models/huf_upperarm.gltf.import @@ -12,6 +12,7 @@ dest_files=[ "res://.import/huf_upperarm.gltf-49cf57be440edffb44c0bea754dd6de2.r [params] import_type=0 +optimization_type=2 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/player/CharacterSkeletonMeshJob.gd b/game/player/CharacterSkeletonMeshJob.gd index 89ce6b1e..758607a9 100644 --- a/game/player/CharacterSkeletonMeshJob.gd +++ b/game/player/CharacterSkeletonMeshJob.gd @@ -89,7 +89,7 @@ func _execute(): mm.add_mesh_data_resource_bone(mesh, bones, bonew, transform, rect) var arr : Array = mm.build_mesh() - + var mesh : ArrayMesh = ArrayMesh.new() mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, arr) mesh.surface_set_material(0, materials[0])