From 1222ad6c7c1328609909f0a5a37b211371708ba4 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 26 Jul 2020 23:30:39 +0200 Subject: [PATCH] Update mesh data resource to the latest to get the improvements, and the engine. --- HEADS | 2 +- .../Female/character_models/huf_calf_left.gltf.import | 1 + .../Human/Female/character_models/huf_finger.gltf.import | 1 + .../Human/Female/character_models/huf_fingers.gltf.import | 1 + .../Female/character_models/huf_foot_left.gltf.import | 1 + .../Human/Female/character_models/huf_forearm.gltf.import | 1 + .../Human/Female/character_models/huf_hand.gltf.import | 1 + .../Human/Female/character_models/huf_handl.gltf.import | 1 + .../Human/Female/character_models/huf_head.gltf.import | 1 + .../Human/Female/character_models/huf_neck.gltf.import | 1 + .../Human/Female/character_models/huf_pelvis.gltf.import | 1 + .../Human/Female/character_models/huf_spine.gltf.import | 1 + .../Human/Female/character_models/huf_spine1.gltf.import | 1 + .../Human/Female/character_models/huf_spine2.gltf.import | 1 + .../Female/character_models/huf_thigh_left.gltf.import | 1 + .../Female/character_models/huf_thigh_right.gltf.import | 1 + .../Human/Female/character_models/huf_upperarm.gltf.import | 1 + game/project.godot | 7 +++++++ game/scenes/World.tscn | 4 ---- 19 files changed, 24 insertions(+), 5 deletions(-) diff --git a/HEADS b/HEADS index ac8684ef..877c7aa9 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "b3d46d480944740ec9678535dbe8abbec15f977a", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "bc2ee7171a29d02a4687eaddd91374e127cf2b88"}, "entity_spell_system": {"master": "e0d00e3eb84c1bd3ba4b1170dc1d5d876847dc08"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "e9dc7d18dd65b699781c383305fb45efbfb9d53c"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "85417ebee9198be3cd7cc643e0e0e934db64a620"}, "procedural_animations": {"master": "9226d21781ea05828570e592874aa319df0dc53d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "544654f49b13af2d25ac14152c8a5014474e6333"}, "mesh_utils": {"master": "4f69ec67b861ce4475cfd17946dfaa586c888d94"}, "broken_seals_module": {"master": "8c4b32d3932ccb043b8f6c92c1277547750fe391"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}} \ No newline at end of file +{"engine": {"3.2": "a2edf04fd2af603f3e99a73842d6445c98ea7ef9", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "bc2ee7171a29d02a4687eaddd91374e127cf2b88"}, "entity_spell_system": {"master": "e0d00e3eb84c1bd3ba4b1170dc1d5d876847dc08"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "e9dc7d18dd65b699781c383305fb45efbfb9d53c"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "66db595720ff86f37e000cb82a229a4893d65e25"}, "procedural_animations": {"master": "9226d21781ea05828570e592874aa319df0dc53d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "544654f49b13af2d25ac14152c8a5014474e6333"}, "mesh_utils": {"master": "4f69ec67b861ce4475cfd17946dfaa586c888d94"}, "broken_seals_module": {"master": "8c4b32d3932ccb043b8f6c92c1277547750fe391"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}} \ 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 a971f473..4f967ee3 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_calf_left.gltf-8e616bf74161c9cc3335bb03a6585c30. [params] +import_type=0 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 3d2b333e..ee20ea63 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_finger.gltf-fc6a4109f05e60059f0a11b7ba33b0ea.res [params] +import_type=0 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 99af680c..d03df517 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_fingers.gltf-db10298fea679155f38e09be0e9528ba.re [params] +import_type=0 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 b594a536..65c29410 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_foot_left.gltf-f05ae177d93fd866b85bdc979f084a3e. [params] +import_type=0 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 bc6411c0..97ca4998 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_forearm.gltf-8b78258ea9daca7cc382c76da07171af.re [params] +import_type=0 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 74de1665..90bdef47 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_hand.gltf-fcf6ee970e736831a55e77cbf1e6bfcd.res" [params] +import_type=0 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 7983e438..3205a3a6 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_handl.gltf-9e3cf6d88e445ef9c1ccd02373d98266.res" [params] +import_type=0 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 10bd49a7..5bb9ce44 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_head.gltf-f0b5ec17eb5bf5da6946f16df53024b2.res" [params] +import_type=0 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 33c4a811..f2f95cc9 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_neck.gltf-d56952b61ff8a42dece5b949ad0f9a7f.res" [params] +import_type=0 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 477821e8..7841a4ef 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_pelvis.gltf-baa4b0d9142b08da9d67512c62b46f55.res [params] +import_type=0 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 8754137b..66161949 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_spine.gltf-1872146be20593ed8d52842436b52a43.res" [params] +import_type=0 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 23384b64..ca79a98e 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_spine1.gltf-84f91ea882551fffc99bde3501e66a5e.res [params] +import_type=0 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 18ffee50..74e80e26 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_spine2.gltf-c26b5ef93a0effb389f435f55f147f23.res [params] +import_type=0 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 ba307d2d..d5807ab9 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_thigh_left.gltf-f967ea8aff882be703adaf054058d4f8 [params] +import_type=0 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 f8a4f83b..035d7b6c 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_thigh_right.gltf-9b46efec2793396d125292492f104d4 [params] +import_type=0 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 40e4a8aa..072b5bb9 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 @@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_upperarm.gltf-49cf57be440edffb44c0bea754dd6de2.r [params] +import_type=0 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/project.godot b/game/project.godot index 76aeaed2..c4dcafb6 100644 --- a/game/project.godot +++ b/game/project.godot @@ -237,6 +237,13 @@ texture={ "stream": false, "svg/scale": 1.0 } +gltf_mdr={ +"collider_type": 0, +"import_type": 0, +"offset": Vector3( 0, 0, 0 ), +"rotation": Vector3( 0, 0, 0 ), +"scale": Vector3( 0.011, 0.011, 0.011 ) +} [input] diff --git a/game/scenes/World.tscn b/game/scenes/World.tscn index 11522067..c884bceb 100644 --- a/game/scenes/World.tscn +++ b/game/scenes/World.tscn @@ -71,10 +71,6 @@ chunk_spawn_range = 6 build_flags = 511 lod_update_interval = 2.0 script = ExtResource( 8 ) -meshes = [ ] -editor_generate = false -show_loading_screen = true -generate_on_ready = false test_prop = ExtResource( 4 ) [node name="WorldEnvironment" type="WorldEnvironment" parent="."]