diff --git a/Assets/Bear.glb b/Assets/Bear.glb new file mode 100644 index 0000000..966579e Binary files /dev/null and b/Assets/Bear.glb differ diff --git a/Assets/Bear.glb.import b/Assets/Bear.glb.import new file mode 100644 index 0000000..4da9170 --- /dev/null +++ b/Assets/Bear.glb.import @@ -0,0 +1,45 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cofv5dbavesis" +path="res://.godot/imported/Bear.glb-d982be4b426919de19c028d884069d30.scn" + +[deps] + +source_file="res://Assets/Bear.glb" +dest_files=["res://.godot/imported/Bear.glb-d982be4b426919de19c028d884069d30.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/Assets/IG_square.png b/Assets/IG_square.png new file mode 100644 index 0000000..9c43327 Binary files /dev/null and b/Assets/IG_square.png differ diff --git a/Assets/IG_square.png.import b/Assets/IG_square.png.import new file mode 100644 index 0000000..6446c20 --- /dev/null +++ b/Assets/IG_square.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ch1wqha62vhtb" +path="res://.godot/imported/IG_square.png-c38dd1a0a4601b6ff4ffec2910ed2ce0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/IG_square.png" +dest_files=["res://.godot/imported/IG_square.png-c38dd1a0a4601b6ff4ffec2910ed2ce0.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/kleeps_v2.png b/Assets/kleeps_v2.png new file mode 100644 index 0000000..521c2dd Binary files /dev/null and b/Assets/kleeps_v2.png differ diff --git a/Assets/kleeps_v2.png.import b/Assets/kleeps_v2.png.import new file mode 100644 index 0000000..68274bc --- /dev/null +++ b/Assets/kleeps_v2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dct1d88g015el" +path="res://.godot/imported/kleeps_v2.png-55aa0dd25620611263a8b3000c5e2a49.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/kleeps_v2.png" +dest_files=["res://.godot/imported/kleeps_v2.png-55aa0dd25620611263a8b3000c5e2a49.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/loading_screen.png b/Assets/loading_screen.png index df49366..625df5e 100644 Binary files a/Assets/loading_screen.png and b/Assets/loading_screen.png differ diff --git a/Assets/spear.glb b/Assets/spear.glb index d0627ef..e8e8666 100644 Binary files a/Assets/spear.glb and b/Assets/spear.glb differ diff --git a/Intro_MENU.tscn b/Intro_MENU.tscn index 7d108f7..54263db 100644 --- a/Intro_MENU.tscn +++ b/Intro_MENU.tscn @@ -51,7 +51,7 @@ dof_blur_near_transition = 5.0 transform = Transform3D(-0.56715536, 0, -0.8236109, 0, 1, 0, 0.8236109, 0, -0.56715536, 5.2114463, -0.08998108, 1.8927763) script = ExtResource("2_5jr0i") -[node name="Skeleton3D" parent="Matador/Armature" parent_id_path=PackedInt32Array(166852612, 1269629432) index="0" unique_id=978366810] +[node name="Skeleton3D" parent="Matador/Armature" parent_id_path=PackedInt32Array(166852612, 1447304122) index="0" unique_id=357848305] bones/0/position = Vector3(0.056660548, 0.6424767, -0.0167365) bones/0/rotation = Quaternion(0.013179442, -0.2660563, 0.073319815, 0.9610747) bones/1/rotation = Quaternion(0.06234612, 0.049236443, 0.08183311, 0.99347484) @@ -81,10 +81,10 @@ bones/23/rotation = Quaternion(0.9993525, -0.0021175682, 0.03502641, -0.00795782 bones/24/rotation = Quaternion(0.08874816, -0.018719967, -0.04671622, 0.99478185) bones/25/rotation = Quaternion(0.09634846, -0.0268489, -0.04050248, 0.9941608) -[node name="matador" parent="Matador/Armature/Skeleton3D" index="0" unique_id=256196413] +[node name="matador" parent="Matador/Armature/Skeleton3D" index="0" unique_id=593562242] transform = Transform3D(0.8642424, 0, 0.50307554, 0, 1, 0, -0.50307554, 0, 0.8642424, 0, 0, 0) -[node name="Muleta" parent="Matador/Armature/Skeleton3D" index="1" unique_id=988244930] +[node name="Muleta" parent="Matador/Armature/Skeleton3D" index="1" unique_id=978680467] cast_shadow = 0 [node name="Camera3D" type="Camera3D" parent="." unique_id=1531255459] diff --git a/MainMenu.tscn b/MainMenu.tscn index 4c20a86..8a1d915 100644 --- a/MainMenu.tscn +++ b/MainMenu.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://46y10alai56q" path="res://main_menu.gd" id="1_menu"] [ext_resource type="VideoStream" uid="uid://csxxlnq74fej4" path="res://Assets/intro_bg.ogv" id="2_video"] -[ext_resource type="Shader" path="res://menu_blur.gdshader" id="3_blur"] +[ext_resource type="Shader" uid="uid://bmdtg6qlh7wri" path="res://menu_blur.gdshader" id="3_blur"] [sub_resource type="ShaderMaterial" id="mat_blur"] shader = ExtResource("3_blur") @@ -74,7 +74,6 @@ grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 ratio = 1.7778 -stretch_mode = 2 [node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="VideoAspect" unique_id=374854265] layout_mode = 2 @@ -281,7 +280,7 @@ bbcode_enabled = true text = "[center][font_size=32][color=#d9a833]Bullosseum[/color][/font_size] [b][color=#d9a833]Siim Raud[/color][/b] [url=https://instagram.com/siimpressionist]@siimpressionist[/url] -[font_size=20]Artist[/font_size] +[font_size=20]Artist / Animator[/font_size] [b][color=#d9a833]Richard Aasa[/color][/b] [url=https://instagram.com/aasarichard]@aasarichard[/url] [font_size=20]Programmer[/font_size] 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/export_presets.cfg b/export_presets.cfg index b29dca2..aa00c59 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -1,18 +1,30 @@ +[runnable_presets] + +Web="Web" +"Windows Desktop"="Windows Desktop" + [preset.0] name="Web" platform="Web" -runnable=true dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" export_path="build/web/index.html" +patches=PackedStringArray() +patch_delta_encoding=false +patch_delta_compression_level_zstd=19 +patch_delta_min_reduction=0.1 +patch_delta_include_filters="*" +patch_delta_exclude_filters="" encryption_include_filters="" encryption_exclude_filters="" +seed=0 encrypt_pck=false encrypt_directory=false +script_export_mode=2 [preset.0.options] @@ -29,6 +41,7 @@ html/canvas_resize_policy=2 html/focus_canvas_on_start=true html/experimental_virtual_keyboard=false progressive_web_app/enabled=false +progressive_web_app/ensure_cross_origin_isolation_headers=true progressive_web_app/offline_page="" progressive_web_app/display=1 progressive_web_app/orientation=0 @@ -36,3 +49,76 @@ progressive_web_app/icon_144x144="" progressive_web_app/icon_180x180="" progressive_web_app/icon_512x512="" progressive_web_app/background_color=Color(0, 0, 0, 1) +threads/emscripten_pool_size=8 +threads/godot_pool_size=4 + +[preset.1] + +name="Windows Desktop" +platform="Windows Desktop" +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../Export/Bullosseum_020.exe" +patches=PackedStringArray() +patch_delta_encoding=false +patch_delta_compression_level_zstd=19 +patch_delta_min_reduction=0.1 +patch_delta_include_filters="*" +patch_delta_exclude_filters="" +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +shader_baker/enabled=false +binary_format/architecture="x86_64" +codesign/enable=false +codesign/timestamp=true +codesign/timestamp_server_url="" +codesign/digest_algorithm=1 +codesign/description="" +codesign/custom_options=PackedStringArray() +application/modify_resources=true +application/icon="" +application/console_wrapper_icon="" +application/icon_interpolation=4 +application/file_version="" +application/product_version="" +application/company_name="" +application/product_name="" +application/file_description="" +application/copyright="" +application/trademarks="" +application/export_angle=0 +application/export_d3d12=0 +application/d3d12_agility_sdk_multiarch=true +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}' +$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}' +$trigger = New-ScheduledTaskTrigger -Once -At 00:00 +$settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries +$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings +Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true +Start-ScheduledTask -TaskName godot_remote_debug +while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 } +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue" +ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue +Remove-Item -Recurse -Force '{temp_dir}'" diff --git a/player.gd b/player.gd index e13bf99..c535671 100644 --- a/player.gd +++ b/player.gd @@ -1090,6 +1090,7 @@ func take_sword_hit(cause: String = "", hit_pos: Vector3 = Vector3.ZERO) -> void _huff_player.play() if _hp <= 0: if _bull_anim.current_animation != _ANIM_DEATH: + _bull_anim.speed_scale = 0.8 _bull_anim.play(_ANIM_DEATH) _dead = true died.emit(cause) diff --git a/project.godot b/project.godot index 8a74e33..bfab88e 100644 --- a/project.godot +++ b/project.godot @@ -16,7 +16,8 @@ run/main_scene="res://MainMenu.tscn" config/features=PackedStringArray("4.7", "Forward Plus") boot_splash/bg_color=Color(0, 0, 0, 1) boot_splash/image="res://Assets/loading_screen.png" -config/icon="res://icon.svg" +config/icon="uid://dct1d88g015el" +boot_splash/minimum_display_time=4000 config/run/main_scene="res://MainMenu.tscn" [autoload] @@ -27,6 +28,10 @@ Controls="*res://controls_manager.gd" DebugDraw="*res://debug_draw.gd" Settings="*res://settings.gd" +[display] + +window/size/mode=3 + [editor_plugins] enabled=PackedStringArray("res://addons/rider-plugin/plugin.cfg") diff --git a/scene.tscn b/scene.tscn index af6819a..2f49b62 100644 --- a/scene.tscn +++ b/scene.tscn @@ -48,11 +48,23 @@ near = 2.636 far = 0.01 [node name="Skeleton3D" parent="Player/bull/Armature" parent_id_path=PackedInt32Array(165510044, 1386495166, 547304299) index="0" unique_id=2096877109] +bones/0/position = Vector3(0, 0, 0.0074015963) +bones/0/rotation = Quaternion(-0.36922705, 0.6030517, -0.6030517, -0.36922705) +bones/0/scale = Vector3(1, 1, 1) +bones/1/position = Vector3(0.003526625, -0.0043296535, 0.004082799) +bones/1/rotation = Quaternion(-0.00038647576, 0.06909673, 0.9868542, -0.14609681) bones/1/scale = Vector3(1.0000021, 1.0000001, 1.0000006) bones/2/position = Vector3(-5.853537e-11, 0.002669535, -1.489375e-10) +bones/2/rotation = Quaternion(-0.06929122, 3.2415448e-07, -0.11267061, 0.99121344) bones/2/scale = Vector3(1, 1.0000001, 0.9999999) +bones/4/position = Vector3(0.004535823, -0.0021376952, -0.0042386237) +bones/4/rotation = Quaternion(-0.24948508, 0.19590344, 0.9416978, -0.11217982) +bones/4/scale = Vector3(0.99999994, 0.99999994, 1.0000002) bones/5/position = Vector3(1.264555e-10, 0.0028599252, -2.4303243e-10) +bones/5/rotation = Quaternion(-0.58943665, -0.36607245, -0.2256448, 0.683842) bones/6/position = Vector3(-7.092306e-11, 0.003274492, 4.6413304e-10) +bones/6/rotation = Quaternion(0.52910197, 0.15997829, 0.12024502, 0.82462066) +bones/6/scale = Vector3(1, 1.0000001, 1.0000001) bones/8/position = Vector3(2.259811e-19, 0.0010177285, -0.008495503) bones/8/rotation = Quaternion(-0.70710677, 0, 0, 0.70710677) bones/8/scale = Vector3(1, 1, 1) @@ -67,14 +79,23 @@ bones/13/scale = Vector3(1, 1, 1) bones/14/position = Vector3(0, 0.0014960878, 0) bones/14/scale = Vector3(1, 1, 1) bones/15/position = Vector3(0, 0.0010996431, 0) +bones/17/position = Vector3(0, 0.000937381, 0.0075526168) +bones/17/rotation = Quaternion(-5.3385083e-08, 0.70710677, 0.70710677, -5.3385083e-08) +bones/19/position = Vector3(-0.003526625, -0.0043296535, 0.004082799) +bones/19/rotation = Quaternion(0.00038647576, 0.06909673, 0.9868542, 0.14609681) bones/19/scale = Vector3(1.0000021, 1.0000001, 1.0000006) bones/20/position = Vector3(5.853537e-11, 0.002669535, -1.489375e-10) +bones/20/rotation = Quaternion(-0.06929122, -3.2415448e-07, 0.11267061, 0.99121344) bones/20/scale = Vector3(1, 1.0000001, 0.9999999) -bones/22/rotation = Quaternion(0.21561885, 0.36444604, 0.8930564, 0.1521117) +bones/22/position = Vector3(-0.004535823, -0.0021376952, -0.0042386237) +bones/22/rotation = Quaternion(0.24948508, 0.19590344, 0.9416978, 0.11217982) +bones/22/scale = Vector3(0.99999994, 0.99999994, 1.0000002) bones/23/position = Vector3(-1.264555e-10, 0.0028599252, -2.4303243e-10) -bones/23/rotation = Quaternion(-0.72871244, 0.3183856, 0.20940702, 0.568997) +bones/23/rotation = Quaternion(-0.58943665, 0.36607245, 0.2256448, 0.683842) +bones/23/scale = Vector3(1, 1, 1) bones/24/position = Vector3(7.092306e-11, 0.003274492, 4.6413304e-10) -bones/24/rotation = Quaternion(0.7103394, -0.13944182, -0.049754977, 0.6881122) +bones/24/rotation = Quaternion(0.52910197, -0.15997829, -0.12024502, 0.82462066) +bones/24/scale = Vector3(1, 1.0000001, 1.0000001) [node name="Node3D" type="Node3D" parent="." unique_id=1081100876] @@ -92,6 +113,9 @@ visible = false [node name="Wall" parent="Node3D/arena_placeholder_v01" index="1" unique_id=171701243] visible = false +[node name="CollisionShape3D" parent="Node3D/arena_placeholder_v01/Wall/StaticBody3D" parent_id_path=PackedInt32Array(1341659233, 1793167121) index="0" unique_id=404958985] +transform = Transform3D(0.98309773, 0, 0, 0, 0.9558868, 0, 0, 0, 4.061706, 0.13596812, -0.091219574, -5.4371103e-09) + [node name="Arena2" parent="Node3D/arena_placeholder_v01" unique_id=524718167 instance=ExtResource("3_fy5k1")] [node name="arena model2026" parent="Node3D/arena_placeholder_v01" unique_id=179544183 instance=ExtResource("10_5juve")]