Merge pull request #177 from Calinou/update-to-4.2

Update mesh format for Godot 4.2
godotengine · Nov 28, 2023 · 99f49b5 · 99f49b5
2 parents ceb92d0 + 79df129
commit 99f49b5
Show file tree

Hide file tree

Showing 38 changed files with 425 additions and 391 deletions.
diff --git a/door/model/door.dae.import b/door/model/door.dae.import
@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -40,4 +41,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/effects_shared/BlastMesh.glb.import b/effects_shared/BlastMesh.glb.import
@@ -22,11 +22,13 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
 animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/effects_shared/BlastMesh_Sphere.mesh b/effects_shared/BlastMesh_Sphere.mesh
diff --git a/enemies/red_robot/laser/BarrelSmoke.glb.import b/enemies/red_robot/laser/BarrelSmoke.glb.import
@@ -22,11 +22,13 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
 animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/enemies/red_robot/laser/BarrelSmoke_Plane.mesh b/enemies/red_robot/laser/BarrelSmoke_Plane.mesh
diff --git a/enemies/red_robot/laser/circle.mesh b/enemies/red_robot/laser/circle.mesh
diff --git a/enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import b/enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import
@@ -22,11 +22,13 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
 animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/enemies/red_robot/laser/impact_effect/LightRaysMesh_Plane.mesh b/enemies/red_robot/laser/impact_effect/LightRaysMesh_Plane.mesh
diff --git a/enemies/red_robot/laser/raymesh.mesh b/enemies/red_robot/laser/raymesh.mesh
diff --git a/enemies/red_robot/model/red_robot.glb.import b/enemies/red_robot/model/red_robot.glb.import
@@ -22,6 +22,7 @@ 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
@@ -40,4 +41,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/enemies/red_robot/parts/part_head.glb.import b/enemies/red_robot/parts/part_head.glb.import
@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -36,4 +37,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/enemies/red_robot/parts/part_shield.glb.import b/enemies/red_robot/parts/part_shield.glb.import
@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -36,4 +37,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/enemies/red_robot/parts/ray.glb.import b/enemies/red_robot/parts/ray.glb.import
@@ -22,11 +22,13 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
 animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import b/enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import
@@ -22,11 +22,13 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
 animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/enemies/red_robot/parts/sparks_effect/SparkParticle_Sphere.mesh b/enemies/red_robot/parts/sparks_effect/SparkParticle_Sphere.mesh
diff --git a/enemies/red_robot/red_robot.tscn b/enemies/red_robot/red_robot.tscn
@@ -27,19 +27,19 @@
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_h6xi0"]
 properties/0/path = NodePath(".:global_transform")
 properties/0/spawn = true
-properties/0/sync = true
+properties/0/replication_mode = 1
 properties/1/path = NodePath(".:health")
 properties/1/spawn = true
-properties/1/sync = false
+properties/1/replication_mode = 0
 properties/2/path = NodePath(".:state")
 properties/2/spawn = true
-properties/2/sync = true
+properties/2/replication_mode = 1
 properties/3/path = NodePath(".:target_position")
 properties/3/spawn = true
-properties/3/sync = true
+properties/3/replication_mode = 1
 properties/4/path = NodePath(".:dead")
 properties/4/spawn = true
-properties/4/sync = false
+properties/4/replication_mode = 0
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_p5m1n"]
 resource_local_to_scene = true
@@ -212,7 +212,7 @@ nodes/hit3/position = Vector2(980, 240)
 nodes/output/position = Vector2(1180, 200)
 nodes/state/node = SubResource("51")
 nodes/state/position = Vector2(60, 100)
-node_connections = [&"output", 0, &"hit3", &"aiming", 0, &"state", &"aiming", 1, &"aim", &"hit1", 0, &"aiming", &"hit1", 1, &"Animation 5", &"hit2", 0, &"hit1", &"hit2", 1, &"Animation 6", &"hit3", 0, &"hit2", &"hit3", 1, &"Animation 7", &"state", 0, &"Animation", &"state", 1, &"Animation 3", &"state", 2, &"Animation 2", &"state", 3, &"Animation 4"]
+node_connections = [&"aiming", 0, &"state", &"aiming", 1, &"aim", &"hit1", 0, &"aiming", &"hit1", 1, &"Animation 5", &"hit2", 0, &"hit1", &"hit2", 1, &"Animation 6", &"hit3", 0, &"hit2", &"hit3", 1, &"Animation 7", &"output", 0, &"hit3", &"state", 0, &"Animation", &"state", 1, &"Animation 3", &"state", 2, &"Animation 2", &"state", 3, &"Animation 4"]
 
 [sub_resource type="SphereShape3D" id="53"]
 radius = 1.11815
@@ -426,19 +426,19 @@ _data = {
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_hqtbc"]
 properties/0/path = NodePath(".:fade_value")
 properties/0/spawn = true
-properties/0/sync = true
+properties/0/replication_mode = 1
 properties/1/path = NodePath(".:position")
 properties/1/spawn = true
-properties/1/sync = true
+properties/1/replication_mode = 1
 properties/2/path = NodePath(".:rotation")
 properties/2/spawn = true
-properties/2/sync = true
+properties/2/replication_mode = 1
 properties/3/path = NodePath(".:linear_velocity")
 properties/3/spawn = true
-properties/3/sync = true
+properties/3/replication_mode = 1
 properties/4/path = NodePath(".:angular_velocity")
 properties/4/spawn = true
-properties/4/sync = true
+properties/4/replication_mode = 1
 
 [sub_resource type="Curve" id="57"]
 _data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.260504, 1), 0.0, 0.0, 0, 0]

diff --git a/level/forklift/flying_forklift.glb.import b/level/forklift/flying_forklift.glb.import
@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=false
 animation/fps=15
@@ -40,4 +41,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/level/geometry/models/core.glb.import b/level/geometry/models/core.glb.import
@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=2
 meshes/lightmap_texel_size=1.0
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=false
 animation/fps=15
@@ -152,4 +153,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/level/geometry/models/lights.glb.import b/level/geometry/models/lights.glb.import
@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=false
 animation/fps=15
@@ -36,4 +37,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/level/geometry/models/props.glb.import b/level/geometry/models/props.glb.import
@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=2
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=false
 animation/fps=15
@@ -116,4 +117,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1
diff --git a/level/geometry/models/structure.glb.import b/level/geometry/models/structure.glb.import
@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=2
 meshes/lightmap_texel_size=0.8
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=false
 animation/fps=15
@@ -160,4 +161,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1