diff --git a/Assets/bull_v10.fbx b/Assets/bull.fbx similarity index 53% rename from Assets/bull_v10.fbx rename to Assets/bull.fbx index 59c1a78..e65fcce 100644 Binary files a/Assets/bull_v10.fbx and b/Assets/bull.fbx differ diff --git a/Assets/bull_v10.fbx.import b/Assets/bull.fbx.import similarity index 73% rename from Assets/bull_v10.fbx.import rename to Assets/bull.fbx.import index 28ea916..fe498aa 100644 --- a/Assets/bull_v10.fbx.import +++ b/Assets/bull.fbx.import @@ -3,19 +3,21 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://qy6qrxdfgx2g" -path="res://.godot/imported/bull_v10.fbx-0bb89c99686d56acf88cf41a200f2277.scn" +uid="uid://bun14xmk20pcj" +path="res://.godot/imported/bull.fbx-50f6d03a92c862695bbeaeba563be0db.scn" [deps] -source_file="res://Assets/bull_v10.fbx" -dest_files=["res://.godot/imported/bull_v10.fbx-0bb89c99686d56acf88cf41a200f2277.scn"] +source_file="res://Assets/bull.fbx" +dest_files=["res://.godot/imported/bull.fbx-50f6d03a92c862695bbeaeba563be0db.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 diff --git a/Blender/ANIM_bull.blend b/Blender/ANIM_bull.blend new file mode 100644 index 0000000..fb51265 Binary files /dev/null and b/Blender/ANIM_bull.blend differ diff --git a/Blender/ANIM_bull.blend.import b/Blender/ANIM_bull.blend.import new file mode 100644 index 0000000..d35a5b4 --- /dev/null +++ b/Blender/ANIM_bull.blend.import @@ -0,0 +1,63 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://lhcw3mwsj6be" +path="res://.godot/imported/ANIM_bull.blend-6530e6d9d286884d468f9c657fa77cac.scn" + +[deps] + +source_file="res://Blender/ANIM_bull.blend" +dest_files=["res://.godot/imported/ANIM_bull.blend-6530e6d9d286884d468f9c657fa77cac.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/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 deleted file mode 100644 index 31e7384..0000000 Binary files a/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll and /dev/null differ diff --git a/tests/ragdoll_throw_test.gd b/tests/ragdoll_throw_test.gd index f286dd8..a3eec56 100644 --- a/tests/ragdoll_throw_test.gd +++ b/tests/ragdoll_throw_test.gd @@ -1,4 +1,4 @@ -/extends SceneTree +extends SceneTree ## Ragdoll throw visual test — triggers ragdoll on the matador and captures a ## frame strip so you can inspect the throw arc and settling. ##