Compare commits

...

1 Commits

Author SHA1 Message Date
919236a388 tentatives de fixer cette ui de mort
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 12s
Create tag and build when new code gets to main / Export (push) Successful in 8m12s
2025-10-26 19:06:37 +01:00
14 changed files with 380 additions and 2 deletions

View File

@@ -4,7 +4,21 @@ extends OverlaidMenu
@export var options_packed_scene : PackedScene
@export_file("*.tscn") var main_menu_scene : String
@export var menu_context : GUIDEMappingContext
var popup_open : Node
var previous_mapping_contexts : Array
func on_enter_tree() -> void:
pass
#previous_mapping_contexts = GUIDE.get_enabled_mapping_contexts()
#GUIDE.enable_mapping_context(menu_context)
func on_exit_tree() -> void:
pass
#GUIDE.disable_mapping_context(menu_context)
#for previous_context in previous_mapping_contexts:
#GUIDE.enable_mapping_context(previous_context)
func close_popup() -> void:
if popup_open != null:

View File

@@ -10,7 +10,7 @@ extends Node
@export var pause:GUIDEAction
func _ready() -> void:
GUIDE.enable_mapping_context(base_mode)
# GUIDE.enable_mapping_context(base_mode)
pause.triggered.connect(on_input_pause)

View File

@@ -26,6 +26,7 @@ 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"
ssh_remote_deploy/enabled=false
ssh_remote_deploy/host="user@host_ip"
@@ -75,6 +76,7 @@ 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
@@ -164,6 +166,8 @@ 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
dotnet/include_scripts_content=false
dotnet/include_debug_symbols=true
dotnet/embed_build_outputs=false
@@ -208,6 +212,7 @@ application/min_macos_version_x86_64="10.12"
application/min_macos_version_arm64="11.00"
application/export_angle=0
display/high_res=true
shader_baker/enabled=false
application/additional_plist_content=""
xcode/platform_build="14C18"
xcode/sdk_version="13.1"

View File

@@ -1,10 +1,15 @@
[gd_scene load_steps=4 format=3 uid="uid://ccqajqchiw4xu"]
[gd_scene load_steps=5 format=3 uid="uid://ccqajqchiw4xu"]
[ext_resource type="PackedScene" uid="uid://b5cd6sa8qq4vc" path="res://addons/maaacks_game_template/base/scenes/overlaid_menu/menus/pause_menu.tscn" id="1_0paax"]
[ext_resource type="Script" uid="uid://bwvomv4eww4fg" path="res://menus/scenes/overlaid_menus/pause_menu.gd" id="2_ek1hy"]
[ext_resource type="PackedScene" uid="uid://dim045la3mijk" path="res://menus/scenes/overlaid_menus/mini_options_overlaid_menu.tscn" id="3_e0t2r"]
[ext_resource type="Resource" uid="uid://c2hpxkcujyc13" path="res://systems/inputs/menu_mode/menu_mode.tres" id="4_nfx08"]
[node name="PauseMenu" instance=ExtResource("1_0paax")]
script = ExtResource("2_ek1hy")
options_packed_scene = ExtResource("3_e0t2r")
main_menu_scene = "res://menus/scenes/menus/main_menu/main_menu_with_animations.tscn"
menu_context = ExtResource("4_nfx08")
[connection signal="tree_entered" from="." to="." method="on_enter_tree"]
[connection signal="tree_exited" from="." to="." method="on_exit_tree"]

View File

@@ -46,6 +46,32 @@ theme/custom="res://menus/resources/themes/expedition.tres"
[input]
ui_accept={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194309,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194310,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null)
]
}
ui_cancel={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194305,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":true,"script":null)
]
}
ui_focus_next={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194306,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null)
]
}
ui_focus_prev={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":true,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194306,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":9,"pressure":0.0,"pressed":true,"script":null)
]
}
up={
"deadzone": 0.2,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)

View File

@@ -0,0 +1,7 @@
[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://ck43v3q5ype3f"]
[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_4pmby"]
[resource]
script = ExtResource("1_4pmby")
metadata/_custom_type_script = "uid://cluhc11vixkf1"

View File

@@ -0,0 +1,7 @@
[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://dv6438xhua6id"]
[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_56ywq"]
[resource]
script = ExtResource("1_56ywq")
metadata/_custom_type_script = "uid://cluhc11vixkf1"

View File

@@ -0,0 +1,7 @@
[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://by80bubgg0dpx"]
[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_jx5gn"]
[resource]
script = ExtResource("1_jx5gn")
metadata/_custom_type_script = "uid://cluhc11vixkf1"

View File

@@ -0,0 +1,272 @@
[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=78 format=3 uid="uid://c2hpxkcujyc13"]
[ext_resource type="Script" uid="uid://cpplm41b5bt6m" path="res://addons/guide/guide_action_mapping.gd" id="1_xno0b"]
[ext_resource type="Resource" uid="uid://ck43v3q5ype3f" path="res://systems/inputs/menu_mode/back.tres" id="2_6sfub"]
[ext_resource type="Script" uid="uid://dsa1dnifd6w32" path="res://addons/guide/guide_mapping_context.gd" id="2_w5wm7"]
[ext_resource type="Script" uid="uid://mtx1unc2aqn7" path="res://addons/guide/guide_input_mapping.gd" id="3_scydb"]
[ext_resource type="Script" uid="uid://rvttn472ix6v" path="res://addons/guide/inputs/guide_input_joy_button.gd" id="4_q6ncx"]
[ext_resource type="Script" uid="uid://bl8rjl4oaldje" path="res://addons/guide/modifiers/guide_modifier.gd" id="5_vnf02"]
[ext_resource type="Script" uid="uid://x74mnwgr08a7" path="res://addons/guide/triggers/guide_trigger.gd" id="6_c647i"]
[ext_resource type="Script" uid="uid://b52rqq28tuqpg" path="res://addons/guide/triggers/guide_trigger_pressed.gd" id="7_m88dc"]
[ext_resource type="Script" uid="uid://cw71o87tvdx3q" path="res://addons/guide/inputs/guide_input_key.gd" id="8_yfqfy"]
[ext_resource type="Resource" uid="uid://ds8quw8a7uh2u" path="res://systems/inputs/menu_mode/select.tres" id="9_dsdj3"]
[ext_resource type="Resource" uid="uid://8t1evbmg3liq" path="res://systems/inputs/menu_mode/up.tres" id="10_q44ew"]
[ext_resource type="Resource" uid="uid://dv6438xhua6id" path="res://systems/inputs/menu_mode/down.tres" id="11_as826"]
[ext_resource type="Resource" uid="uid://cihlxajjlh80a" path="res://systems/inputs/menu_mode/right.tres" id="12_erftc"]
[ext_resource type="Resource" uid="uid://by80bubgg0dpx" path="res://systems/inputs/menu_mode/left.tres" id="13_sy651"]
[ext_resource type="Resource" uid="uid://bmef0jo6o41ic" path="res://systems/inputs/menu_mode/next.tres" id="14_2sr1w"]
[ext_resource type="Resource" uid="uid://c3n6ww58cmbbk" path="res://systems/inputs/menu_mode/previous.tres" id="15_2j2sf"]
[ext_resource type="Resource" uid="uid://dgluj0ql5vth7" path="res://systems/inputs/base_mode/pause.tres" id="16_scydb"]
[sub_resource type="Resource" id="Resource_tp5dr"]
script = ExtResource("4_q6ncx")
button = 1
[sub_resource type="Resource" id="Resource_lvbl0"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_2ux44"]
script = ExtResource("3_scydb")
input = SubResource("Resource_tp5dr")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_lvbl0")])
[sub_resource type="Resource" id="Resource_h2f8g"]
script = ExtResource("8_yfqfy")
key = 4194305
[sub_resource type="Resource" id="Resource_17mt7"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_23hmj"]
script = ExtResource("3_scydb")
input = SubResource("Resource_h2f8g")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_17mt7")])
[sub_resource type="Resource" id="Resource_len71"]
script = ExtResource("1_xno0b")
action = ExtResource("2_6sfub")
input_mappings = Array[ExtResource("3_scydb")]([SubResource("Resource_2ux44"), SubResource("Resource_23hmj")])
[sub_resource type="Resource" id="Resource_wkavf"]
script = ExtResource("4_q6ncx")
[sub_resource type="Resource" id="Resource_3uc4f"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_fidv6"]
script = ExtResource("3_scydb")
input = SubResource("Resource_wkavf")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_3uc4f")])
[sub_resource type="Resource" id="Resource_y2xy1"]
script = ExtResource("8_yfqfy")
key = 4194309
[sub_resource type="Resource" id="Resource_orcaw"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_yxowx"]
script = ExtResource("3_scydb")
input = SubResource("Resource_y2xy1")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_orcaw")])
[sub_resource type="Resource" id="Resource_ruq4f"]
script = ExtResource("1_xno0b")
action = ExtResource("9_dsdj3")
input_mappings = Array[ExtResource("3_scydb")]([SubResource("Resource_fidv6"), SubResource("Resource_yxowx")])
[sub_resource type="Resource" id="Resource_3fxnk"]
script = ExtResource("4_q6ncx")
button = 11
[sub_resource type="Resource" id="Resource_5uay1"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_0v0i1"]
script = ExtResource("3_scydb")
input = SubResource("Resource_3fxnk")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_5uay1")])
[sub_resource type="Resource" id="Resource_72t1r"]
script = ExtResource("8_yfqfy")
key = 4194320
[sub_resource type="Resource" id="Resource_4qbib"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_cccin"]
script = ExtResource("3_scydb")
input = SubResource("Resource_72t1r")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_4qbib")])
[sub_resource type="Resource" id="Resource_5hp22"]
script = ExtResource("1_xno0b")
action = ExtResource("10_q44ew")
input_mappings = Array[ExtResource("3_scydb")]([SubResource("Resource_0v0i1"), SubResource("Resource_cccin")])
[sub_resource type="Resource" id="Resource_1klk7"]
script = ExtResource("4_q6ncx")
button = 12
[sub_resource type="Resource" id="Resource_h4vny"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_jmmtp"]
script = ExtResource("3_scydb")
input = SubResource("Resource_1klk7")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_h4vny")])
[sub_resource type="Resource" id="Resource_cfqv5"]
script = ExtResource("8_yfqfy")
key = 4194322
[sub_resource type="Resource" id="Resource_0i4uw"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_fka1a"]
script = ExtResource("3_scydb")
input = SubResource("Resource_cfqv5")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_0i4uw")])
[sub_resource type="Resource" id="Resource_7i3b3"]
script = ExtResource("1_xno0b")
action = ExtResource("11_as826")
input_mappings = Array[ExtResource("3_scydb")]([SubResource("Resource_jmmtp"), SubResource("Resource_fka1a")])
[sub_resource type="Resource" id="Resource_s10di"]
script = ExtResource("4_q6ncx")
button = 14
[sub_resource type="Resource" id="Resource_isne2"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_fru3p"]
script = ExtResource("3_scydb")
input = SubResource("Resource_s10di")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_isne2")])
[sub_resource type="Resource" id="Resource_hbvow"]
script = ExtResource("8_yfqfy")
key = 4194321
[sub_resource type="Resource" id="Resource_mq0hj"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_sb8uf"]
script = ExtResource("3_scydb")
input = SubResource("Resource_hbvow")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_mq0hj")])
[sub_resource type="Resource" id="Resource_6ptcp"]
script = ExtResource("1_xno0b")
action = ExtResource("12_erftc")
input_mappings = Array[ExtResource("3_scydb")]([SubResource("Resource_fru3p"), SubResource("Resource_sb8uf")])
[sub_resource type="Resource" id="Resource_ortmh"]
script = ExtResource("4_q6ncx")
button = 13
[sub_resource type="Resource" id="Resource_1berd"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_0wrqh"]
script = ExtResource("3_scydb")
input = SubResource("Resource_ortmh")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_1berd")])
[sub_resource type="Resource" id="Resource_saokt"]
script = ExtResource("8_yfqfy")
key = 4194319
[sub_resource type="Resource" id="Resource_2b3t5"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_a5khc"]
script = ExtResource("3_scydb")
input = SubResource("Resource_saokt")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_2b3t5")])
[sub_resource type="Resource" id="Resource_xked7"]
script = ExtResource("1_xno0b")
action = ExtResource("13_sy651")
input_mappings = Array[ExtResource("3_scydb")]([SubResource("Resource_0wrqh"), SubResource("Resource_a5khc")])
[sub_resource type="Resource" id="Resource_1y2qg"]
script = ExtResource("4_q6ncx")
button = 10
[sub_resource type="Resource" id="Resource_vwpv3"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_7mcrw"]
script = ExtResource("3_scydb")
input = SubResource("Resource_1y2qg")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_vwpv3")])
[sub_resource type="Resource" id="Resource_qjv8h"]
script = ExtResource("1_xno0b")
action = ExtResource("14_2sr1w")
input_mappings = Array[ExtResource("3_scydb")]([SubResource("Resource_7mcrw")])
[sub_resource type="Resource" id="Resource_s2haq"]
script = ExtResource("4_q6ncx")
button = 9
[sub_resource type="Resource" id="Resource_vankc"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_3owmx"]
script = ExtResource("3_scydb")
input = SubResource("Resource_s2haq")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_vankc")])
[sub_resource type="Resource" id="Resource_p0ahg"]
script = ExtResource("1_xno0b")
action = ExtResource("15_2j2sf")
input_mappings = Array[ExtResource("3_scydb")]([SubResource("Resource_3owmx")])
[sub_resource type="Resource" id="Resource_q6ncx"]
script = ExtResource("4_q6ncx")
button = 4
[sub_resource type="Resource" id="Resource_vnf02"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_c647i"]
script = ExtResource("3_scydb")
input = SubResource("Resource_q6ncx")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_vnf02")])
[sub_resource type="Resource" id="Resource_m88dc"]
script = ExtResource("4_q6ncx")
button = 6
[sub_resource type="Resource" id="Resource_yfqfy"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_dsdj3"]
script = ExtResource("3_scydb")
input = SubResource("Resource_m88dc")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_yfqfy")])
[sub_resource type="Resource" id="Resource_q44ew"]
script = ExtResource("8_yfqfy")
key = 4194305
[sub_resource type="Resource" id="Resource_as826"]
script = ExtResource("7_m88dc")
[sub_resource type="Resource" id="Resource_erftc"]
script = ExtResource("3_scydb")
input = SubResource("Resource_q44ew")
triggers = Array[ExtResource("6_c647i")]([SubResource("Resource_as826")])
[sub_resource type="Resource" id="Resource_sy651"]
script = ExtResource("1_xno0b")
action = ExtResource("16_scydb")
input_mappings = Array[ExtResource("3_scydb")]([SubResource("Resource_c647i"), SubResource("Resource_dsdj3"), SubResource("Resource_erftc")])
[resource]
script = ExtResource("2_w5wm7")
mappings = Array[ExtResource("1_xno0b")]([SubResource("Resource_len71"), SubResource("Resource_ruq4f"), SubResource("Resource_5hp22"), SubResource("Resource_7i3b3"), SubResource("Resource_6ptcp"), SubResource("Resource_xked7"), SubResource("Resource_qjv8h"), SubResource("Resource_p0ahg"), SubResource("Resource_sy651")])
metadata/_custom_type_script = "uid://dsa1dnifd6w32"

View File

@@ -0,0 +1,7 @@
[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://bmef0jo6o41ic"]
[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_u34uv"]
[resource]
script = ExtResource("1_u34uv")
metadata/_custom_type_script = "uid://cluhc11vixkf1"

View File

@@ -0,0 +1,7 @@
[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://c3n6ww58cmbbk"]
[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_hipw6"]
[resource]
script = ExtResource("1_hipw6")
metadata/_custom_type_script = "uid://cluhc11vixkf1"

View File

@@ -0,0 +1,7 @@
[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://cihlxajjlh80a"]
[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_x80dv"]
[resource]
script = ExtResource("1_x80dv")
metadata/_custom_type_script = "uid://cluhc11vixkf1"

View File

@@ -0,0 +1,7 @@
[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://ds8quw8a7uh2u"]
[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_gdlub"]
[resource]
script = ExtResource("1_gdlub")
metadata/_custom_type_script = "uid://cluhc11vixkf1"

View File

@@ -0,0 +1,7 @@
[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://8t1evbmg3liq"]
[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_t6kxf"]
[resource]
script = ExtResource("1_t6kxf")
metadata/_custom_type_script = "uid://cluhc11vixkf1"