diff --git a/Animations/ANIM_publik_mees.glb.import b/Animations/ANIM_publik_mees.glb.import index bfa61ef..6084ca6 100644 --- a/Animations/ANIM_publik_mees.glb.import +++ b/Animations/ANIM_publik_mees.glb.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/ANIM_publik_mees.glb-77ff7b15eaa09f6b7edf4365 nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -4153,5 +4155,6 @@ _subresources={ } } } -gltf/naming_version=2 +gltf/naming_version=0 gltf/embedded_image_handling=1 +gltf/texture_map_mode=1 diff --git a/Animations/mees_plaksutab.glb.import b/Animations/mees_plaksutab.glb.import index c6bbb75..edfd958 100644 --- a/Animations/mees_plaksutab.glb.import +++ b/Animations/mees_plaksutab.glb.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/mees_plaksutab.glb-0ce4e4ee8c8f92069abfac9352 nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -2097,5 +2099,6 @@ _subresources={ } } } -gltf/naming_version=2 +gltf/naming_version=0 gltf/embedded_image_handling=1 +gltf/texture_map_mode=1 diff --git a/Assets/arena_placeholder_v01.glb.import b/Assets/arena_placeholder_v01.glb.import index 7166fbe..45ec15c 100644 --- a/Assets/arena_placeholder_v01.glb.import +++ b/Assets/arena_placeholder_v01.glb.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/arena_placeholder_v01.glb-fc11365d8ec7ae6778e nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -40,3 +42,4 @@ materials/extract_path="" _subresources={} gltf/naming_version=0 gltf/embedded_image_handling=1 +gltf/texture_map_mode=1 diff --git a/Blender/ANIM_matador.blend.import b/Blender/ANIM_matador.blend.import new file mode 100644 index 0000000..dfdd7ac --- /dev/null +++ b/Blender/ANIM_matador.blend.import @@ -0,0 +1,63 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dj212qfoybtsx" +path="res://.godot/imported/ANIM_matador.blend-b1e70d45dbbcdad4cfd79f74415e6628.scn" + +[deps] + +source_file="res://Blender/ANIM_matador.blend" +dest_files=["res://.godot/imported/ANIM_matador.blend-b1e70d45dbbcdad4cfd79f74415e6628.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +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="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/vertex_colors=1 +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/export_geometry_nodes_instances=false +blender/meshes/gpu_instances=false +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true +gltf/naming_version=2 +gltf/texture_map_mode=1 diff --git a/Blender/ANIM_publik_mees.blend.import b/Blender/ANIM_publik_mees.blend.import index 3ba5788..d142b40 100644 --- a/Blender/ANIM_publik_mees.blend.import +++ b/Blender/ANIM_publik_mees.blend.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/ANIM_publik_mees.blend-d47f9b6736ce083865e1f1 nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -44,7 +46,7 @@ blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true blender/nodes/modifiers=1 -blender/meshes/colors=false +blender/meshes/vertex_colors=2 blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false @@ -57,4 +59,5 @@ blender/materials/export_materials=1 blender/animation/limit_playback=true blender/animation/always_sample=true blender/animation/group_tracks=true -gltf/naming_version=2 +gltf/naming_version=0 +gltf/texture_map_mode=1 diff --git a/Blender/bull_v11.blend.import b/Blender/bull_v11.blend.import index e37bdb1..e87241d 100644 --- a/Blender/bull_v11.blend.import +++ b/Blender/bull_v11.blend.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/bull_v11.blend-0dd387f5e964c51fff069fa50a9998 nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -44,7 +46,7 @@ blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true blender/nodes/modifiers=1 -blender/meshes/colors=false +blender/meshes/vertex_colors=2 blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false @@ -58,3 +60,4 @@ blender/animation/limit_playback=true blender/animation/always_sample=true blender/animation/group_tracks=true gltf/naming_version=0 +gltf/texture_map_mode=1 diff --git a/Blender/matador.glb b/Blender/matador.glb index 37f6362..03e98fd 100644 Binary files a/Blender/matador.glb and b/Blender/matador.glb differ diff --git a/Blender/matador.glb.import b/Blender/matador.glb.import new file mode 100644 index 0000000..cfeb271 --- /dev/null +++ b/Blender/matador.glb.import @@ -0,0 +1,45 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://ch5fiscgxfmpc" +path="res://.godot/imported/matador.glb-c9f44a9d63ee0a53a88a55001e7a92f8.scn" + +[deps] + +source_file="res://Blender/matador.glb" +dest_files=["res://.godot/imported/matador.glb-c9f44a9d63ee0a53a88a55001e7a92f8.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +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="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 +gltf/texture_map_mode=1 diff --git a/Blender/matador_v01.blend.import b/Blender/matador_v01.blend.import index 881e5cb..a62287d 100644 --- a/Blender/matador_v01.blend.import +++ b/Blender/matador_v01.blend.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/matador_v01.blend-ca770df72393bcfc88aeadbf3f9 nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -44,7 +46,7 @@ blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true blender/nodes/modifiers=1 -blender/meshes/colors=false +blender/meshes/vertex_colors=2 blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false @@ -58,3 +60,4 @@ blender/animation/limit_playback=true blender/animation/always_sample=true blender/animation/group_tracks=true gltf/naming_version=0 +gltf/texture_map_mode=1 diff --git a/Blender/matador_v02.blend.import b/Blender/matador_v02.blend.import index 16b8e63..b1a2190 100644 --- a/Blender/matador_v02.blend.import +++ b/Blender/matador_v02.blend.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/matador_v02.blend-78c935c19487a89cf2e8e43e696 nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -44,7 +46,7 @@ blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true blender/nodes/modifiers=1 -blender/meshes/colors=false +blender/meshes/vertex_colors=2 blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false @@ -58,3 +60,4 @@ blender/animation/limit_playback=true blender/animation/always_sample=true blender/animation/group_tracks=true gltf/naming_version=0 +gltf/texture_map_mode=1 diff --git a/Blender/matador_v02.fbx.import b/Blender/matador_v02.fbx.import index 4a013ad..6a24977 100644 --- a/Blender/matador_v02.fbx.import +++ b/Blender/matador_v02.fbx.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/matador_v02.fbx-220033ca52e262349a727eddc79dc nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false diff --git a/Blender/matador_v03.blend.import b/Blender/matador_v03.blend.import new file mode 100644 index 0000000..8493715 --- /dev/null +++ b/Blender/matador_v03.blend.import @@ -0,0 +1,63 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cg23h1mns46i7" +path="res://.godot/imported/matador_v03.blend-fcdb9cdf17fbb51f51c8fe59554f9d14.scn" + +[deps] + +source_file="res://Blender/matador_v03.blend" +dest_files=["res://.godot/imported/matador_v03.blend-fcdb9cdf17fbb51f51c8fe59554f9d14.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +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="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/vertex_colors=1 +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/export_geometry_nodes_instances=false +blender/meshes/gpu_instances=false +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true +gltf/naming_version=2 +gltf/texture_map_mode=1 diff --git a/Blender/publik_mees_v01.blend.import b/Blender/publik_mees_v01.blend.import index 2834b0f..341aabe 100644 --- a/Blender/publik_mees_v01.blend.import +++ b/Blender/publik_mees_v01.blend.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/publik_mees_v01.blend-bd82e3b38f4d34ceacdfadd nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -44,7 +46,7 @@ blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true blender/nodes/modifiers=1 -blender/meshes/colors=false +blender/meshes/vertex_colors=2 blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false @@ -57,4 +59,5 @@ blender/materials/export_materials=1 blender/animation/limit_playback=true blender/animation/always_sample=true blender/animation/group_tracks=true -gltf/naming_version=2 +gltf/naming_version=0 +gltf/texture_map_mode=1 diff --git a/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll b/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll new file mode 100644 index 0000000..31e7384 Binary files /dev/null and b/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll differ diff --git a/sounds/matador_death.ogg.import b/sounds/matador_death.ogg.import new file mode 100644 index 0000000..e3a8ed1 --- /dev/null +++ b/sounds/matador_death.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://banjjur36o2cs" +path="res://.godot/imported/matador_death.ogg-0bfc862a3b7e67ac7bddb86e242e977f.oggvorbisstr" + +[deps] + +source_file="res://sounds/matador_death.ogg" +dest_files=["res://.godot/imported/matador_death.ogg-0bfc862a3b7e67ac7bddb86e242e977f.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4