From 66a71067cc520ba287fb0562a188ee8e19cbc096 Mon Sep 17 00:00:00 2001 From: Minimata Date: Thu, 5 Feb 2026 17:26:20 +0100 Subject: [PATCH] fixed a few issues and also tuto triggers --- .../Default/xbox_button_a_outline.png.import | 14 ++- .../Vector/xbox_button_a_outline.svg.import | 14 ++- .../Vector/xbox_button_b_outline.svg.import | 14 ++- .../Vector/xbox_rt_outline.svg.import | 14 ++- maps/levels/tuto_movement.tscn | 115 +++++++++++++++++- 5 files changed, 145 insertions(+), 26 deletions(-) diff --git a/assets/ui/input-prompts/Xbox Series/Default/xbox_button_a_outline.png.import b/assets/ui/input-prompts/Xbox Series/Default/xbox_button_a_outline.png.import index 786946f1..71bacd37 100644 --- a/assets/ui/input-prompts/Xbox Series/Default/xbox_button_a_outline.png.import +++ b/assets/ui/input-prompts/Xbox Series/Default/xbox_button_a_outline.png.import @@ -3,19 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://by682i537c1qg" -path="res://.godot/imported/xbox_button_a_outline.png-45ac6b087c5e9a82a5a0b446c63f4da4.ctex" +path.s3tc="res://.godot/imported/xbox_button_a_outline.png-45ac6b087c5e9a82a5a0b446c63f4da4.s3tc.ctex" +path.etc2="res://.godot/imported/xbox_button_a_outline.png-45ac6b087c5e9a82a5a0b446c63f4da4.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/ui/input-prompts/Xbox Series/Default/xbox_button_a_outline.png" -dest_files=["res://.godot/imported/xbox_button_a_outline.png-45ac6b087c5e9a82a5a0b446c63f4da4.ctex"] +dest_files=["res://.godot/imported/xbox_button_a_outline.png-45ac6b087c5e9a82a5a0b446c63f4da4.s3tc.ctex", "res://.godot/imported/xbox_button_a_outline.png-45ac6b087c5e9a82a5a0b446c63f4da4.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +25,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +39,4 @@ 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 +detect_3d/compress_to=0 diff --git a/assets/ui/input-prompts/Xbox Series/Vector/xbox_button_a_outline.svg.import b/assets/ui/input-prompts/Xbox Series/Vector/xbox_button_a_outline.svg.import index a0d8ff9c..575a6e65 100644 --- a/assets/ui/input-prompts/Xbox Series/Vector/xbox_button_a_outline.svg.import +++ b/assets/ui/input-prompts/Xbox Series/Vector/xbox_button_a_outline.svg.import @@ -3,19 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://dl73t0kxkaxp0" -path="res://.godot/imported/xbox_button_a_outline.svg-e0a03a1d1c96455de9e4ad067974d23b.ctex" +path.s3tc="res://.godot/imported/xbox_button_a_outline.svg-e0a03a1d1c96455de9e4ad067974d23b.s3tc.ctex" +path.etc2="res://.godot/imported/xbox_button_a_outline.svg-e0a03a1d1c96455de9e4ad067974d23b.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_a_outline.svg" -dest_files=["res://.godot/imported/xbox_button_a_outline.svg-e0a03a1d1c96455de9e4ad067974d23b.ctex"] +dest_files=["res://.godot/imported/xbox_button_a_outline.svg-e0a03a1d1c96455de9e4ad067974d23b.s3tc.ctex", "res://.godot/imported/xbox_button_a_outline.svg-e0a03a1d1c96455de9e4ad067974d23b.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +25,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,7 +39,7 @@ 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 +detect_3d/compress_to=0 svg/scale=1.0 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/assets/ui/input-prompts/Xbox Series/Vector/xbox_button_b_outline.svg.import b/assets/ui/input-prompts/Xbox Series/Vector/xbox_button_b_outline.svg.import index fdc1d3f9..c3810462 100644 --- a/assets/ui/input-prompts/Xbox Series/Vector/xbox_button_b_outline.svg.import +++ b/assets/ui/input-prompts/Xbox Series/Vector/xbox_button_b_outline.svg.import @@ -3,19 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://cjh5cnvdbq5ku" -path="res://.godot/imported/xbox_button_b_outline.svg-3f51fcd4202da59d6f8184f7aaff1e2b.ctex" +path.s3tc="res://.godot/imported/xbox_button_b_outline.svg-3f51fcd4202da59d6f8184f7aaff1e2b.s3tc.ctex" +path.etc2="res://.godot/imported/xbox_button_b_outline.svg-3f51fcd4202da59d6f8184f7aaff1e2b.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_b_outline.svg" -dest_files=["res://.godot/imported/xbox_button_b_outline.svg-3f51fcd4202da59d6f8184f7aaff1e2b.ctex"] +dest_files=["res://.godot/imported/xbox_button_b_outline.svg-3f51fcd4202da59d6f8184f7aaff1e2b.s3tc.ctex", "res://.godot/imported/xbox_button_b_outline.svg-3f51fcd4202da59d6f8184f7aaff1e2b.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +25,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,7 +39,7 @@ 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 +detect_3d/compress_to=0 svg/scale=1.0 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/assets/ui/input-prompts/Xbox Series/Vector/xbox_rt_outline.svg.import b/assets/ui/input-prompts/Xbox Series/Vector/xbox_rt_outline.svg.import index 43f874b7..00534fa5 100644 --- a/assets/ui/input-prompts/Xbox Series/Vector/xbox_rt_outline.svg.import +++ b/assets/ui/input-prompts/Xbox Series/Vector/xbox_rt_outline.svg.import @@ -3,19 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://bfkj4neu0m0rm" -path="res://.godot/imported/xbox_rt_outline.svg-ccfca5331455b64f1729ac9257bae6c9.ctex" +path.s3tc="res://.godot/imported/xbox_rt_outline.svg-ccfca5331455b64f1729ac9257bae6c9.s3tc.ctex" +path.etc2="res://.godot/imported/xbox_rt_outline.svg-ccfca5331455b64f1729ac9257bae6c9.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_rt_outline.svg" -dest_files=["res://.godot/imported/xbox_rt_outline.svg-ccfca5331455b64f1729ac9257bae6c9.ctex"] +dest_files=["res://.godot/imported/xbox_rt_outline.svg-ccfca5331455b64f1729ac9257bae6c9.s3tc.ctex", "res://.godot/imported/xbox_rt_outline.svg-ccfca5331455b64f1729ac9257bae6c9.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +25,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,7 +39,7 @@ 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 +detect_3d/compress_to=0 svg/scale=1.0 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/maps/levels/tuto_movement.tscn b/maps/levels/tuto_movement.tscn index 190fc817..a8e0ec4c 100644 --- a/maps/levels/tuto_movement.tscn +++ b/maps/levels/tuto_movement.tscn @@ -6,6 +6,31 @@ [ext_resource type="Material" uid="uid://bm5f7jraqm8n0" path="res://assets/materials/greybox/m_greybox_secondary.tres" id="5_r26ni"] [ext_resource type="Material" uid="uid://cqha1a2h1dg86" path="res://assets/materials/greybox/m_greybox_medium.tres" id="5_u8sr4"] [ext_resource type="PackedScene" uid="uid://y77cdg7gg3y7" path="res://maps/levels/_arenas/playtest_1.tscn" id="6_qd7a7"] +[ext_resource type="PackedScene" uid="uid://b8aet6m4m2i83" path="res://scenes/tuto_trigger/TutoTrigger.tscn" id="7_r26ni"] +[ext_resource type="Texture2D" uid="uid://dl73t0kxkaxp0" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_a_outline.svg" id="8_6c6r2"] +[ext_resource type="Texture2D" uid="uid://bfkj4neu0m0rm" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_rt_outline.svg" id="9_v7818"] +[ext_resource type="Texture2D" uid="uid://cjh5cnvdbq5ku" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_b_outline.svg" id="10_hocby"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_6c6r2"] +size = Vector3(6.5, 9, 7.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_v7818"] +size = Vector3(10.5, 12.5, 7.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_hocby"] +size = Vector3(3, 12.5, 7.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_ovxxa"] +size = Vector3(3, 12.5, 6) + +[sub_resource type="BoxShape3D" id="BoxShape3D_5ibpd"] +size = Vector3(3.5, 7, 10.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_6rkcg"] +size = Vector3(5.5, 6.5, 3) + +[sub_resource type="BoxShape3D" id="BoxShape3D_p8dgc"] +size = Vector3(3, 6.5, 5.5) [node name="Main" unique_id=955321579 instance=ExtResource("1_jyq54")] @@ -14,8 +39,6 @@ transform = Transform3D(-0.1772511, 0.44628847, 0.87715954, 0.49540228, -0.72966 [node name="Player" parent="." index="6" unique_id=1309399929] transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, -0.5, 0.4102497, 0.5415039) -HasSword = false -HasParry = false [node name="Greybox" type="CSGCombiner3D" parent="." index="7" unique_id=2082385716] use_collision = true @@ -852,3 +875,91 @@ omni_range = 7.0 [node name="OmniLight3D27" type="OmniLight3D" parent="Lights" index="29" unique_id=1849438050] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -20, 24.5, -51.5) omni_range = 4.5 + +[node name="Tutorials" type="Node3D" parent="." index="10" unique_id=955125222] + +[node name="TutoTrigger" parent="Tutorials" index="0" unique_id=840713937 instance=ExtResource("7_r26ni")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.5, 1, -20) +first_input_texture = ExtResource("8_6c6r2") +tuto_text = "Mantle" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorials/TutoTrigger" index="1" unique_id=518998736] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 3.5, -1.75) +shape = SubResource("BoxShape3D_6c6r2") + +[node name="TutoTrigger2" parent="Tutorials" index="1" unique_id=878603028 instance=ExtResource("7_r26ni")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 2.5, -37.5) +first_input_texture = ExtResource("8_6c6r2") +tuto_text = "Jump" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorials/TutoTrigger2" index="1" unique_id=1454863883] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.75, 3.25, -1.75) +shape = SubResource("BoxShape3D_v7818") + +[node name="TutoTrigger3" parent="Tutorials" index="2" unique_id=1537320837 instance=ExtResource("7_r26ni")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 2.5, -37.5) +first_input_texture = ExtResource("8_6c6r2") +second_input_texture = ExtResource("8_6c6r2") +tuto_text = "Double jump" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorials/TutoTrigger3" index="1" unique_id=216496744] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.25, -1.75) +shape = SubResource("BoxShape3D_hocby") + +[node name="TutoTrigger4" parent="Tutorials" index="3" unique_id=903897281 instance=ExtResource("7_r26ni")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 7.5, -30.5) +first_input_texture = ExtResource("8_6c6r2") +complex_input_text = "against wall" +tuto_text = "Wall jump" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorials/TutoTrigger4" index="1" unique_id=1224334781] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.25, -1) +shape = SubResource("BoxShape3D_ovxxa") + +[node name="TutoTrigger5" parent="Tutorials" index="4" unique_id=1703929757 instance=ExtResource("7_r26ni")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.5, 18.5, -30.5) +first_input_texture = ExtResource("9_v7818") +complex_input_text = "with speed" +tuto_text = "Slide" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorials/TutoTrigger5" index="1" unique_id=614350904] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75, 0.5, 12.25) +shape = SubResource("BoxShape3D_5ibpd") + +[node name="TutoTrigger6" parent="Tutorials" index="5" unique_id=1739438130 instance=ExtResource("7_r26ni")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 19, 19) +first_input_texture = ExtResource("8_6c6r2") +complex_input_text = "while mantling" +tuto_text = "Improved jump" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorials/TutoTrigger6" index="1" unique_id=821335302] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.25, 0.25, -1.5) +shape = SubResource("BoxShape3D_6rkcg") + +[node name="TutoTrigger7" parent="Tutorials" index="6" unique_id=1993844947 instance=ExtResource("7_r26ni")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.5, 21, 24) +first_input_texture = ExtResource("8_6c6r2") +complex_input_text = "double tap" +tuto_text = "Try to wall run" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorials/TutoTrigger7" index="1" unique_id=1194306224] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.25, 0.25, -1.5) +shape = SubResource("BoxShape3D_6rkcg") + +[node name="TutoTrigger8" parent="Tutorials" index="7" unique_id=540710346 instance=ExtResource("7_r26ni")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -37, 25, 10) +first_input_texture = ExtResource("10_hocby") +tuto_text = "dash" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorials/TutoTrigger8" index="1" unique_id=1793181148] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -3.75) +shape = SubResource("BoxShape3D_p8dgc") + +[node name="TutoTrigger9" parent="Tutorials" index="8" unique_id=2062889854 instance=ExtResource("7_r26ni")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -37, 25, -6) +first_input_texture = ExtResource("10_hocby") +tuto_text = "dash" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorials/TutoTrigger9" index="1" unique_id=192598019] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -3.75) +shape = SubResource("BoxShape3D_p8dgc")