From b1c1c7d809a03853c307a00c491dbd9ae5813a6b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 23 Aug 2024 09:22:52 +0900 Subject: [PATCH 01/23] WORKFLOW: tentative PR branch name fixes [skip ci] --- .github/workflows/cooker-selfhosted.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 292e0df4..445bcae9 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -62,8 +62,14 @@ jobs: - name: Get branch name id: branch_name - run: echo "BRANCH_NAME=$(echo $GITHUB_REF | sed 's|refs/heads/||')" >> $GITHUB_ENV - + run: | + if [[ "$GITHUB_EVENT_NAME" == "pull_request" || "$GITHUB_EVENT_NAME" == "pull_request_target" ]]; then + source_branch="${{ github.head_ref }}" + echo "BRANCH_NAME=$source_branch" >> $GITHUB_ENV + else + branch_name=$(echo $GITHUB_REF | sed 's|refs/heads/||') + echo "BRANCH_NAME=$branch_name" >> $GITHUB_ENV + fi # if the branch is coming from a PR the tag should be manually built - name: "Generate version tag and evaluating latest tag" From d741ecc53153eff05eb83d016fe6a0eaa4ec8ab5 Mon Sep 17 00:00:00 2001 From: MonkeyX Date: Fri, 23 Aug 2024 01:25:55 +0100 Subject: [PATCH 02/23] Cooker Godot Update (#911) * On branch cooker Changes to be committed: modified: ../config/retrodeck/reference_lists/features.json modified: configurator.sh modified: configurator/TabContainer.gd modified: configurator/assets/themes/accesible_theme.tres modified: configurator/assets/themes/modern_theme.tres modified: configurator/assets/themes/retro_theme.tres modified: configurator/main.tscn modified: configurator/res/pixel_ui_theme/RetroDECKTheme.tres * Signal test * s * Oops Data Recovery On branch cooker Changes to be committed: modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * Sliding Rekku On branch cooker Changes to be committed: modified: tools/configurator/Rekku.gd modified: tools/configurator/main.gd modified: tools/configurator/main.tscn * Using less tabs? On branch cooker Changes to be committed: modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres --------- Co-authored-by: Rekku --- tools/configurator.sh | 0 tools/configurator/Rekku.gd | 6 +- tools/configurator/TabContainer.gd | 1 + .../assets/themes/accesible_theme.tres | 12 +- .../assets/themes/modern_theme.tres | 12 +- .../assets/themes/retro_theme.tres | 12 +- tools/configurator/main.gd | 60 +- tools/configurator/main.tscn | 615 +++++++++--------- .../res/pixel_ui_theme/RetroDECKTheme.tres | 88 +-- 9 files changed, 436 insertions(+), 370 deletions(-) mode change 100644 => 100755 tools/configurator.sh diff --git a/tools/configurator.sh b/tools/configurator.sh old mode 100644 new mode 100755 diff --git a/tools/configurator/Rekku.gd b/tools/configurator/Rekku.gd index 65c79a40..03ea2fe2 100644 --- a/tools/configurator/Rekku.gd +++ b/tools/configurator/Rekku.gd @@ -3,6 +3,10 @@ extends Control func _input(event): if event.is_action_pressed("rekku_hide"): self.visible = !self.visible - + %SplitContainer.split_offset=-300 + if Input.is_action_pressed("back_button"): + %SplitContainer.split_offset=0 $".".visible=false + + diff --git a/tools/configurator/TabContainer.gd b/tools/configurator/TabContainer.gd index 083182c5..fcd98b61 100644 --- a/tools/configurator/TabContainer.gd +++ b/tools/configurator/TabContainer.gd @@ -22,6 +22,7 @@ func _ready(): set_tab_icon_max_width(5,icon_width) set_tab_icon(6, ResourceLoader.load("res://assets/icons/pixelitos/128/help-about.png")) set_tab_icon_max_width(6,icon_width) + #%TK_GRAPHICS.name="BOB" # func _input(event): if (event.is_action_pressed("next_tab")): diff --git a/tools/configurator/assets/themes/accesible_theme.tres b/tools/configurator/assets/themes/accesible_theme.tres index 64ae1dab..b0cacff0 100644 --- a/tools/configurator/assets/themes/accesible_theme.tres +++ b/tools/configurator/assets/themes/accesible_theme.tres @@ -1,6 +1,16 @@ -[gd_resource type="Theme" load_steps=2 format=3 uid="uid://co27jgr76wvcl"] +[gd_resource type="Theme" load_steps=5 format=3 uid="uid://co27jgr76wvcl"] [ext_resource type="FontFile" uid="uid://c8lbo5ljgtaaa" path="res://assets/fonts/OpenDyslexic3/OpenDyslexic3-Regular.ttf" id="1_d8f12"] +[ext_resource type="Texture2D" uid="uid://buod4n6hw4i2m" path="res://assets/icons/pixelitos/vcs-normal.svg" id="1_pvl23"] +[ext_resource type="Texture2D" uid="uid://cn0tfnnihjvy7" path="res://assets/icons/pixelitos/vcs-grey.svg" id="2_ud3yg"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ghisc"] +bg_color = Color(0.6, 0.168627, 0.6, 0.372549) [resource] default_font = ExtResource("1_d8f12") +Button/styles/focus = SubResource("StyleBoxFlat_ghisc") +CheckBox/constants/check_v_offset = 0 +CheckBox/constants/h_separation = 0 +CheckBox/icons/checked = ExtResource("1_pvl23") +CheckBox/icons/unchecked = ExtResource("2_ud3yg") diff --git a/tools/configurator/assets/themes/modern_theme.tres b/tools/configurator/assets/themes/modern_theme.tres index a5f98d5b..e0294d5c 100644 --- a/tools/configurator/assets/themes/modern_theme.tres +++ b/tools/configurator/assets/themes/modern_theme.tres @@ -1,6 +1,16 @@ -[gd_resource type="Theme" load_steps=2 format=3 uid="uid://dcyix4kssqal2"] +[gd_resource type="Theme" load_steps=5 format=3 uid="uid://dcyix4kssqal2"] +[ext_resource type="Texture2D" uid="uid://buod4n6hw4i2m" path="res://assets/icons/pixelitos/vcs-normal.svg" id="1_pvl23"] [ext_resource type="FontFile" uid="uid://1x3s2oon2g64" path="res://assets/fonts/akrobat/Akrobat-Regular.otf" id="1_qs1qb"] +[ext_resource type="Texture2D" uid="uid://cn0tfnnihjvy7" path="res://assets/icons/pixelitos/vcs-grey.svg" id="2_ud3yg"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ghisc"] +bg_color = Color(0.6, 0.168627, 0.6, 0.372549) [resource] default_font = ExtResource("1_qs1qb") +Button/styles/focus = SubResource("StyleBoxFlat_ghisc") +CheckBox/constants/check_v_offset = 0 +CheckBox/constants/h_separation = 0 +CheckBox/icons/checked = ExtResource("1_pvl23") +CheckBox/icons/unchecked = ExtResource("2_ud3yg") diff --git a/tools/configurator/assets/themes/retro_theme.tres b/tools/configurator/assets/themes/retro_theme.tres index 21a977c7..a2b0b898 100644 --- a/tools/configurator/assets/themes/retro_theme.tres +++ b/tools/configurator/assets/themes/retro_theme.tres @@ -1,6 +1,16 @@ -[gd_resource type="Theme" load_steps=2 format=3 uid="uid://3ljv5xgd4c1u"] +[gd_resource type="Theme" load_steps=5 format=3 uid="uid://3ljv5xgd4c1u"] [ext_resource type="FontFile" uid="uid://q405aelgnmvo" path="res://assets/fonts/munro/munro.ttf" id="1_kirwi"] +[ext_resource type="Texture2D" uid="uid://buod4n6hw4i2m" path="res://assets/icons/pixelitos/vcs-normal.svg" id="1_pvl23"] +[ext_resource type="Texture2D" uid="uid://cn0tfnnihjvy7" path="res://assets/icons/pixelitos/vcs-grey.svg" id="2_ud3yg"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ghisc"] +bg_color = Color(0.6, 0.168627, 0.6, 0.372549) [resource] default_font = ExtResource("1_kirwi") +Button/styles/focus = SubResource("StyleBoxFlat_ghisc") +CheckBox/constants/check_v_offset = 0 +CheckBox/constants/h_separation = 0 +CheckBox/icons/checked = ExtResource("1_pvl23") +CheckBox/icons/unchecked = ExtResource("2_ud3yg") diff --git a/tools/configurator/main.gd b/tools/configurator/main.gd index daea0209..ba963ed3 100644 --- a/tools/configurator/main.gd +++ b/tools/configurator/main.gd @@ -10,7 +10,7 @@ var log_text = "gdc_" var log_parameters: Array = ["log", "i", log_text] var log_results: Dictionary var theme_option: OptionButton -signal signal_theme_changed +#signal signal_theme_changed var custom_theme: Theme = $".".theme var log_option: OptionButton var tab_container: TabContainer @@ -105,9 +105,13 @@ func _get_nodes() -> void: func _connect_signals() -> void: #signal_theme_changed.connect(_conf_theme) theme_option.item_selected.connect(_conf_theme) - signal_theme_changed.emit(theme_option.item_selected) + #signal_theme_changed.emit(theme_option.item_selected) log_option.item_selected.connect(_load_log) - %borders.pressed.connect(_hide_show) + %borders_button.pressed.connect(_hide_show.bind(%borders_button)) + %save_button.pressed.connect(_hide_show.bind(%save_button)) + %decorations_button.pressed.connect(_hide_show_containers.bind(%decorations_button)) + %systems_button.pressed.connect(_hide_show_containers.bind(%systems_button)) + %save_resume_button.pressed.connect(_hide_show_containers.bind(%decorations_button)) func _load_log(index: int) -> void: var log_content:String @@ -124,27 +128,47 @@ func _load_log(index: int) -> void: func _play_main_animations() -> void: anim_logo.play() -func _hide_show() -> void: - if %borders.button_pressed: - %borders_grid_container.visible = true - for i in range(%borders_grid_container.get_child_count()): - var child = %borders_grid_container.get_child(i) + +func _hide_show_containers(button: Button) -> void: + match button.name: + "decorations_button": + %graphics_gridcontainer.visible = true + if button.toggle_mode: + button.toggle_mode=false + %graphics_gridcontainer.visible = false + else: + button.toggle_mode=true + "systems_button": + %systems_gridcontainer.visible = true + if button.toggle_mode: + button.toggle_mode=false + %systems_gridcontainer.visible = false + else: + button.toggle_mode=true + +func _hide_show(button: Button) -> void: + if %borders_button.button_pressed: + %borders_gridcontainer.visible = true + for i in range(%borders_gridcontainer.get_child_count()): + var child = %borders_gridcontainer.get_child(i) if child is Button: child.button_pressed=true - for i in range(%graphics_grid_container.get_child_count()): - var child = %graphics_grid_container.get_child(i) - if child is Button and child != %borders: + for i in range(%graphics_gridcontainer.get_child_count()): + var child = %graphics_gridcontainer.get_child(i) + if child is Button and child != %borders_button: child.visible=false %save_button.visible=true - elif !%borders.button_pressed: - %borders_grid_container.visible = false - for i in range(%graphics_grid_container.get_child_count()): - var child = %graphics_grid_container.get_child(i) + + if %save_button.button_pressed: + %borders_gridcontainer.visible = false + for i in range(%graphics_gridcontainer.get_child_count()): + var child = %graphics_gridcontainer.get_child(i) if child is Button: child.visible=true %save_button.visible=false func _conf_theme(index: int) -> void: + print (index) match index: 1: custom_theme = preload("res://res/pixel_ui_theme/RetroDECKTheme.tres") @@ -232,6 +256,6 @@ func combine_tkeys(): #More as a test #$Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer/GridContainer/cheats.text = tr("TK_CHEATS") + " " + tr("TK_SOON") #%tate_mode.text = tr("TK_TATE") + " " + tr("TK_SOON") #%hotkey_sound.text = tr("TK_HOTKEYSOUND") + " " + tr("TK_SOON") - $Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container/cheevos_hardcore.text = tr("TK_CHEEVOSHARDCORE") + " " + tr("TK_SOON") - $Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/data_mng_container/saves_sync.text = tr("TK_SAVESSYNC") + " " + tr("TK_SOON") - $Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer/system_container/easter_eggs.text = tr("TK_EASTEREGGS") + " " + tr("TK_SOON") + #$Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container/cheevos_hardcore.text = tr("TK_CHEEVOSHARDCORE") + " " + tr("TK_SOON") + #$Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/data_mng_container/saves_sync.text = tr("TK_SAVESSYNC") + " " + tr("TK_SOON") + #$Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer/system_container/easter_eggs.text = tr("TK_EASTEREGGS") + " " + tr("TK_SOON") diff --git a/tools/configurator/main.tscn b/tools/configurator/main.tscn index 58e80a2e..b1e03c9a 100644 --- a/tools/configurator/main.tscn +++ b/tools/configurator/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=69 format=3 uid="uid://61f6m4r1mpan"] +[gd_scene load_steps=76 format=3 uid="uid://61f6m4r1mpan"] [ext_resource type="Texture2D" uid="uid://bv6vh33cnfaw4" path="res://icon.svg" id="1_axfei"] [ext_resource type="Theme" uid="uid://hhc60cllcg47" path="res://assets/themes/default_theme.tres" id="1_if8nh"] @@ -9,6 +9,7 @@ [ext_resource type="Texture2D" uid="uid://bdj8vt3vhucq4" path="res://assets/icons/pixelitos/128/cs-display.png" id="4_jldgc"] [ext_resource type="Script" path="res://tk_about.gd" id="4_m4rto"] [ext_resource type="Script" path="res://Rekku.gd" id="4_nqqx3"] +[ext_resource type="Texture2D" uid="uid://suusabsjin6e" path="res://assets/icons/pixelitos/128/applications-graphics.png" id="4_q6hd2"] [ext_resource type="Texture2D" uid="uid://dk856hwnwsuab" path="res://assets/icons/pixelitos/128/retroarch.png" id="4_xcuib"] [ext_resource type="Texture2D" uid="uid://cvr1eijddf6nv" path="res://assets/icons/banner/gamegear.png" id="5_4d7s7"] [ext_resource type="Texture2D" uid="uid://d2lm4mfx1gt86" path="res://assets/graphics/retrodeck_base_shake0.png" id="5_7rjbt"] @@ -43,10 +44,16 @@ [ext_resource type="Texture2D" uid="uid://dtwjo7co226dw" path="res://res/flags/japan_32.png" id="10_e8mt0"] [ext_resource type="Texture2D" uid="uid://bevamv2c8knnn" path="res://assets/icons/pixelitos/128/org.citra_emu.citra.png" id="10_wbaif"] [ext_resource type="Texture2D" uid="uid://dbvjugxp84gsj" path="res://assets/icons/pixelitos/128/org.DolphinEmu.dolphin-emu.png" id="11_61sak"] +[ext_resource type="Texture2D" uid="uid://c0pbart7aj657" path="res://assets/icons/pixelitos/128/preferences-system-time.png" id="11_c3qcy"] [ext_resource type="Texture2D" uid="uid://blwtj4of6fb5y" path="res://assets/icons/pixelitos/128/spacefm.png" id="11_p6y0k"] [ext_resource type="Texture2D" uid="uid://cbwhpqip43aei" path="res://res/flags/china_32.png" id="11_ri2fv"] +[ext_resource type="Texture2D" uid="uid://b763qnm02o5bd" path="res://assets/icons/pixelitos/128/system-reboot.png" id="12_3jrmi"] [ext_resource type="Texture2D" uid="uid://dv6sym5rr1hpu" path="res://assets/icons/banner/psx.png" id="12_pp08o"] +[ext_resource type="Texture2D" uid="uid://ro1kdkjpfq3r" path="res://assets/icons/pixelitos/128/preferences-desktop-notification-bell.png" id="13_8kii4"] +[ext_resource type="Texture2D" uid="uid://dyw0ondpk6ned" path="res://assets/icons/pixelitos/128/search.png" id="14_oe3l4"] [ext_resource type="Texture2D" uid="uid://b164ihk8riiwh" path="res://assets/graphics/space_bground.png" id="15_qdvxo"] +[ext_resource type="Texture2D" uid="uid://cgh3df7ajg2c4" path="res://assets/icons/pixelitos/128/computer.png" id="17_0kr64"] +[ext_resource type="Texture2D" uid="uid://cvt2jky3bbjun" path="res://assets/icons/pixelitos/128/drive-removable-media.png" id="18_h2o3e"] [ext_resource type="Texture2D" uid="uid://dyumvh0ixwrbl" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0042.png" id="30_glnve"] [ext_resource type="Texture2D" uid="uid://cn11vcrybtor4" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0047.png" id="31_j5ri1"] [ext_resource type="Texture2D" uid="uid://cor8ep0fkqm08" path="res://res/Rekku/base.png" id="32_omdu2"] @@ -93,15 +100,6 @@ animations = [{ "speed": 12.0 }] -[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_rf0rc"] -texture = ExtResource("4_2tuu4") -texture_margin_left = 6.0 -texture_margin_top = 6.0 -texture_margin_right = 6.0 -texture_margin_bottom = 6.0 -region_rect = Rect2(0, 8, 16, 16) -modulate_color = Color(0.65098, 0.403922, 0.819608, 1) - [sub_resource type="SpriteFrames" id="SpriteFrames_k7pd1"] animations = [{ "frames": [{ @@ -148,6 +146,15 @@ animations = [{ "speed": 5.0 }] +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_rf0rc"] +texture = ExtResource("4_2tuu4") +texture_margin_left = 6.0 +texture_margin_top = 6.0 +texture_margin_right = 6.0 +texture_margin_bottom = 6.0 +region_rect = Rect2(0, 8, 16, 16) +modulate_color = Color(0.65098, 0.403922, 0.819608, 1) + [node name="Control" type="Control"] layout_mode = 3 anchors_preset = 15 @@ -168,150 +175,196 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="MarginContainer" type="MarginContainer" parent="Background"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_right = -333.0 -offset_bottom = -61.0 -grow_horizontal = 2 -grow_vertical = 2 +[node name="SplitContainer" type="SplitContainer" parent="Background"] +unique_name_in_owner = true +layout_mode = 0 +offset_left = 1.0 +offset_top = 5.0 +offset_right = 1253.0 +offset_bottom = 724.0 -[node name="TabContainer" type="TabContainer" parent="Background/MarginContainer"] +[node name="MarginContainer" type="MarginContainer" parent="Background/SplitContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="TabContainer" type="TabContainer" parent="Background/SplitContainer/MarginContainer"] unique_name_in_owner = true layout_mode = 2 tab_alignment = 1 current_tab = 0 script = ExtResource("3_id6l4") -[node name="TK_GRAPHICS" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] +[node name="Presets" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] +unique_name_in_owner = true layout_mode = 2 script = SubResource("GDScript_203iw") metadata/_tab_index = 0 -[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS"] +[node name="ScrollContainer" type="ScrollContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets"] layout_mode = 2 follow_focus = true -[node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="decorations_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer"] -layout_mode = 2 -text = "TK_DECORATIONS" - -[node name="graphics_grid_container" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer"] +[node name="decorations_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 -columns = 6 +text = "DECORATIONS - Borders, Widescreen" +icon = ExtResource("4_q6hd2") -[node name="wide_screen" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/graphics_grid_container"] -custom_minimum_size = Vector2(125, 125) +[node name="graphics_gridcontainer" type="GridContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer"] +unique_name_in_owner = true +visible = false +layout_mode = 2 +columns = 5 + +[node name="wide_screen" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] +custom_minimum_size = Vector2(200, 200) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 -size_flags_stretch_ratio = 0.0 tooltip_text = "TK_WSCREEN" -theme_override_constants/check_v_offset = 20 text = "TK_WSCREEN" icon = ExtResource("4_jldgc") -alignment = 1 icon_alignment = 1 vertical_icon_alignment = 0 expand_icon = true -[node name="shaders" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/graphics_grid_container"] -custom_minimum_size = Vector2(125, 125) +[node name="shaders" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] +custom_minimum_size = Vector2(200, 200) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 tooltip_text = "TK_SHADERS" -theme_override_constants/check_v_offset = 20 text = "TK_SHADERS" icon = ExtResource("5_box56") -alignment = 1 icon_alignment = 1 vertical_icon_alignment = 0 expand_icon = true -[node name="mods" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/graphics_grid_container"] -custom_minimum_size = Vector2(125, 125) +[node name="mods" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] +custom_minimum_size = Vector2(200, 200) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 tooltip_text = "TK_MODS" -theme_override_constants/check_v_offset = 20 text = "TK_MODS" icon = ExtResource("6_u80kq") -alignment = 1 icon_alignment = 1 vertical_icon_alignment = 0 expand_icon = true -[node name="tate_mode" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/graphics_grid_container"] +[node name="tate_mode" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] unique_name_in_owner = true -custom_minimum_size = Vector2(125, 125) +custom_minimum_size = Vector2(200, 200) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 tooltip_text = "TK_TATE" -theme_override_constants/check_v_offset = 20 -text = "Tate Mode" +text = "TK_TATE" icon = ExtResource("7_i14ax") -alignment = 1 icon_alignment = 1 vertical_icon_alignment = 0 expand_icon = true -[node name="borders" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/graphics_grid_container"] +[node name="borders_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] unique_name_in_owner = true -custom_minimum_size = Vector2(125, 125) +custom_minimum_size = Vector2(200, 200) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 tooltip_text = "TK_BORDERS" -theme_override_constants/check_v_offset = 20 text = "TK_BORDERS" icon = ExtResource("5_uiobi") -alignment = 1 icon_alignment = 1 vertical_icon_alignment = 0 expand_icon = true -[node name="hotkey_sound" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/graphics_grid_container"] +[node name="hotkey_sound" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] unique_name_in_owner = true -custom_minimum_size = Vector2(125, 125) +custom_minimum_size = Vector2(200, 200) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 tooltip_text = "TK_HOTKEYSOUND" text = "TK_HOTKEYSOUND" icon = ExtResource("9_qwq2k") -alignment = 1 clip_text = true icon_alignment = 1 vertical_icon_alignment = 0 expand_icon = true -[node name="buttons" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/graphics_grid_container"] +[node name="buttons" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] unique_name_in_owner = true -custom_minimum_size = Vector2(125, 125) +custom_minimum_size = Vector2(200, 200) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 tooltip_text = "TK_BTNLAYOUT" -theme_override_constants/check_v_offset = 20 text = "TK_BTNLAYOUT" icon = ExtResource("9_d2327") -alignment = 1 +clip_text = true icon_alignment = 1 vertical_icon_alignment = 0 expand_icon = true -[node name="save_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/graphics_grid_container"] +[node name="quick_resume" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] +custom_minimum_size = Vector2(200, 200) +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 +tooltip_text = "TK_QRESUME" +text = "TK_QRESUME" +icon = ExtResource("11_c3qcy") +icon_alignment = 1 +vertical_icon_alignment = 0 +expand_icon = true +metadata/description = "This is a test description set to this element" + +[node name="rewind" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] +custom_minimum_size = Vector2(200, 200) +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 +tooltip_text = "TK_REWIND" +text = "TK_REWIND" +icon = ExtResource("12_3jrmi") +icon_alignment = 1 +vertical_icon_alignment = 0 +expand_icon = true +metadata/description = "This is another, very long and convoluted, description, that I put too much commas in to make in LONGER and more SOPHISTICATED. And I did it twice!!!This is another, very long and convoluted, description, that I put too much commas in to make in LONGER and more SOPHISTICATED." + +[node name="quit_confirm" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] +custom_minimum_size = Vector2(200, 200) +layout_mode = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 +tooltip_text = "TK_CONFIRMEXIT" +text = "TK_CONFIRMEXIT" +icon = ExtResource("13_8kii4") +clip_text = true +icon_alignment = 1 +vertical_icon_alignment = 0 +expand_icon = true + +[node name="cheats" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] +unique_name_in_owner = true +custom_minimum_size = Vector2(200, 200) +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 +tooltip_text = "TK_CHEATS" +text = "TK_CHEATS" +icon = ExtResource("14_oe3l4") +clip_text = true +icon_alignment = 1 +vertical_icon_alignment = 0 +expand_icon = true + +[node name="save_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/graphics_gridcontainer"] unique_name_in_owner = true visible = false custom_minimum_size = Vector2(125, 125) @@ -325,14 +378,14 @@ icon_alignment = 1 vertical_icon_alignment = 0 expand_icon = true -[node name="borders_grid_container" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer"] +[node name="borders_gridcontainer" type="GridContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer"] unique_name_in_owner = true visible = false layout_mode = 2 theme_override_constants/h_separation = 30 columns = 4 -[node name="CheckBox5" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/borders_grid_container"] +[node name="CheckBox5" type="CheckBox" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/borders_gridcontainer"] custom_minimum_size = Vector2(200, 180) layout_mode = 2 size_flags_horizontal = 0 @@ -340,7 +393,7 @@ size_flags_vertical = 0 icon = ExtResource("5_ja8to") expand_icon = true -[node name="CheckBox3" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/borders_grid_container"] +[node name="CheckBox3" type="CheckBox" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/borders_gridcontainer"] custom_minimum_size = Vector2(200, 180) layout_mode = 2 size_flags_horizontal = 0 @@ -348,7 +401,7 @@ size_flags_vertical = 0 icon = ExtResource("6_mvrie") expand_icon = true -[node name="CheckBox4" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/borders_grid_container"] +[node name="CheckBox4" type="CheckBox" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/borders_gridcontainer"] custom_minimum_size = Vector2(200, 180) layout_mode = 2 size_flags_horizontal = 0 @@ -356,7 +409,7 @@ size_flags_vertical = 0 icon = ExtResource("7_01lqn") expand_icon = true -[node name="CheckBox6" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/borders_grid_container"] +[node name="CheckBox6" type="CheckBox" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/borders_gridcontainer"] custom_minimum_size = Vector2(200, 180) layout_mode = 2 size_flags_horizontal = 0 @@ -364,7 +417,7 @@ size_flags_vertical = 0 icon = ExtResource("7_b8xj2") expand_icon = true -[node name="CheckBox" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/borders_grid_container"] +[node name="CheckBox" type="CheckBox" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/borders_gridcontainer"] custom_minimum_size = Vector2(200, 180) layout_mode = 2 size_flags_horizontal = 0 @@ -372,7 +425,7 @@ size_flags_vertical = 0 icon = ExtResource("8_rvph4") expand_icon = true -[node name="CheckBox7" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/borders_grid_container"] +[node name="CheckBox7" type="CheckBox" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/borders_gridcontainer"] custom_minimum_size = Vector2(200, 180) layout_mode = 2 size_flags_horizontal = 0 @@ -380,7 +433,7 @@ size_flags_vertical = 0 icon = ExtResource("9_s3srh") expand_icon = true -[node name="CheckBox8" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/borders_grid_container"] +[node name="CheckBox8" type="CheckBox" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/borders_gridcontainer"] custom_minimum_size = Vector2(200, 180) layout_mode = 2 size_flags_horizontal = 0 @@ -388,7 +441,7 @@ size_flags_vertical = 0 icon = ExtResource("10_2jlmn") expand_icon = true -[node name="CheckBox9" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/borders_grid_container"] +[node name="CheckBox9" type="CheckBox" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/borders_gridcontainer"] custom_minimum_size = Vector2(200, 180) layout_mode = 2 size_flags_horizontal = 0 @@ -396,7 +449,7 @@ size_flags_vertical = 0 icon = ExtResource("5_4d7s7") expand_icon = true -[node name="CheckBox10" type="CheckBox" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/borders_grid_container"] +[node name="CheckBox10" type="CheckBox" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/borders_gridcontainer"] custom_minimum_size = Vector2(200, 180) layout_mode = 2 size_flags_horizontal = 0 @@ -404,87 +457,22 @@ size_flags_vertical = 0 icon = ExtResource("12_pp08o") expand_icon = true -[node name="TK_SYSTEM" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] -visible = false -layout_mode = 2 -metadata/_tab_index = 1 - -[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM"] -layout_mode = 2 -follow_focus = true - -[node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer"] -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 - -[node name="controls_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer"] -layout_mode = 2 - -[node name="controls_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container"] -layout_mode = 2 -text = "TK_SYSTEM" - -[node name="controls_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container"] -layout_mode = 2 - -[node name="GridContainer3" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container"] -layout_mode = 2 -columns = 2 - -[node name="quick_resume" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer3"] -layout_mode = 2 -size_flags_horizontal = 3 -button_pressed = true -text = "TK_QRESUME" -metadata/description = "This is a test description set to this element" - -[node name="quick_resume_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer3"] -layout_mode = 2 -text = "TK_ADVANCED" - -[node name="rewind" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer3"] -layout_mode = 2 -size_flags_horizontal = 3 -text = "TK_REWIND" -metadata/description = "This is another, very long and convoluted, description, that I put too much commas in to make in LONGER and more SOPHISTICATED. And I did it twice!!!This is another, very long and convoluted, description, that I put too much commas in to make in LONGER and more SOPHISTICATED." - -[node name="rewind_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer3"] -layout_mode = 2 -disabled = true -text = "TK_ADVANCED" - -[node name="quit_confirm" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer3"] -layout_mode = 2 -size_flags_horizontal = 3 -button_pressed = true -text = "TK_CONFIRMEXIT" - -[node name="quit_confirm_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer3"] -layout_mode = 2 -disabled = true -text = "TK_ADVANCED" - -[node name="cheats" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer3"] +[node name="systems_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 -size_flags_horizontal = 3 -disabled = true -text = "TK_CHEATS, TK_SOON" +text = "SYSTEMS - Emulators, Console, Computers" +icon = ExtResource("17_0kr64") -[node name="cheats_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer3"] -layout_mode = 2 -disabled = true -text = "TK_ADVANCED" - -[node name="GridContainer2" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container"] +[node name="systems_gridcontainer" type="GridContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer"] +unique_name_in_owner = true +visible = false layout_mode = 2 size_flags_vertical = 3 theme_override_constants/h_separation = 10 theme_override_constants/v_separation = 10 columns = 6 -[node name="Button3" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer2"] +[node name="Button3" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/systems_gridcontainer"] layout_mode = 2 tooltip_text = "RetroARCH" theme_override_styles/focus = ExtResource("5_rjtkn") @@ -493,7 +481,7 @@ icon = ExtResource("4_xcuib") icon_alignment = 1 vertical_icon_alignment = 0 -[node name="Button8" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer2"] +[node name="Button8" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/systems_gridcontainer"] layout_mode = 2 theme_override_styles/focus = ExtResource("5_rjtkn") text = "Dolphin" @@ -501,7 +489,7 @@ icon = ExtResource("11_61sak") icon_alignment = 1 vertical_icon_alignment = 0 -[node name="Button7" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer2"] +[node name="Button7" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/systems_gridcontainer"] layout_mode = 2 tooltip_text = "CITRA" text = "RPCS3" @@ -509,7 +497,7 @@ icon = ExtResource("8_ec4gt") icon_alignment = 1 vertical_icon_alignment = 0 -[node name="Button5" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer2"] +[node name="Button5" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/systems_gridcontainer"] layout_mode = 2 tooltip_text = "PSPSSPP" theme_override_styles/focus = ExtResource("5_rjtkn") @@ -518,7 +506,7 @@ icon = ExtResource("8_akxf7") icon_alignment = 1 vertical_icon_alignment = 0 -[node name="Button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer2"] +[node name="Button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/systems_gridcontainer"] layout_mode = 2 tooltip_text = "Duckstation" theme_override_styles/focus = ExtResource("5_rjtkn") @@ -527,7 +515,7 @@ icon = ExtResource("6_winpq") icon_alignment = 1 vertical_icon_alignment = 0 -[node name="Button2" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer2"] +[node name="Button2" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/systems_gridcontainer"] layout_mode = 2 tooltip_text = "Melon DS" theme_override_styles/focus = ExtResource("5_rjtkn") @@ -536,7 +524,7 @@ icon = ExtResource("7_4otos") icon_alignment = 1 vertical_icon_alignment = 0 -[node name="Button9" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer2"] +[node name="Button9" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer/systems_gridcontainer"] visible = false layout_mode = 2 tooltip_text = "CITRA" @@ -546,163 +534,193 @@ icon = ExtResource("10_wbaif") icon_alignment = 1 vertical_icon_alignment = 0 -[node name="TK_TOOLS" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] +[node name="save_resume_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/Presets/ScrollContainer/VBoxContainer"] +unique_name_in_owner = true +layout_mode = 2 +text = "FUNCTIONS - Save states, etc" +icon = ExtResource("18_h2o3e") + +[node name="TK_SYSTEM" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] +visible = false +layout_mode = 2 +metadata/_tab_index = 1 + +[node name="ScrollContainer" type="ScrollContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_SYSTEM"] +layout_mode = 2 +follow_focus = true + +[node name="VBoxContainer" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="controls_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer"] +layout_mode = 2 + +[node name="controls_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container"] +layout_mode = 2 +text = "TK_SYSTEM" + +[node name="controls_separator" type="HSeparator" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container"] +layout_mode = 2 + +[node name="TK_TOOLS" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] visible = false layout_mode = 2 metadata/_tab_index = 2 -[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_TOOLS"] +[node name="ScrollContainer" type="ScrollContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS"] layout_mode = 2 follow_focus = true -[node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer"] layout_mode = 2 size_flags_horizontal = 3 theme_override_constants/separation = 36 -[node name="scan_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer"] +[node name="scan_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer"] layout_mode = 2 -[node name="scan_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] +[node name="scan_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] layout_mode = 2 text = "TK_SCAN" -[node name="scan_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] +[node name="scan_separator" type="HSeparator" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] layout_mode = 2 -[node name="ps3_scan" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] +[node name="ps3_scan" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] layout_mode = 2 disabled = true text = "TK_PS3SCAN" -[node name="scummvm_scan" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] +[node name="scummvm_scan" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] layout_mode = 2 disabled = true text = "TK_SCUMMVMSCAN" -[node name="multifile_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] +[node name="multifile_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] layout_mode = 2 text = "TK_MULTIFILE" -[node name="3ds_decrypt_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] +[node name="3ds_decrypt_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] layout_mode = 2 disabled = true text = "TK_3DSDECRYPT" -[node name="bios_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] +[node name="bios_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] layout_mode = 2 text = "TK_BIOS" -[node name="bios_button_expert" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] +[node name="bios_button_expert" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container"] layout_mode = 2 text = "TK_BIOS_EXPERT" -[node name="tools_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer"] +[node name="tools_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer"] layout_mode = 2 -[node name="tools_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] +[node name="tools_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] layout_mode = 2 text = "TK_GENTOOLS" -[node name="tools_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] +[node name="tools_separator" type="HSeparator" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] layout_mode = 2 -[node name="emu_open_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] +[node name="emu_open_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] layout_mode = 2 text = "TK_EMUOPEN" -[node name="steamgrid_install_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] +[node name="steamgrid_install_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] layout_mode = 2 disabled = true text = "TK_GRIDINSTALL" -[node name="ps3_fw_install_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] +[node name="ps3_fw_install_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] layout_mode = 2 text = "TK_PS3FWINSTALL" -[node name="fav_steam" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] +[node name="fav_steam" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/tools_container"] layout_mode = 2 text = "TK_FAVSTEAM" -[node name="file_tools_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer"] +[node name="file_tools_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer"] layout_mode = 2 -[node name="file_tools_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] +[node name="file_tools_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] layout_mode = 2 text = "TK_FILETOOLS" -[node name="file_tools_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] +[node name="file_tools_separator" type="HSeparator" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] layout_mode = 2 -[node name="usb_tool_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] +[node name="usb_tool_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] layout_mode = 2 disabled = true text = "TK_USBTOOL" -[node name="backup_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] +[node name="backup_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] layout_mode = 2 disabled = true text = "TK_BACKUPBTN" -[node name="compress_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] +[node name="compress_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] layout_mode = 2 disabled = true text = "TK_COMPRESSGAMES" -[node name="move_files_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] +[node name="move_files_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/file_tools_container"] layout_mode = 2 disabled = true text = "TK_MOVEFILES" -[node name="TK_NETWORK" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] +[node name="TK_NETWORK" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] visible = false layout_mode = 2 metadata/_tab_index = 3 -[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_NETWORK"] +[node name="ScrollContainer" type="ScrollContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK"] layout_mode = 2 follow_focus = true -[node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer"] layout_mode = 2 size_flags_horizontal = 3 theme_override_constants/separation = 64 -[node name="cheevos_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer"] +[node name="cheevos_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer"] layout_mode = 2 -[node name="cheevos" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container"] +[node name="cheevos" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container"] layout_mode = 2 text = "TK_CHEEVOS" -[node name="cheevos_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container"] +[node name="cheevos_separator" type="HSeparator" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container"] layout_mode = 2 -[node name="cheevos_login_container" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container"] +[node name="cheevos_login_container" type="GridContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container"] layout_mode = 2 theme_override_constants/h_separation = 64 columns = 2 -[node name="cheevos_username_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_login_container"] +[node name="cheevos_username_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_login_container"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 text = "TK_CHEEVOSUNAME" -[node name="cheevos_username" type="LineEdit" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_login_container"] +[node name="cheevos_username" type="LineEdit" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_login_container"] custom_minimum_size = Vector2(256, 0) layout_mode = 2 size_flags_horizontal = 3 text = "username" placeholder_text = "username" -[node name="cheevos_pass_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_login_container"] +[node name="cheevos_pass_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_login_container"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 1 text = "TK_CHEEVOSPWD" -[node name="cheevos_pass" type="LineEdit" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_login_container"] +[node name="cheevos_pass" type="LineEdit" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_login_container"] layout_mode = 2 size_flags_horizontal = 3 text = "password" @@ -710,128 +728,128 @@ placeholder_text = "password" secret = true secret_character = "*" -[node name="cheevos_advanced_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container"] +[node name="cheevos_advanced_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container"] layout_mode = 2 -[node name="cheevos_advanced_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container"] +[node name="cheevos_advanced_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container"] layout_mode = 2 disabled = true text = "TK_ADVANCED" -[node name="cheevos_hardcore" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container"] +[node name="cheevos_hardcore" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container"] layout_mode = 2 disabled = true text = "TK_CHEEVOSHARDCORE" -[node name="cheevos_loginout_container" type="HBoxContainer" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container"] +[node name="cheevos_loginout_container" type="HBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container"] layout_mode = 2 size_flags_horizontal = 8 theme_override_constants/separation = 10 -[node name="cheevos_trophies_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container/cheevos_loginout_container"] +[node name="cheevos_trophies_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container/cheevos_loginout_container"] layout_mode = 2 disabled = true text = "TK_CHEEVOSTROPHYBTN" -[node name="cheevos_loginout_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container/cheevos_loginout_container"] +[node name="cheevos_loginout_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/cheevos_container/cheevos_advanced_container/cheevos_loginout_container"] layout_mode = 2 text = "TK_LOGIN" -[node name="netplay_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer"] +[node name="netplay_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer"] layout_mode = 2 -[node name="netplay" type="Label" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container"] +[node name="netplay" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container"] layout_mode = 2 text = "TK_NETPLAY" -[node name="netplay_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container"] +[node name="netplay_separator" type="HSeparator" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container"] layout_mode = 2 -[node name="netplay_id_container" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container"] +[node name="netplay_id_container" type="GridContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container"] layout_mode = 2 theme_override_constants/h_separation = 64 columns = 2 -[node name="netplay_id_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] +[node name="netplay_id_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 5 text = "TK_NETPLAYID" -[node name="netplay_id" type="LineEdit" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] +[node name="netplay_id" type="LineEdit" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] custom_minimum_size = Vector2(256, 0) layout_mode = 2 size_flags_horizontal = 3 text = "RetroDECK" placeholder_text = "RetroDECK" -[node name="netplay_address_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] +[node name="netplay_address_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 5 text = "TK_NETPLAYADDRESS" -[node name="netplay_address" type="LineEdit" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] +[node name="netplay_address" type="LineEdit" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] layout_mode = 2 size_flags_horizontal = 3 text = "127.0.0.1" placeholder_text = "127.0.0.1" -[node name="blank_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] +[node name="blank_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 5 -[node name="netplay_connect_disconnect_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] +[node name="netplay_connect_disconnect_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/netplay_container/netplay_id_container"] layout_mode = 2 text = "TK_NETPLAYCONNECT" -[node name="data_mng_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer"] +[node name="data_mng_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer"] layout_mode = 2 -[node name="data_mng_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/data_mng_container"] +[node name="data_mng_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/data_mng_container"] layout_mode = 2 text = "TK_DATAMNG" -[node name="data_mng_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/data_mng_container"] +[node name="data_mng_separator" type="HSeparator" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/data_mng_container"] layout_mode = 2 -[node name="saves_sync" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/data_mng_container"] +[node name="saves_sync" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/data_mng_container"] layout_mode = 2 size_flags_horizontal = 3 disabled = true text = "TK_SAVESSYNC" -[node name="ftp_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/data_mng_container"] +[node name="ftp_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_NETWORK/ScrollContainer/VBoxContainer/data_mng_container"] layout_mode = 2 size_flags_horizontal = 3 disabled = true text = "TK_FTPBTN" -[node name="TK_TROUBLESHOOT" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] +[node name="TK_TROUBLESHOOT" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] visible = false layout_mode = 2 metadata/_tab_index = 4 -[node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT"] +[node name="VBoxContainer" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT"] layout_mode = 2 theme_override_constants/separation = 64 -[node name="troubleshoot_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer"] +[node name="troubleshoot_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer"] layout_mode = 2 -[node name="troubleshoot_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/troubleshoot_container"] +[node name="troubleshoot_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/troubleshoot_container"] layout_mode = 2 text = "TK_TROUBLESHOOTLBL" -[node name="troubleshoot_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/troubleshoot_container"] +[node name="troubleshoot_separator" type="HSeparator" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/troubleshoot_container"] layout_mode = 2 -[node name="check_conn_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/troubleshoot_container"] +[node name="check_conn_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/troubleshoot_container"] layout_mode = 2 text = "TK_CHECKCONN" -[node name="logs_button" type="OptionButton" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/troubleshoot_container"] +[node name="logs_button" type="OptionButton" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/troubleshoot_container"] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 4 @@ -847,61 +865,61 @@ popup/item_2/id = 2 popup/item_3/text = "Retroarch" popup/item_3/id = 3 -[node name="reset_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer"] +[node name="reset_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer"] layout_mode = 2 -[node name="reset_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/reset_container"] +[node name="reset_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/reset_container"] layout_mode = 2 text = "TK_RESET" -[node name="reset_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/reset_container"] +[node name="reset_separator" type="HSeparator" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/reset_container"] layout_mode = 2 -[node name="reset_single_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/reset_container"] +[node name="reset_single_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/reset_container"] layout_mode = 2 text = "TK_RESETSINGLE" -[node name="reset_all_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/reset_container"] +[node name="reset_all_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/reset_container"] layout_mode = 2 text = "TK_RESETALL" -[node name="reset_full_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/reset_container"] +[node name="reset_full_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/reset_container"] layout_mode = 2 text = "TK_RESETFULL" -[node name="controls_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer"] +[node name="controls_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer"] layout_mode = 2 -[node name="controls_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container"] +[node name="controls_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container"] layout_mode = 2 text = "TK_CONTROLS" -[node name="controls_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container"] +[node name="controls_separator" type="HSeparator" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container"] layout_mode = 2 -[node name="controller_templates_container" type="HBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container"] +[node name="controller_templates_container" type="HBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container"] layout_mode = 2 -[node name="controller_templates" type="Label" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container/controller_templates_container"] +[node name="controller_templates" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container/controller_templates_container"] layout_mode = 2 size_flags_horizontal = 3 text = "TK_STEAMCONTEMP" -[node name="controller_templater_install_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container/controller_templates_container"] +[node name="controller_templater_install_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container/controller_templates_container"] layout_mode = 2 size_flags_horizontal = 10 size_flags_vertical = 4 text = "TK_INSTALL" -[node name="button_layout_container" type="HBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container"] +[node name="button_layout_container" type="HBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/controls_container"] layout_mode = 2 -[node name="status_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT"] +[node name="status_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT"] unique_name_in_owner = true layout_mode = 2 text = "Status:" -[node name="status_code_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/status_label"] +[node name="status_code_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_TROUBLESHOOT/status_label"] unique_name_in_owner = true layout_mode = 0 offset_left = 87.0 @@ -909,52 +927,52 @@ offset_top = 3.0 offset_right = 144.0 offset_bottom = 35.0 -[node name="TK_CONFIGURATOR" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] +[node name="Settings" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] visible = false layout_mode = 2 metadata/_tab_index = 5 -[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR"] +[node name="ScrollContainer" type="ScrollContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings"] layout_mode = 2 follow_focus = true -[node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme_override_constants/separation = 64 -[node name="system_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer"] +[node name="system_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer/VBoxContainer"] layout_mode = 2 -[node name="system_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer/system_container"] +[node name="system_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer/VBoxContainer/system_container"] layout_mode = 2 text = "TK_SYSTEM" -[node name="system_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer/system_container"] +[node name="system_separator" type="HSeparator" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer/VBoxContainer/system_container"] layout_mode = 2 -[node name="update_notification" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer/system_container"] +[node name="update_notification" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer/VBoxContainer/system_container"] layout_mode = 2 button_pressed = true text = "TK_UPDATENOTIF" -[node name="easter_eggs" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer/system_container"] +[node name="easter_eggs" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer/VBoxContainer/system_container"] layout_mode = 2 disabled = true button_pressed = true text = "TK_EASTEREGGS" -[node name="multi_user_container" type="HBoxContainer" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer/system_container"] +[node name="multi_user_container" type="HBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer/VBoxContainer/system_container"] layout_mode = 2 -[node name="multi_user_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer/system_container/multi_user_container"] +[node name="multi_user_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer/VBoxContainer/system_container/multi_user_container"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 1 text = "TK_MULTIUSR" -[node name="multi_user_option" type="OptionButton" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer/system_container/multi_user_container"] +[node name="multi_user_option" type="OptionButton" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer/VBoxContainer/system_container/multi_user_container"] layout_mode = 2 size_flags_horizontal = 10 selected = 0 @@ -965,17 +983,17 @@ popup/item_1/id = 1 popup/item_2/text = "TK_CUSTOMUSR" popup/item_2/id = 2 -[node name="menu_music" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer/system_container"] +[node name="menu_music" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer/VBoxContainer/system_container"] layout_mode = 2 button_pressed = true text = "TK_MUSIC" -[node name="fancy_audio_player_here_(please_no)" type="Label" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer/system_container"] +[node name="fancy_audio_player_here_(please_no)" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer/VBoxContainer/system_container"] layout_mode = 2 size_flags_vertical = 1 text = "|| ------( )--------" -[node name="theme_optionbutton" type="OptionButton" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR/ScrollContainer/VBoxContainer"] +[node name="theme_optionbutton" type="OptionButton" parent="Background/SplitContainer/MarginContainer/TabContainer/Settings/ScrollContainer/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 selected = 0 @@ -992,20 +1010,20 @@ popup/item_3/id = 3 popup/item_4/text = "OpenDyslexic3" popup/item_4/id = 4 -[node name="TK_ABOUT" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] +[node name="TK_ABOUT" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] visible = false layout_mode = 2 script = ExtResource("4_m4rto") metadata/_tab_index = 6 -[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_ABOUT"] +[node name="ScrollContainer" type="ScrollContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_ABOUT"] layout_mode = 2 -[node name="about_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_ABOUT/ScrollContainer"] +[node name="about_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_ABOUT/ScrollContainer"] layout_mode = 2 alignment = 1 -[node name="rd_title" type="RichTextLabel" parent="Background/MarginContainer/TabContainer/TK_ABOUT/ScrollContainer/about_container"] +[node name="rd_title" type="RichTextLabel" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_ABOUT/ScrollContainer/about_container"] unique_name_in_owner = true clip_contents = false custom_minimum_size = Vector2(300, 150) @@ -1015,7 +1033,7 @@ scroll_active = false autowrap_mode = 2 tab_size = 2 -[node name="logo" type="TextureRect" parent="Background/MarginContainer/TabContainer/TK_ABOUT/ScrollContainer/about_container/rd_title"] +[node name="logo" type="TextureRect" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_ABOUT/ScrollContainer/about_container/rd_title"] custom_minimum_size = Vector2(128, 128) layout_mode = 2 offset_left = 166.0 @@ -1028,7 +1046,7 @@ texture = ExtResource("1_axfei") expand_mode = 1 stretch_mode = 4 -[node name="about_header" type="RichTextLabel" parent="Background/MarginContainer/TabContainer/TK_ABOUT/ScrollContainer/about_container"] +[node name="about_header" type="RichTextLabel" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_ABOUT/ScrollContainer/about_container"] clip_contents = false custom_minimum_size = Vector2(0, 40) layout_mode = 2 @@ -1037,46 +1055,26 @@ theme_override_font_sizes/normal_font_size = 23 text = "TK_ABOUTHEADER" scroll_active = false -[node name="GridContainer" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_ABOUT/ScrollContainer/about_container"] +[node name="GridContainer" type="GridContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/TK_ABOUT/ScrollContainer/about_container"] unique_name_in_owner = true layout_mode = 2 theme_override_constants/h_separation = 20 theme_override_constants/v_separation = 20 columns = 5 -[node name="side_logo" type="Control" parent="Background"] -layout_mode = 1 -anchors_preset = 6 -anchor_left = 1.0 -anchor_top = 0.5 -anchor_right = 1.0 -anchor_bottom = 0.5 -offset_left = -254.0 -offset_top = -277.0 -offset_right = -14.0 -offset_bottom = -42.0 -grow_horizontal = 0 -grow_vertical = 2 - -[node name="TextureRect" type="TextureRect" parent="Background/side_logo"] -visible = false -layout_mode = 0 -offset_left = -82.0 -offset_top = -120.0 -offset_right = 247.0 -offset_bottom = 676.0 -texture = ExtResource("15_qdvxo") -expand_mode = 1 - -[node name="logo_animated" type="AnimatedSprite2D" parent="Background/side_logo"] +[node name="logo_animated" type="AnimatedSprite2D" parent="Background/SplitContainer/MarginContainer"] unique_name_in_owner = true -position = Vector2(138, 53) +visible = false +position = Vector2(1374, 104) scale = Vector2(0.28, 0.288333) sprite_frames = SubResource("SpriteFrames_lhf2y") frame = 4 frame_progress = 1.0 -[node name="rekku" type="Control" parent="Background/side_logo"] +[node name="side_logo" type="Control" parent="Background/SplitContainer"] +layout_mode = 2 + +[node name="rekku" type="Control" parent="Background/SplitContainer/side_logo"] visible = false layout_mode = 1 anchors_preset = 7 @@ -1094,32 +1092,48 @@ mouse_filter = 1 mouse_default_cursor_shape = 8 script = ExtResource("4_nqqx3") -[node name="speach_bubble" type="Panel" parent="Background/side_logo/rekku"] +[node name="rekku_sprite" type="Sprite2D" parent="Background/SplitContainer/side_logo/rekku"] +position = Vector2(530.5, -989) +scale = Vector2(0.264648, 0.302734) +texture = ExtResource("32_omdu2") + +[node name="blink_anim" type="AnimatedSprite2D" parent="Background/SplitContainer/side_logo/rekku/rekku_sprite"] +sprite_frames = SubResource("SpriteFrames_k7pd1") +animation = &"blink" +autoplay = "blink" +frame_progress = 0.188668 + +[node name="speech_anim" type="AnimatedSprite2D" parent="Background/SplitContainer/side_logo/rekku/rekku_sprite"] +sprite_frames = SubResource("SpriteFrames_l20mt") +animation = &"speech" +autoplay = "speech" + +[node name="speach_bubble" type="Panel" parent="Background/SplitContainer/side_logo/rekku"] layout_mode = 1 anchors_preset = 7 anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -offset_left = 303.0 -offset_top = -437.0 -offset_right = 638.0 -offset_bottom = -7.0 +offset_left = 395.0 +offset_top = -830.0 +offset_right = 673.0 +offset_bottom = -402.0 grow_horizontal = 2 grow_vertical = 0 theme_override_styles/panel = SubResource("StyleBoxTexture_rf0rc") -[node name="helper_text" type="RichTextLabel" parent="Background/side_logo/rekku/speach_bubble"] +[node name="helper_text" type="RichTextLabel" parent="Background/SplitContainer/side_logo/rekku"] layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -152.5 -offset_top = -201.0 -offset_right = 167.5 -offset_bottom = 213.0 +offset_left = 414.0 +offset_top = -815.0 +offset_right = 668.0 +offset_bottom = -420.0 grow_horizontal = 2 grow_vertical = 2 text = "Rekku: @@ -1130,23 +1144,17 @@ fit_content = true scroll_following = true script = ExtResource("5_cprkf") -[node name="rekku_sprite" type="Sprite2D" parent="Background/side_logo/rekku"] -position = Vector2(466, -653.5) -scale = Vector2(0.271484, 0.264648) -texture = ExtResource("32_omdu2") +[node name="TextureRect" type="TextureRect" parent="Background/SplitContainer/side_logo"] +visible = false +layout_mode = 0 +offset_left = -82.0 +offset_top = -120.0 +offset_right = 247.0 +offset_bottom = 676.0 +texture = ExtResource("15_qdvxo") +expand_mode = 1 -[node name="blink_anim" type="AnimatedSprite2D" parent="Background/side_logo/rekku/rekku_sprite"] -sprite_frames = SubResource("SpriteFrames_k7pd1") -animation = &"blink" -autoplay = "blink" -frame_progress = 0.188668 - -[node name="speech_anim" type="AnimatedSprite2D" parent="Background/side_logo/rekku/rekku_sprite"] -sprite_frames = SubResource("SpriteFrames_l20mt") -animation = &"speech" -autoplay = "speech" - -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Background"] stream = ExtResource("3_xivj6") volume_db = -11.243 @@ -1261,8 +1269,7 @@ popup/item_5/id = 5 popup/item_6/icon = ExtResource("11_ri2fv") popup/item_6/id = 6 -[connection signal="pressed" from="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container/GridContainer3/quick_resume_adv_button" to="." method="_on_quickresume_advanced_pressed"] -[connection signal="pressed" from="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container/bios_button" to="." method="_on_bios_button_pressed"] -[connection signal="pressed" from="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container/bios_button_expert" to="." method="_on_bios_button_expert_pressed"] +[connection signal="pressed" from="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container/bios_button" to="." method="_on_bios_button_pressed"] +[connection signal="pressed" from="Background/SplitContainer/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container/bios_button_expert" to="." method="_on_bios_button_expert_pressed"] [connection signal="pressed" from="coltroller_guide/controller_guide_text/exit_button" to="." method="_on_exit_button_pressed"] [connection signal="item_selected" from="coltroller_guide/controller_guide_text/locale_option" to="." method="_on_locale_selected"] diff --git a/tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres b/tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres index d9ac3d3a..ce995125 100644 --- a/tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres +++ b/tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres @@ -1087,7 +1087,7 @@ cache/0/16/0/glyphs/95/uv_rect = Rect2(92, 148, 6, 1) cache/0/16/0/glyphs/95/texture_idx = 0 cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) -[sub_resource type="Image" id="Image_cwno6"] +[sub_resource type="Image" id="Image_5erl7"] data = { "data": PackedByteArray("4ODg4ODg4OD//////////+Dg4ODg4ODg///////////g4ODg4ODg4P//////////4ODg4ODg4OD//////////+Dg4ODg4ODg///////////g4ODg4ODg4P//////////4ODg4ODg4OD//////////+Dg4ODg4ODg/////////////////////+Dg4ODg4ODg///////////g4ODg4ODg4P//////////4ODg4ODg4OD//////////+Dg4ODg4ODg///////////g4ODg4ODg4P//////////4ODg4ODg4OD//////////+Dg4ODg4ODg///////////g4ODg4ODg4A=="), "format": "Lum8", @@ -1097,9 +1097,9 @@ data = { } [sub_resource type="ImageTexture" id="447"] -image = SubResource("Image_cwno6") +image = SubResource("Image_5erl7") -[sub_resource type="Image" id="Image_78psa"] +[sub_resource type="Image" id="Image_u2s1p"] data = { "data": PackedByteArray("AAQACgARABkAHwAiACQAJAAkACQAIgAfABkAEQAKAAQACgAVACUANAA/AEYARwBIAEgARwBGAD8ANAAlABUACgARACU/d1rvVv9W/1b/Vv9W/1b/Vv9W/1rvP3cAJQARABkANFnvSP9E/0P/Q/9D/0P/Q/9D/0T/SP9Z7wA0ABkAHwA/VP9D/0P/Q/9D/0P/Q/9D/0P/Q/9D/1T/AD8AHwAiAEZS/0L/Qv9C/0L/Qv9C/0L/Qv9C/0L/Uv8ARgAiACQAR1H/QP9A/0D/QP9A/0D/QP9A/0D/QP9R/wBHACQAJABIT/8//z//P/8//z//P/8//z//P/8//0//AEgAJAAkAEhN/z7/Pv8+/z7/Pv8+/z7/Pv8+/z7/Tf8ASAAkACQAR0z/Pf89/z3/Pf89/z3/Pf89/z3/Pf9M/wBHACQAIgBGSv87/zv/O/87/zv/O/87/zv/O/87/0r/AEYAIgAfAD9J/zr/Ov86/zr/Ov86/zr/Ov86/zr/Sf8APwAfABkANEvvPf85/zn/Of85/zn/Of85/zn/Pf9L7wA0ABkAEQAlNXdK70f/Rv9G/0b/Rv9G/0b/R/9K7TV3ACUAEQAKABUAJQA0AD8ARgBHAEgASABHAEYAPwA0ACUAFQAKAAQACgARABkAHwAiACQAJAAkACQAIgAfABkAEQAKAAQ="), "format": "LumAlpha8", @@ -1109,7 +1109,7 @@ data = { } [sub_resource type="ImageTexture" id="53"] -image = SubResource("Image_78psa") +image = SubResource("Image_u2s1p") [sub_resource type="StyleBoxTexture" id="54"] content_margin_left = 6.0 @@ -1123,7 +1123,7 @@ expand_margin_right = 2.0 expand_margin_bottom = 2.0 region_rect = Rect2(0, 0, 16, 16) -[sub_resource type="Image" id="Image_6w4th"] +[sub_resource type="Image" id="Image_7jtn8"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEeMvw5HjL85R4y/aEeMv3pHjL97R4y/e0eMv3tHjL97R4y/ekeMv2hHjL85R4y/DgAAAAAAAAAAAAAAAAAAAABHjL86R4y/dEeMvxBHjL8IR4y/CEeMvwhHjL8IR4y/CEeMvwhHjL8QR4y/dEeMvzoAAAAAAAAAAAAAAAAAAAAAR4y/aUeMvw8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEeMvw9HjL9pAAAAAAAAAAAAAAAAAAAAAEeMv3tHjL8GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABHjL8GR4y/ewAAAAAAAAAAAAAAAAAAAABHjL97R4y/CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAR4y/CEeMv3sAAAAAAAAAAAAAAAAAAAAAR4y/e0eMvwgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEeMvwhHjL97AAAAAAAAAAAAAAAAAAAAAEeMv3tHjL8IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABHjL8IR4y/ewAAAAAAAAAAAAAAAAAAAABHjL97R4y/CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAR4y/CEeMv3sAAAAAAAAAAAAAAAAAAAAAR4y/e0eMvwYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEeMvwZHjL97AAAAAAAAAAAAAAAAAAAAAEeMv2lHjL8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABHjL8OR4y/aQAAAAAAAAAAAAAAAAAAAABHjL86R4y/dUeMvw9HjL8IR4y/CEeMvwhHjL8IR4y/CEeMvwhHjL8RR4y/dEeMvzoAAAAAAAAAAAAAAAAAAAAAR4y/DkeMvzpHjL9oR4y/ekeMv3tHjL97R4y/e0eMv3tHjL96R4y/aEeMvzlHjL8OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), "format": "RGBA8", @@ -1133,7 +1133,7 @@ data = { } [sub_resource type="ImageTexture" id="56"] -image = SubResource("Image_6w4th") +image = SubResource("Image_7jtn8") [sub_resource type="StyleBoxTexture" id="57"] content_margin_left = 6.0 @@ -1147,7 +1147,7 @@ expand_margin_right = 2.0 expand_margin_bottom = 2.0 region_rect = Rect2(0, 0, 16, 16) -[sub_resource type="Image" id="Image_3ny84"] +[sub_resource type="Image" id="Image_vhvkw"] data = { "data": PackedByteArray("AAAABAAAAAoAAAARAAAAGQAAAB8AAAAiAAAAJAAAACQAAAAkAAAAJAAAACIAAAAfAAAAGQAAABEAAAAKAAAABAAAAAoAAAAVAAAAJQAAADQAAAA/AAAARgAAAEcAAABIAAAASAAAAEcAAABGAAAAPwAAADQAAAAlAAAAFQAAAAoAAAARAAAAJUJAS3dfWmzvW1do/1pWZ/9aVmf/WlZn/1pWZ/9aVmf/WlZn/1tXaP9fWmzvQkBLdwAAACUAAAARAAAAGQAAADRfWmvvTUpX/0lGUv9IRVH/SEVR/0hFUf9IRVH/SEVR/0hFUf9JRlL/TUpX/19aa+8AAAA0AAAAGQAAAB8AAAA/W1dm/0lGUv9IRVH/SEVR/0hFUf9IRVH/SEVR/0hFUf9IRVH/SEVR/0lGUv9bV2b/AAAAPwAAAB8AAAAiAAAARllVZP9HRFD/R0RQ/0dEUP9HRFD/R0RQ/0dEUP9HRFD/R0RQ/0dEUP9HRFD/WVVk/wAAAEYAAAAiAAAAJAAAAEdYVGT/RkNQ/0ZDUP9GQ1D/RkNQ/0ZDUP9GQ1D/RkNQ/0ZDUP9GQ1D/RkNQ/1hUZP8AAABHAAAAJAAAACQAAABIVlNj/0VCT/9FQk//RUJP/0VCT/9FQk//RUJP/0VCT/9FQk//RUJP/0VCT/9WU2P/AAAASAAAACQAAAAkAAAASFZTYv9FQk7/RUJO/0VCTv9FQk7/RUJO/0VCTv9FQk7/RUJO/0VCTv9FQk7/VlNi/wAAAEgAAAAkAAAAJAAAAEdVUWL/REFO/0RBTv9EQU7/REFO/0RBTv9EQU7/REFO/0RBTv9EQU7/REFO/1VRYv8AAABHAAAAJAAAACIAAABGVVFg/0RBTf9EQU3/REFN/0RBTf9EQU3/REFN/0RBTf9EQU3/REFN/0RBTf9VUWD/AAAARgAAACIAAAAfAAAAP1VRYP9EQU3/Q0BM/0NATP9DQEz/Q0BM/0NATP9DQEz/Q0BM/0NATP9EQU3/VVFg/wAAAD8AAAAfAAAAGQAAADRWU2TvR0NR/0M/Tf9CP0z/Qj9M/0I/TP9CP0z/Qj9M/0I/TP9DP03/R0NR/1dTZO8AAAA0AAAAGQAAABEAAAAlPjtGd1dTY+9TUF//U09e/1NPXv9TT17/U09e/1NPXv9TT17/U1Bf/1dTY+0+O0Z3AAAAJQAAABEAAAAKAAAAFQAAACUAAAA0AAAAPwAAAEYAAABHAAAASAAAAEgAAABHAAAARgAAAD8AAAA0AAAAJQAAABUAAAAKAAAABAAAAAoAAAARAAAAGQAAAB8AAAAiAAAAJAAAACQAAAAkAAAAJAAAACIAAAAfAAAAGQAAABEAAAAKAAAABA=="), "format": "RGBA8", @@ -1157,7 +1157,7 @@ data = { } [sub_resource type="ImageTexture" id="59"] -image = SubResource("Image_3ny84") +image = SubResource("Image_vhvkw") [sub_resource type="StyleBoxTexture" id="60"] content_margin_left = 6.0 @@ -1175,7 +1175,7 @@ expand_margin_right = 2.0 expand_margin_bottom = 2.0 region_rect = Rect2(0, 0, 16, 16) -[sub_resource type="Image" id="Image_c8ssd"] +[sub_resource type="Image" id="Image_djtfc"] data = { "data": PackedByteArray("AAAABAAAAAoAAAARAAAAGQAAAB8AAAAiAAAAJAAAACQAAAAkAAAAJAAAACIAAAAfAAAAGQAAABEAAAAKAAAABAAAAAoAAAAVAAAAJQAAADQAAAA/AAAARgAAAEcAAABIAAAASAAAAEcAAABGAAAAPwAAADQAAAAlAAAAFQAAAAoAAAARAAAAJTw6RHdWU2HvUlBd/1FPXf9RT13/UU9d/1FPXf9RT13/UU9d/1JQXf9WU2HvPDpEdwAAACUAAAARAAAAGQAAADRWUmDvRkJO/0I+Sv9BPkn/QT5J/0E+Sf9BPkn/QT5J/0E+Sf9CPkr/RkJO/1ZSYO8AAAA0AAAAGQAAAB8AAAA/UU5b/0E+Sf9APkj/QD5I/0A+SP9APkj/QD5I/0A+SP9APkj/QD5I/0E+Sf9RTlv/AAAAPwAAAB8AAAAiAAAARk9MWf8/PUf/Pz1H/z89R/8/PUf/Pz1H/z89R/8/PUf/Pz1H/z89R/8/PUf/T0xZ/wAAAEYAAAAiAAAAJAAAAEdOSlj/PjtG/z47Rv8+O0b/PjtG/z47Rv8+O0b/PjtG/z47Rv8+O0b/PjtG/05KWP8AAABHAAAAJAAAACQAAABIS0lV/zw6RP88OkT/PDpE/zw6RP88OkT/PDpE/zw6RP88OkT/PDpE/zw6RP9LSVX/AAAASAAAACQAAAAkAAAASEpHVP87OUP/OzlD/zs5Q/87OUP/OzlD/zs5Q/87OUP/OzlD/zs5Q/87OUP/SkdU/wAAAEgAAAAkAAAAJAAAAEdJRlP/OjhC/zo4Qv86OEL/OjhC/zo4Qv86OEL/OjhC/zo4Qv86OEL/OjhC/0lGU/8AAABHAAAAJAAAACIAAABGR0VQ/zk3QP85N0D/OTdA/zk3QP85N0D/OTdA/zk3QP85N0D/OTdA/zk3QP9HRVD/AAAARgAAACIAAAAfAAAAP0dDUP84NT//ODU//zg1P/84NT//ODU//zg1P/84NT//ODU//zg1P/84NT//R0NQ/wAAAD8AAAAfAAAAGQAAADRHRFLvOjhC/zY0Pv82ND7/NjQ+/zY0Pv82ND7/NjQ+/zY0Pv82ND7/OjhC/0dEUu8AAAA0AAAAGQAAABEAAAAlMzE5d0dEUO9EQk3/REFM/0RBTP9EQUz/REFM/0RBTP9EQUz/REJN/0dEUe0zMTl3AAAAJQAAABEAAAAKAAAAFQAAACUAAAA0AAAAPwAAAEYAAABHAAAASAAAAEgAAABHAAAARgAAAD8AAAA0AAAAJQAAABUAAAAKAAAABAAAAAoAAAARAAAAGQAAAB8AAAAiAAAAJAAAACQAAAAkAAAAJAAAACIAAAAfAAAAGQAAABEAAAAKAAAABA=="), "format": "RGBA8", @@ -1185,7 +1185,7 @@ data = { } [sub_resource type="ImageTexture" id="62"] -image = SubResource("Image_c8ssd") +image = SubResource("Image_djtfc") [sub_resource type="StyleBoxTexture" id="63"] content_margin_left = 6.0 @@ -1199,7 +1199,7 @@ expand_margin_right = 2.0 expand_margin_bottom = 2.0 region_rect = Rect2(0, 0, 16, 16) -[sub_resource type="Image" id="Image_4lf0a"] +[sub_resource type="Image" id="Image_dfxxt"] data = { "data": PackedByteArray("AAAABAAAAAoAAAARAAAAGQAAAB8AAAAiAAAAJAAAACQAAAAkAAAAJAAAACIAAAAfAAAAGQAAABEAAAAKAAAABAAAAAsAAAAWAAAAJwAAADYAAABBAAAASQAAAEoAAABLAAAASwAAAEoAAABJAAAAQQAAADYAAAAnAAAAFgAAAAsAAAATAAAAKTEvN4BGQ0/xQ0BM/0JAS/9CQEv/QkBL/0JAS/9CQEv/QkBL/0NATP9GQ0/xMS83fwAAACkAAAATAAAAHgAAAD1HRFDyOjhB/wsLDP8LCgz/CwoM/wsKDP8LCgz/CwsM/wsLDP8LCwz/OjhB/0dEUPIAAAA9AAAAHgAAACcAAABNREJO/w8OEf8PDhH/Dw4R/w8OEf8PDhH/Dw4R/w8OEf8PDhH/Dw4R/w8OEf9EQk7/AAAATQAAACcAAAAsAAAAWEZCT/8UExb/ExIW/xMSFv8UExb/ExIW/xQTFv8UExb/FBMW/xQTFv8TEhb/RkJP/wAAAFgAAAAsAAAAMgAAAF1HRVD/GBcb/xgXG/8YFxv/GBcb/xgXG/8YFxv/GBcb/xkYHP8YFxv/GBcb/0dFUP8AAABdAAAAMgAAADMAAABjSUZT/x0cIf8dHCH/HRwh/x0cIf8dHCH/HRwh/x0cIf8dHCH/HRwh/x0cIf9JRlP/AAAAYwAAADMAAAA2AAAAZkpHVP8iISf/IiEn/yIhJ/8iISf/IiEn/yIhJ/8iISf/IiEn/yIhJ/8iISf/SkdU/wAAAGYAAAA2AAAAOQAAAGlLSVX/JyYt/ycmLf8nJi3/JyYt/ycmLf8nJi3/JyYt/ygmLf8nJi3/KCYt/0tJVf8AAABpAAAAOQAAADgAAABsTkpY/y0rM/8tKzP/LSsz/y0rM/8tKzP/LSsz/y0rM/8tKzP/LSsz/y0rM/9OSlj/AAAAbAAAADgAAAA1AAAAZVBNWv8zMTr/MzE5/zMxOf8zMTn/MzE5/zMxOf8zMTn/MzE5/zMxOf8zMTr/UE1a/wAAAGUAAAA1AAAALQAAAFlVUl/8RUJN/zk3QP84N0D/OTdA/zg3QP84N0D/ODdA/zg3QP86N0H/RUJN/1VSYPwAAABZAAAALQAAACAAAABEPTpFtFZSYP1STlz/UU5b/1FOW/9RTlv/UU5b/1FOW/9RTlv/Uk5c/1ZSYP09OkW0AAAARAAAACAAAAAUAAAAKAAAAEUAAABdAAAAbgAAAHkAAAB6AAAAfAAAAHwAAAB6AAAAeQAAAG4AAABdAAAARQAAACgAAAAUAAAACAAAABQAAAAhAAAAMAAAADoAAAA/AAAAQwAAAEMAAABDAAAAQwAAAD8AAAA6AAAAMAAAACEAAAAUAAAACA=="), "format": "RGBA8", @@ -1209,7 +1209,7 @@ data = { } [sub_resource type="ImageTexture" id="65"] -image = SubResource("Image_4lf0a") +image = SubResource("Image_dfxxt") [sub_resource type="StyleBoxTexture" id="66"] content_margin_left = 6.0 @@ -1223,7 +1223,7 @@ expand_margin_right = 2.0 expand_margin_bottom = 2.0 region_rect = Rect2(0, 0, 16, 16) -[sub_resource type="Image" id="Image_l6tdu"] +[sub_resource type="Image" id="Image_cu3dl"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/wAAAADf39+IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAODg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P8AAAAA4ODg/9/f34gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADg4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/AAAAAODg4P/g4OD/39/fiAAAAAAAAAAAAAAAAAAAAAAAAAAA4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/wAAAADg4OD/4ODg/+Dg4P/f39+IAAAAAAAAAAAAAAAAAAAAAODg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADg4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P8AAAAAAAAAAAAAAAAAAAAA4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/AAAAAAAAAAAAAAAAAAAAAODg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/wAAAAAAAAAAAAAAAAAAAADg4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P8AAAAAAAAAAAAAAAAAAAAA4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/AAAAAAAAAAAAAAAAAAAAAODg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/wAAAAAAAAAAAAAAAAAAAADg4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P8AAAAAAAAAAAAAAAAAAAAA4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/AAAAAAAAAAAAAAAAAAAAAODg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), "format": "RGBA8", @@ -1233,9 +1233,9 @@ data = { } [sub_resource type="ImageTexture" id="425"] -image = SubResource("Image_l6tdu") +image = SubResource("Image_cu3dl") -[sub_resource type="Image" id="Image_afyw0"] +[sub_resource type="Image" id="Image_06k3s"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4MXg/+D/4P/g/+D/4P/gwwAAAAAAAAAAAAAAAAAAAADg/+D/4P/g/+D/4P/g/+D/AAAAAAAAAAAAAAAAAAAAAOD/4P/g/+D/4P/g/+D/4P/hPAAAAAAAAAAAAAAAAAAA4P/g/+D/4P/g/+D/4P/g/+D/4P/g/+D/4P/gwwAAAADg/+D/4P/g/+D/4P/g/+D/4P/g/+D/4P/g/+D/AAAAAOD/4P/g/+D/4P/g/+D/4P/g/+D/4P/g/+D/4P8AAAAA4P/g/+D/4P/g/+D/4P/g/+D/4P/g/+D/4P/g/wAAAADg/+D/4P/g/+D/4P/g/+D/4P/g/+D/4P/g/+D/AAAAAOD/4P/g/+D/4P/g/+D/4P/g/+D/4P/g/+D/4P8AAAAA4P/g/+D/4P/g/+D/4P/g/+D/4P/g/+D/4P/g/wAAAADg/+D/4P/g/+D/4P/g/+D/4P/g/+D/4P/g/+D/AAAAAODD4P/g/+D/4P/g/+D/4P/g/+D/4P/g/+D/38IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="), "format": "LumAlpha8", @@ -1245,9 +1245,9 @@ data = { } [sub_resource type="ImageTexture" id="427"] -image = SubResource("Image_afyw0") +image = SubResource("Image_06k3s") -[sub_resource type="Image" id="Image_vvdgo"] +[sub_resource type="Image" id="Image_g0jqc"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3hfgz+DO3hcAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Bbh0uD+4P7g1+AZAAAAAAAAAAAAAAAAAAAAAAAA3Bbh0uD+4P7g/uD+4NfgGQAAAAAAAAAAAAAAAAAA3hfg1OD+4NHg/uD94dLg/uDU3hcAAAAAAAAAAAAAAADgzeD+4NDcFuD+4P3bFeDR4P7gzAAAAAAAAAAAAAAAAOC+4MXZFP8B4P7g/QAA2xXhyeDFAAAAAAAAAAAAAAAAAAAAAAAA/wHg/uD9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AeD+4P0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4MThwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="), "format": "LumAlpha8", @@ -1257,9 +1257,9 @@ data = { } [sub_resource type="ImageTexture" id="429"] -image = SubResource("Image_vvdgo") +image = SubResource("Image_g0jqc") -[sub_resource type="Image" id="Image_rcb5g"] +[sub_resource type="Image" id="Image_gk346"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADbB99u4Mfg8+Dz4MfebdsHAAAAAAAAAAAAAAAAAADjG+DP4P7g/uD+4P7g/uD+4M7jGwAAAAAAAAAAAADbB+DP4P7g4eBT2A3YDd9Q4Nfg/uDO2wcAAAAAAAAAAN9u4P7g4eMSAAAAAAAAAADhEeDh4P7ebAAAAAAAAAAA4Mjg/uBTAAAAAAAAAAAAAAAA3lXg/uDGAAAAAAAAAADg8uD+2A0AAAAAAAAAAAAAAADbDuD+4PEAAAAA4J7g/uD+4P7g/uCeAAAAAAAAAAAAAN0P4P7g8QAAAADoC+DU4P7g/uDU6AsAAAAAAAAAAAAA3lbg/uDGAAAAAAAA4Svg8+Dz4SsAAAAAAAAAAAAA5BPh4uD+3mwAAAAAAAAAAN9g32AAAAAAAAAAANsO3lbh4uD+4M7VBgAAAAAAAAAAAAAAAAAAAAAAAAAA4P7g/uD+4M7jGwAAAAAAAAAAAAAAAAAAAAAAAAAAAADg8uDF3mzVBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="), "format": "LumAlpha8", @@ -1269,9 +1269,9 @@ data = { } [sub_resource type="ImageTexture" id="431"] -image = SubResource("Image_rcb5g") +image = SubResource("Image_gk346") -[sub_resource type="Image" id="Image_g8khm"] +[sub_resource type="Image" id="Image_srd7s"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA39/fCN7e3mzg4ODF4ODg9ODg4PPg4ODF3t7ebePj4wkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3t7eLuDg4Njg4OD+4ODg/uDg4P7g4OD+4ODg/uDg4P7h4eHa4ODgMgAAAAAAAAAAAAAAAAAAAAAAAAAA3t7eL+Dg4PDg4OD+4ODg4eDg4FPY2NgN2NjYDd/f31Dg4ODX4ODg/uDg4PLh4eEzAAAAAAAAAAAAAAAA4+PjCeDg4Nzg4OD+4ODg4ePj4xIAAAAAAAAAAAAAAAAAAAAA4eHhEeDg4OHg4OD+4ODg3+bm5goAAAAAAAAAAN/f33fg4OD+4ODg/uDg4FMAAAAA4ODgS+Dg4OPh4eHi4ODgSQAAAADe3t5V4ODg/uDg4P7f3995AAAAAAAAAADh4eHa4ODg/uDg4P7Y2NgNAAAAAOHh4eLg4OD+4ODg/uDg4OEAAAAA29vbDuDg4P7g4OD+4eHh2gAAAAAAAAAA4ODg2+Dg4P7g4OD+2NjYDQAAAADh4eHi4ODg/uDg4P7g4ODhAAAAAN3d3Q/g4OD+4ODg/uDg4NsAAAAAAAAAAN7e3nzg4OD+4ODg/t/f31AAAAAA4ODgSeHh4eLg4ODh39/fSAAAAADe3t5W4ODg/uDg4P7g4OB7AAAAAAAAAADV1dUM4ODg4+Dg4P7g4ODX4eHhEQAAAAAAAAAAAAAAAAAAAADk5OQT4eHh4uDg4P7g4ODh1dXVDAAAAAAAAAAAAAAAAN/f3zjg4OD04ODg/uDg4OHe3t5V29vbDtvb2w7e3t5W4eHh4uDg4P7g4OD03t7eNgAAAAAAAAAAAAAAAAAAAAAAAAAA39/fN+Dg4N7g4OD+4ODg/uDg4P7g4OD+4ODg/uDg4P7g4ODd3t7eNgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADm5uYK39/fcODg4MXg4ODz4ODg8+Dg4MXf399u5ubmCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), "format": "RGBA8", @@ -1281,7 +1281,7 @@ data = { } [sub_resource type="ImageTexture" id="433"] -image = SubResource("Image_g8khm") +image = SubResource("Image_srd7s") [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_g6bu4"] texture = ExtResource("1_ak8qr") @@ -1359,7 +1359,7 @@ region = Rect2(96, 96, 16, 16) atlas = ExtResource("1_ak8qr") region = Rect2(96, 80, 16, 16) -[sub_resource type="Image" id="Image_nnsbf"] +[sub_resource type="Image" id="Image_0m0km"] data = { "data": PackedByteArray("AAAAAJiYmHlOTk4xAAAAAAAAAACNjY15Tk5OMQAAAAAAAAAAgoKCeU5OTjEAAAAAAAAAAE5OTjFOTk4cAAAAAAAAAAA4VV8AOFVfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjKy4ADhVXwAAAAAAAAAAAIGirQA4VV8AAAAAAAAAAACYmJh5Tk5OMQAAAAAAAAAAjY2NeU5OTjEAAAAAAAAAAIKCgnlOTk4xAAAAAA=="), "format": "RGBA8", @@ -1369,7 +1369,7 @@ data = { } [sub_resource type="ImageTexture" id="29"] -image = SubResource("Image_nnsbf") +image = SubResource("Image_0m0km") [sub_resource type="StyleBoxTexture" id="4"] content_margin_left = 6.0 @@ -1440,7 +1440,7 @@ bg_color = Color(0.490196, 0.490196, 0.490196, 1) corner_detail = 1 anti_aliasing = false -[sub_resource type="Image" id="Image_hyauu"] +[sub_resource type="Image" id="Image_qu6fu"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN9Y3BYAAAAAAAAAAAAAAADcFt9YAAAAAAAAAAAAAN9Y4P7g09wWAAAAAAAAAADcFuDT4P7fWAAAAAAAAAAA2xXf0uD/4NfgGQAAAADbFd/S4P/g198YAAAAAAAAAAAAANsV39Lg/+DX4BnbFd/S4P/g198YAAAAAAAAAAAAAAAAAADbFd/S4P/h2uDW4P/g198YAAAAAAAAAAAAAAAAAAAAAAAA2xXf1uD/4P/g298YAAAAAAAAAAAAAAAAAAAAAAAAAADbFd/W4P/g/+Db4BkAAAAAAAAAAAAAAAAAAAAAAADbFd/S4P/f2uDW4P/g1+AZAAAAAAAAAAAAAAAAAADbFd/S4P/g198Y2xXf0uD/4NfgGQAAAAAAAAAAAADbFd/S4P/g198YAAAAANsV39Lg/+DX4BkAAAAAAAAAAN9Y4P7g09wWAAAAAAAAAADcFuDT4P7fWAAAAAAAAAAAAADfWNwWAAAAAAAAAAAAAAAA3BbfWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="), "format": "LumAlpha8", @@ -1450,7 +1450,7 @@ data = { } [sub_resource type="ImageTexture" id="49"] -image = SubResource("Image_hyauu") +image = SubResource("Image_qu6fu") [sub_resource type="StyleBoxTexture" id="127"] content_margin_left = 4.0 @@ -2271,7 +2271,7 @@ texture_margin_right = 2.0 texture_margin_bottom = 2.0 region_rect = Rect2(72, 64, 8, 8) -[sub_resource type="Image" id="Image_47icn"] +[sub_resource type="Image" id="Image_vsf8e"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAc5uqs87c4bPO3OGzztzhs87c4bPO3OGzztzhs3ObqrMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), "format": "RGBA8", @@ -2281,7 +2281,7 @@ data = { } [sub_resource type="ImageTexture" id="199"] -image = SubResource("Image_47icn") +image = SubResource("Image_vsf8e") [sub_resource type="StyleBoxTexture" id="200"] texture = SubResource("199") @@ -2305,7 +2305,7 @@ texture_margin_right = 2.0 texture_margin_bottom = 2.0 region_rect = Rect2(64, 64, 8, 8) -[sub_resource type="Image" id="Image_b2np4"] +[sub_resource type="Image" id="Image_58oo7"] data = { "data": PackedByteArray("/wD//wD//wD//wD/Z3qFZnqGaHuGaHuGaHuGaHuGZnqGZ3qF/wD//wD//wD//wD//wD//wD/Z3qFZnqGV1FRTEJATUNBTUNBTUNBTUNBTEJAV1FRZnqGZ3qF/wD//wD//wD/Z3qFVkxLTEJATURBTUNBTkRCTkRCTkRCTkRCTUNBTURBTEJAV1FRZ3qF/wD//wD/ZnqGTEJATEJATUNBT0VDT0VDT0VDT0VDT0VDT0VDTUNBTEJATEJAZ3uH/wD/Z3qFV1FRTEJATEJATkRCT0RDUEVEUkZEUkZEUUZFT0RDTkRCTEJATEJAV1FRZ3qFZnqGS0A/TEJATUNBT0RDUUdFUkhGU0hHU0hHUkhGUUdFT0RDTkRCTEJAS0E/Z3uHZ3uHS0E/TEJATUNBT0RDUUdFVElGVUpHVUlHVUpHUkhGUEVETUNBTEJAS0E/aHyIZ3uHSkA+S0E/TUNBT0VDUUdFVElGVUtJVk1LVElGU0lHUEZETkRCTEJAS0E/aHyIZ3uHSkE+S0E/TEJAT0VDUUdFVElGVUtJVUtJVUpHUkhGUEZETkRCTEJASkA+aHyIZ3uHSD48S0I/S0E/TkRCUEVEUUZFU0lHU0lHUkhGUEVETkRCTEJAS0E/ST89aHyIZ3uHRj08SD48SkA+TEJATkRCT0RDUEVEUEVEUEZET0VDTEJAS0A/ST89Rz07Z3uHZ3qFV1FRRz47SUA9S0E/TEJATUNBTkRCTkRCTUNBTEJAS0E/ST89Rz07V1FRaHuG/wD/Z3uHRj08Rz07SD48ST89SkA+S0E/S0E/S0A/SkA+SD48Rz47Rz07Z3uH/wD//wD/Z3qFV1FRRTw7Rz07Rz07Rz07SD48SD48Rz07Rz07Rz47Rj08V1FRZnqG/wD//wD//wD/Z3qFZ3uHV1FRRjw6Rjw6Rz47Rz47Rjw6Rjw6V1FRZ3uHaHuG/wD//wD//wD//wD//wD//wD/ZnqGZ3uHaHyIaHyIaHyIaHyIZ3uHaHuG/wD//wD//wD//wD/"), "format": "RGB8", @@ -2315,7 +2315,7 @@ data = { } [sub_resource type="ImageTexture" id="204"] -image = SubResource("Image_b2np4") +image = SubResource("Image_58oo7") [sub_resource type="StyleBoxTexture" id="205"] texture = SubResource("204") @@ -2428,7 +2428,7 @@ axis_stretch_horizontal = 2 axis_stretch_vertical = 2 region_rect = Rect2(80, 0, 16, 8) -[sub_resource type="Image" id="Image_dpx2v"] +[sub_resource type="Image" id="Image_vwdns"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOD/4P/g/+D/4P/g/+D/4P8AAAAAAAAAAOD/4P/g/+D/4P/g/+D/4P8AAAAAAAAAAOD/4P/g/+D/4P/g/+D/4P8AAAAAAAAAAOFe4PTg/+D/4P/g/+D24WYAAAAAAAAAAAAA3yjf0uD/4P/g1+MtAAAAAAAAAAAAAAAAAADoC+Gf4Z/oCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"), "format": "LumAlpha8", @@ -2438,9 +2438,9 @@ data = { } [sub_resource type="ImageTexture" id="306"] -image = SubResource("Image_dpx2v") +image = SubResource("Image_vwdns") -[sub_resource type="Image" id="Image_ph5jy"] +[sub_resource type="Image" id="Image_8u1x6"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4P/g/+D/32AAAAAAAAAAAAAAAAAAAAAA4P/g/+D/4PThKwAAAAAAAAAAAAAAAAAA4P/g/+D/4P/g1egLAAAAAAAAAAAAAAAA4P/g/+D/4P/g/+GfAAAAAAAAAAAAAAAA4P/g/+D/4P/g/+GfAAAAAAAAAAAAAAAA4P/g/+D/4P/g1egLAAAAAAAAAAAAAAAA4P/g/+D/4PThKwAAAAAAAAAAAAAAAAAA4P/g/+D/32AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"), "format": "LumAlpha8", @@ -2450,9 +2450,9 @@ data = { } [sub_resource type="ImageTexture" id="308"] -image = SubResource("Image_ph5jy") +image = SubResource("Image_8u1x6") -[sub_resource type="Image" id="Image_nvwtr"] +[sub_resource type="Image" id="Image_naxpi"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAA/1n/FP8U/1kAAAAAAAAAAAAA/1n/FP8U/1kAAAAAAAAAAAAA/1n/FP8U/1kAAAAAAAAAAP9Z/xT/FP9ZAAAAAAAA/1n/FP8U/1kAAAAAAAD/Wf8U/xT/WQAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="), "format": "LumAlpha8", @@ -2462,9 +2462,9 @@ data = { } [sub_resource type="ImageTexture" id="292"] -image = SubResource("Image_nvwtr") +image = SubResource("Image_naxpi") -[sub_resource type="Image" id="Image_kc456"] +[sub_resource type="Image" id="Image_ksn4y"] data = { "data": PackedByteArray("FxYabx0cIe8gHiT3IR8l9yEfJfchHyX3IR8l9yAeJPcdHCHvFxYabx0cIfAkIin/KCYt/ygmLv8oJi7/KCYu/ygmLv8oJi3/JCIp/x0cIfAgHiT5KCYt/ysqMf8sKjL/LCoy/ywqMv8sKjL/Kyox/ygmLf8gHiT5IR8l9ygmLv8sKjL/LCoy/ywqMv8sKjL/LCoy/ywqMv8oJi7/IR8l9yEfJfcoJi7/LCoy/ywqMv8sKjL/LCoy/ywqMv8sKjL/KCYu/yEfJfchHyX3KCYu/ywqMv8sKjL/LCoy/ywqMv8sKjL/LCoy/ygmLv8hHyX3IR8l9ygmLv8sKjL/LCoy/ywqMv8sKjL/LCoy/ywqMv8oJi7/IR8l9yAeJPkoJi3/Kyox/ywqMv8sKjL/LCoy/ywqMv8rKjH/KCYt/yAeJPkdHCHwJCIp/ygmLf8oJi7/KCYu/ygmLv8oJi7/KCYt/yQiKf8dHCHxFxYabx0cIfAgHiT3IR8l9yEfJfchHyX3IR8l9yAeJPcdHCHuFxYabw=="), "format": "RGBA8", @@ -2474,7 +2474,7 @@ data = { } [sub_resource type="ImageTexture" id="39"] -image = SubResource("Image_kc456") +image = SubResource("Image_ksn4y") [sub_resource type="StyleBoxTexture" id="272"] content_margin_left = 0.0 @@ -2534,7 +2534,7 @@ axis_stretch_horizontal = 2 axis_stretch_vertical = 2 region_rect = Rect2(24, 40, 8, 8) -[sub_resource type="Image" id="Image_fhcfw"] +[sub_resource type="Image" id="Image_jvlbm"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABNS1kHTUtZJ01LWVBNS1lmTUtZaE1LWWhNS1loTUtZaE1LWWhNS1loWFZjarCvtYFNS1knTUtZBwAAAAAAAAAATUtZJzg3QLQgICT6Hh4i/x8fI/8fHyP/Hx8j/x8fI/8fHyP/Hx8j/4uLjf//////tra53U1LWScAAAAAAAAAAE1LWVAgICT6ICAk/yIiJ/8jIyj/IyMo/yMjKP8jIyj/IyMo/0JCR//4+Pj//v7+/1dXWvtNS1lQAAAAAAAAAABNS1lmHh4i/yIiJ/8lJSr/JSUq/05OUv8mJiv/JSUq/yUlKv/Fxcf//////6qqq/8eHiL/TUtZZgAAAAAAAAAATUtZaB8fI/8jIyj/JSUq/7i4uv//////X19j/yUlKv90dHf//////+3t7f8zMzj/Hx8j/01LWWgAAAAAAAAAAE1LWWgfHyP/IyMo/yUlKv+NjY///////7i4uf81NTn/7e3t//////90dHf/IyMo/x8fI/9NS1loAAAAAAAAAABNS1loHx8j/yMjKP8lJSr/Ojo+//v7+//6+vr/srK0///////Fxcf/JSUq/yMjKP8fHyP/TUtZaAAAAAAAAAAATUtZaB8fI/8jIyj/JSUq/yUlKv+4uLr///////7+/v/4+Pj/RUVJ/yUlKv8jIyj/Hx8j/01LWWgAAAAAAAAAAE1LWWgfHyP/IyMo/yUlKv8lJSr/YWFl////////////j4+S/yUlKv8lJSr/IyMo/x8fI/9NS1loAAAAAAAAAABNS1loHx8j/yMjKP8lJSr/JSUq/yYmK/9OTlL/Y2Nm/yoqL/8lJSr/JSUq/yMjKP8fHyP/TUtZaAAAAAAAAAAATUtZZh4eIv8iIif/JSUq/yUlKv8lJSr/JSUq/yUlKv8lJSr/JSUq/yUlKv8iIif/Hh4i/01LWWYAAAAAAAAAAE1LWVAgICT6ICAk/yIiJ/8jIyj/IyMo/yMjKP8jIyj/IyMo/yMjKP8iIif/ICAk/yAgJPtNS1lQAAAAAAAAAABNS1knODZAtCAgJPseHiL/Hx8j/x8fI/8fHyP/Hx8j/x8fI/8fHyP/Hh4i/yAgJfo4NkC0TUtZJwAAAAAAAAAATUtZB01LWSdNS1lQTUtZZk1LWWhNS1loTUtZaE1LWWhNS1loTUtZaE1LWWZNS1lQTUtZJ01LWQcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), "format": "RGBA8", @@ -2544,9 +2544,9 @@ data = { } [sub_resource type="ImageTexture" id="334"] -image = SubResource("Image_fhcfw") +image = SubResource("Image_jvlbm") -[sub_resource type="Image" id="Image_c72em"] +[sub_resource type="Image" id="Image_pxng2"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABNS1kHTUtZJ01LWVBNS1lmTUtZaE1LWWhNS1loTUtZaE1LWWhNS1loTUtZZk1LWVBNS1knTUtZBwAAAAAAAAAATUtZJzg3QLQgICT6Hh4i/x8fI/8fHyP/Hx8j/x8fI/8fHyP/Hx8j/x4eIv8gICT6ODdAtE1LWScAAAAAAAAAAE1LWVAgICT6ICAk/yIiJ/8jIyj/IyMo/yMjKP8jIyj/IyMo/yMjKP8iIif/ICAk/yAgJPpNS1lQAAAAAAAAAABNS1lmHh4i/yIiJ/8lJSr/JSUq/yUlKv8lJSr/JSUq/yUlKv8lJSr/JSUq/yIiJ/8eHiL/TUtZZgAAAAAAAAAATUtZaB8fI/8jIyj/JSUq/yUlKv8lJSr/JSUq/yUlKv8lJSr/JSUq/yUlKv8jIyj/Hx8j/01LWWgAAAAAAAAAAE1LWWgfHyP/IyMo/yUlKv8lJSr/JSUq/yUlKv8lJSr/JSUq/yUlKv8lJSr/IyMo/x8fI/9NS1loAAAAAAAAAABNS1loHx8j/yMjKP8lJSr/JSUq/yUlKv8lJSr/JSUq/yUlKv8lJSr/JSUq/yMjKP8fHyP/TUtZaAAAAAAAAAAATUtZaB8fI/8jIyj/JSUq/yUlKv8lJSr/JSUq/yUlKv8lJSr/JSUq/yUlKv8jIyj/Hx8j/01LWWgAAAAAAAAAAE1LWWgfHyP/IyMo/yUlKv8lJSr/JSUq/yUlKv8lJSr/JSUq/yUlKv8lJSr/IyMo/x8fI/9NS1loAAAAAAAAAABNS1loHx8j/yMjKP8lJSr/JSUq/yUlKv8lJSr/JSUq/yUlKv8lJSr/JSUq/yMjKP8fHyP/TUtZaAAAAAAAAAAATUtZZh4eIv8iIif/JSUq/yUlKv8lJSr/JSUq/yUlKv8lJSr/JSUq/yUlKv8iIif/Hh4i/01LWWYAAAAAAAAAAE1LWVAgICT6ICAk/yIiJ/8jIyj/IyMo/yMjKP8jIyj/IyMo/yMjKP8iIif/ICAk/yAgJPtNS1lQAAAAAAAAAABNS1knODZAtCAgJPseHiL/Hx8j/x8fI/8fHyP/Hx8j/x8fI/8fHyP/Hh4i/yAgJfo4NkC0TUtZJwAAAAAAAAAATUtZB01LWSdNS1lQTUtZZk1LWWhNS1loTUtZaE1LWWhNS1loTUtZaE1LWWZNS1lQTUtZJ01LWQcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), "format": "RGBA8", @@ -2556,7 +2556,7 @@ data = { } [sub_resource type="ImageTexture" id="336"] -image = SubResource("Image_c72em") +image = SubResource("Image_pxng2") [sub_resource type="AtlasTexture" id="359"] atlas = ExtResource("1_ak8qr") @@ -2632,7 +2632,7 @@ border_width_left = 1 border_color = Color(0.2, 0.2, 0.2, 1) anti_aliasing = false -[sub_resource type="Image" id="Image_ma648"] +[sub_resource type="Image" id="Image_8h43v"] data = { "data": PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIKCgnmNjY15mJiYeYGirQCMrLgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOFVfAE5OTjGCgoJ5jY2NeZiYmHlOTk4xTk5OMU5OTjE4VV8AOFVfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADhVXwBOTk4cTk5OMU5OTjFOTk4xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), "format": "RGBA8", @@ -2642,7 +2642,7 @@ data = { } [sub_resource type="ImageTexture" id="111"] -image = SubResource("Image_ma648") +image = SubResource("Image_8h43v") [sub_resource type="AtlasTexture" id="20"] atlas = ExtResource("3_0m6kw") From 0e3353018b889d83df672802b5993838f37cb3bf Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 23 Aug 2024 23:19:56 +0900 Subject: [PATCH 03/23] WORKFLOW: tentative PR branch name fixes -fix [skip ci] --- .github/workflows/cooker-selfhosted.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 445bcae9..e24636bd 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -85,10 +85,10 @@ jobs: source_branch=$(curl -s "https://api.github.com/repos/RetroDECK/RetroDECK/pulls/$pr_number" | jq -r '.head.ref') source_branch=${source_branch//\//-} # Replace '/' with '-' in the branch name echo "[DEBUG] source branch is: $source_branch" - echo "TAG=PR-$pr_number-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV + echo "TAG=PR-$pr_number-$(echo $source_branch-${{ env.buildid }} | sed 's/\//-/g')" >> $GITHUB_ENV echo "MAKE_LATEST=false" >> $GITHUB_ENV # if it's a feature branch it will not marked as "latest" cooker version else - TAG="$MANIFEST_VERSION-${{ env.buildid }}" + TAG="$MANIFEST_VERSION-${{ env.buildid }} | sed 's/\//-/g'" echo "TAG=$TAG" >> $GITHUB_ENV echo "MAKE_LATEST=true" >> $GITHUB_ENV fi From 573964e5b295e6fbf0b015569ada247250c070f2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 23 Aug 2024 23:28:49 +0900 Subject: [PATCH 04/23] feat/ruffle (#904) * Feat/ruffle (#884) * CEMU: added wrapper + RPCS3 fixes * THE GREAT FOLDER MOVE (aka let's see how much things I can break in a single commit) * emu: fixed dest filename for the wrapper * Cemu: fixing wrapper installation * CEMU: fixed wrapper again [skip ci] * MANIFEST: cleanup [skip ci] * MANIFEST: cleanup [skip ci] * MANIFEST: trying to add LLVM to solve PCSX2, Duckstation issues * MANIFEST: adding llvm doesn't change the situation, removed * MANIFEST: trying to add vulkan * MANIFEST: trying to add vulkan - removed as it should be already in (and that's broken) * VULKAN: testing some libraries * Create Godot.yml * Rename main.yml to godot.yml * Update godot.yml * Update godot.yml * Update godot.yml * Update godot.yml * VULKAN: trying to add shaderc * VULKAN: trying to add shaderc - nope [skip ci] * Added logging as a function. Added github workflow to build configurator On branch feat/godot-configurator Changes to be committed: new file: .github/workflows/build-configurator.yml new file: tools/configurator/basic modified: tools/configurator/components/bios_check/bios_check.gd modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres modified: tools/configurator/scripts/class_functions.gd * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml modified: tools/configurator/export_presets.cfg * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/export_presets.cfg * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/main.gd * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/main.gd * Theme and Theme Inheritance On branch feat/godot-configurator Changes to be committed: new file: tools/configurator/assets/fonts/OpenDyslexic3/OpenDyslexic3-Bold.ttf new file: tools/configurator/assets/fonts/OpenDyslexic3/OpenDyslexic3-Bold.ttf.import new file: tools/configurator/assets/fonts/OpenDyslexic3/OpenDyslexic3-Regular.ttf new file: tools/configurator/assets/fonts/OpenDyslexic3/OpenDyslexic3-Regular.ttf.import new file: tools/configurator/assets/fonts/akrobat/Akrobat-Black.otf new file: tools/configurator/assets/fonts/akrobat/Akrobat-Black.otf.import new file: tools/configurator/assets/fonts/akrobat/Akrobat-Bold.otf new file: tools/configurator/assets/fonts/akrobat/Akrobat-Bold.otf.import new file: tools/configurator/assets/fonts/akrobat/Akrobat-ExtraLight.otf new file: tools/configurator/assets/fonts/akrobat/Akrobat-ExtraLight.otf.import new file: tools/configurator/assets/fonts/akrobat/Akrobat-Light.otf new file: tools/configurator/assets/fonts/akrobat/Akrobat-Light.otf.import new file: tools/configurator/assets/fonts/akrobat/Akrobat-Regular.otf new file: tools/configurator/assets/fonts/akrobat/Akrobat-Regular.otf.import new file: tools/configurator/assets/fonts/akrobat/Akrobat-SemiBold.otf new file: tools/configurator/assets/fonts/akrobat/Akrobat-SemiBold.otf.import new file: tools/configurator/assets/fonts/akrobat/akrobat-extrabold-webfont.ttf new file: tools/configurator/assets/fonts/akrobat/akrobat-extrabold-webfont.ttf.import new file: tools/configurator/assets/fonts/munro/munro-narrow.ttf new file: tools/configurator/assets/fonts/munro/munro-narrow.ttf.import new file: tools/configurator/assets/fonts/munro/munro-small.ttf new file: tools/configurator/assets/fonts/munro/munro-small.ttf.import new file: tools/configurator/assets/fonts/munro/munro.ttf new file: tools/configurator/assets/fonts/munro/munro.ttf.import new file: tools/configurator/assets/graphics/Rekku/Rekku-test.xcf new file: tools/configurator/assets/graphics/Rekku/base.png new file: tools/configurator/assets/graphics/Rekku/base.png.import new file: tools/configurator/assets/graphics/Rekku/blink1.png new file: tools/configurator/assets/graphics/Rekku/blink1.png.import new file: tools/configurator/assets/graphics/Rekku/blink2.png new file: tools/configurator/assets/graphics/Rekku/blink2.png.import new file: tools/configurator/assets/graphics/Rekku/eyes-open.png new file: tools/configurator/assets/graphics/Rekku/eyes-open.png.import new file: tools/configurator/assets/graphics/Rekku/mouth-A.png new file: tools/configurator/assets/graphics/Rekku/mouth-A.png.import new file: tools/configurator/assets/graphics/Rekku/mouth-O.png new file: tools/configurator/assets/graphics/Rekku/mouth-O.png.import new file: tools/configurator/assets/graphics/Rekku/mouth-base.png new file: tools/configurator/assets/graphics/Rekku/mouth-base.png.import new file: tools/configurator/assets/graphics/Rekku/rekku-blink-down.png new file: tools/configurator/assets/graphics/Rekku/rekku-blink-down.png.import new file: tools/configurator/assets/graphics/Rekku/rekku-blink-up.png new file: tools/configurator/assets/graphics/Rekku/rekku-blink-up.png.import new file: tools/configurator/assets/graphics/Rekku/rekku-idle.png new file: tools/configurator/assets/graphics/Rekku/rekku-idle.png.import new file: tools/configurator/assets/graphics/Rekku/rekku-speak1.png new file: tools/configurator/assets/graphics/Rekku/rekku-speak1.png.import new file: tools/configurator/assets/graphics/Rekku/rekku-speak2.png new file: tools/configurator/assets/graphics/Rekku/rekku-speak2.png.import new file: tools/configurator/assets/graphics/retrodeck.png new file: tools/configurator/assets/graphics/retrodeck.png.import new file: tools/configurator/assets/themes/accesible_theme.tres new file: tools/configurator/assets/themes/default_theme.tres new file: tools/configurator/assets/themes/modern_theme.tres new file: tools/configurator/assets/themes/retro_theme.tres modified: tools/configurator/components/bios_check/bios_check.gd modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/components/popup.gd * Added Emulator Select and Pick options. On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * Rekku and Logo animations On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres Untracked files: tools/configurator/assets/graphics/retrodeck_base.png tools/configurator/assets/graphics/retrodeck_base.png.import tools/configurator/assets/graphics/retrodeck_base_anim.png tools/configurator/assets/graphics/retrodeck_base_anim.png.import tools/configurator/assets/graphics/retrodeck_base_anim.xcf tools/configurator/assets/graphics/retrodeck_base_shake0.png tools/configurator/assets/graphics/retrodeck_base_shake0.png.import tools/configurator/assets/graphics/retrodeck_base_shake1.png tools/configurator/assets/graphics/retrodeck_base_shake1.png.import tools/configurator/assets/graphics/retrodeck_base_shake2.png tools/configurator/assets/graphics/retrodeck_base_shake2.png.import tools/configurator/assets/graphics/retrodeck_base_shake3.png tools/configurator/assets/graphics/retrodeck_base_shake3.png.import tools/configurator/assets/graphics/retrodeck_base_shake4.png tools/configurator/assets/graphics/retrodeck_base_shake4.png.import tools/configurator/rekku_animated.tscn * Add Wobble! On branch feat/godot-configurator Changes to be committed: new file: tools/configurator/assets/graphics/retrodeck_base.png new file: tools/configurator/assets/graphics/retrodeck_base.png.import new file: tools/configurator/assets/graphics/retrodeck_base_anim.png new file: tools/configurator/assets/graphics/retrodeck_base_anim.png.import new file: tools/configurator/assets/graphics/retrodeck_base_anim.xcf new file: tools/configurator/assets/graphics/retrodeck_base_shake0.png new file: tools/configurator/assets/graphics/retrodeck_base_shake0.png.import new file: tools/configurator/assets/graphics/retrodeck_base_shake1.png new file: tools/configurator/assets/graphics/retrodeck_base_shake1.png.import new file: tools/configurator/assets/graphics/retrodeck_base_shake2.png new file: tools/configurator/assets/graphics/retrodeck_base_shake2.png.import new file: tools/configurator/assets/graphics/retrodeck_base_shake3.png new file: tools/configurator/assets/graphics/retrodeck_base_shake3.png.import new file: tools/configurator/assets/graphics/retrodeck_base_shake4.png new file: tools/configurator/assets/graphics/retrodeck_base_shake4.png.import new file: tools/configurator/rekku_animated.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/components/bios_check/bios_check.gd modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * ES-DE: testing out the new compact menu * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/main.tscn * ES-DE: testing out the new compact menu - newer build * Add change data for about us section via a csv On branch feat/godot-configurator Changes to be committed: new file: tools/configurator/assets/data_lists/tk_about.Description.translation new file: tools/configurator/assets/data_lists/tk_about.URL.translation new file: tools/configurator/assets/data_lists/tk_about.csv new file: tools/configurator/assets/data_lists/tk_about.csv.import modified: tools/configurator/emu_list.yml modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres modified: tools/configurator/scripts/class_functions.gd new file: tools/configurator/tk_about.gd * On branch feat/godot-configurator Changes to be committed: deleted: configurator/assets/data_lists/tk_about.Description.translation deleted: configurator/assets/data_lists/tk_about.URL.translation deleted: configurator/assets/data_lists/tk_about.csv.import new file: configurator/export/configurator.console.exe new file: configurator/export/configurator.exe new file: configurator/export/configurator.pck new file: configurator/export/configurator.sh new file: configurator/export/configurator.x86_64 renamed: configurator/assets/data_lists/tk_about.csv -> configurator/export/tk_about.txt modified: configurator/export_presets.cfg modified: configurator/tk_about.gd new file: configurator/tk_about.txt * Improved parsing of files for pulling out data On branch feat/godot-configurator Changes to be committed: modified: main.gd modified: res/pixel_ui_theme/RetroDECKTheme.tres modified: scripts/class_functions.gd modified: tk_about.gd modified: tk_about.txt * ES-DE: testing out the new compact menu - newer build 2 * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/components/bios_check/bios_check.gd new file: tools/configurator/data_list.json new file: tools/configurator/data_list.yml modified: tools/configurator/main.gd modified: tools/configurator/project.godot modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres modified: tools/configurator/scripts/class_functions.gd modified: tools/configurator/tk_about.gd * Adding json support and supporting class On branch feat/godot-configurator Changes to be committed: deleted: tools/configurator/basic new file: tools/configurator/data.json modified: tools/configurator/data_list.json modified: tools/configurator/main.gd modified: tools/configurator/project.godot modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres new file: tools/configurator/scripts/app_data.gd modified: tools/configurator/scripts/class_functions.gd new file: tools/configurator/scripts/data_handler.gd new file: tools/configurator/scripts/emulator.gd new file: tools/configurator/scripts/emulator_option.gd new file: tools/configurator/scripts/emulator_property.gd new file: tools/configurator/scripts/link.gd new file: tools/configurator/scripts/save_manager.gd * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/data_list.json modified: tools/configurator/export/configurator.pck deleted: tools/configurator/export/tk_about.txt modified: tools/configurator/main.gd modified: tools/configurator/project.godot modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres modified: tools/configurator/scripts/data_handler.gd modified: tools/configurator/scripts/emulator_property.gd modified: tools/configurator/tk_about.gd tools/configurator/export/data_list.json * On branch feat/godot-configurator Changes to be committed: new file: tools/configurator/export/data_list.json * Now includes modify json. Need cleaning up! On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/data_list.json modified: tools/configurator/export/configurator.pck modified: tools/configurator/main.gd modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres modified: tools/configurator/scripts/data_handler.gd * ES-DE: testing out the new compact menu - newer build 3 * Manifest: renaming es-de module to stick with the repo name for updating purposes * ES-DE: updated module with new artifact URL and SHA256 [skip ci] * Revert "ES-DE: updated module with new artifact URL and SHA256 [skip ci]" This reverts commit b85ad1573d6af60e765bc6183c8f2e24ae04e6e7. * If this breaks to gzdoom is ok * If this breaks to gzdoom is ok - fix * Migrated to the new latest links * MAME: frixed url * PCSX2: updated to 2.1.55 * Tidying up On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/main.gd modified: tools/configurator/project.godot modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres modified: tools/configurator/scripts/data_handler.gd deleted: tools/configurator/scripts/save_manager.gd * On branch feat/godot-configurator Changes to be committed: deleted: tools/configurator/data.json modified: tools/configurator/main.gd modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres modified: tools/configurator/scripts/data_handler.gd * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/scripts/data_handler.gd modified: tools/configurator/tk_about.gd * On branch feat/godot-configurator Changes to be committed: deleted: tools/configurator/assets/graphics/Rekku/Rekku-test.xcf deleted: tools/configurator/assets/graphics/Rekku/base.png deleted: tools/configurator/assets/graphics/Rekku/base.png.import deleted: tools/configurator/assets/graphics/Rekku/blink1.png deleted: tools/configurator/assets/graphics/Rekku/blink1.png.import deleted: tools/configurator/assets/graphics/Rekku/blink2.png deleted: tools/configurator/assets/graphics/Rekku/blink2.png.import deleted: tools/configurator/assets/graphics/Rekku/eyes-open.png deleted: tools/configurator/assets/graphics/Rekku/eyes-open.png.import deleted: tools/configurator/assets/graphics/Rekku/mouth-A.png deleted: tools/configurator/assets/graphics/Rekku/mouth-A.png.import deleted: tools/configurator/assets/graphics/Rekku/mouth-O.png deleted: tools/configurator/assets/graphics/Rekku/mouth-O.png.import deleted: tools/configurator/assets/graphics/Rekku/mouth-base.png deleted: tools/configurator/assets/graphics/Rekku/mouth-base.png.import deleted: tools/configurator/assets/graphics/Rekku/rekku-blink-down.png deleted: tools/configurator/assets/graphics/Rekku/rekku-blink-down.png.import deleted: tools/configurator/assets/graphics/Rekku/rekku-blink-up.png deleted: tools/configurator/assets/graphics/Rekku/rekku-blink-up.png.import deleted: tools/configurator/assets/graphics/Rekku/rekku-idle.png deleted: tools/configurator/assets/graphics/Rekku/rekku-idle.png.import deleted: tools/configurator/assets/graphics/Rekku/rekku-speak1.png deleted: tools/configurator/assets/graphics/Rekku/rekku-speak1.png.import deleted: tools/configurator/assets/graphics/Rekku/rekku-speak2.png deleted: tools/configurator/assets/graphics/Rekku/rekku-speak2.png.import * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/export_presets.cfg modified: tools/configurator/main.gd * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/components/bios_check/bios_check.gd modified: tools/configurator/main.tscn * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/components/bios_check/bios_check.gd new file: tools/configurator/components/logs.tscn new file: tools/configurator/components/logs/logs_popup_content.tscn modified: tools/configurator/components/popup.tscn modified: tools/configurator/data_list.json deleted: tools/configurator/export/data_list.json modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * Trying a new workflow * Trying a new workflow - fix * Trying a new workflow - fix 2 * Reverting workfolw edits * WORKFLOW: targetting the old repo for the release * WORKFLOW: updated some actions to a newever version to avoid deprecation at the end of the year * MISSING_LIBS: trying to fetch libshaderc * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/components/logs.tscn renamed: tools/configurator/components/logs/logs_popup_content.tscn -> tools/configurator/components/logs_view/logs_popup_content.tscn new file: tools/configurator/components/logs_view/view_log.gd modified: tools/configurator/components/popup.gd modified: tools/configurator/components/popup.tscn modified: tools/configurator/data_list.json modified: tools/configurator/main.gd modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres new file: tools/configurator/retrodeck.json modified: tools/configurator/scripts/class_functions.gd modified: tools/configurator/scripts/data_handler.gd modified: tools/configurator/tk_about.gd * On branch feat/godot-configurator Changes to be committed: deleted: tools/configurator/components/logs.tscn modified: tools/configurator/components/logs_view/logs_popup_content.tscn deleted: tools/configurator/components/logs_view/view_log.gd modified: tools/configurator/components/popup.tscn modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml modified: net.retrodeck.retrodeck.yml modified: tools/configurator/export_presets.cfg modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * MANIFEST: removng a newline * Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: net.retrodeck.retrodeck.yml new file: tools/configurator/assets/icons/128/app.xemu.xemu.png new file: tools/configurator/assets/icons/128/app.xemu.xemu.png.import new file: tools/configurator/assets/icons/128/duckstation-nogui.png new file: tools/configurator/assets/icons/128/duckstation-nogui.png.import new file: tools/configurator/assets/icons/128/duckstation.png new file: tools/configurator/assets/icons/128/duckstation.png.import new file: tools/configurator/assets/icons/128/net.kuribo64.melonDS.png new file: tools/configurator/assets/icons/128/net.kuribo64.melonDS.png.import new file: tools/configurator/assets/icons/128/net.pcsx2.PCSX2.png new file: tools/configurator/assets/icons/128/net.pcsx2.PCSX2.png.import new file: tools/configurator/assets/icons/128/net.retrodeck.retrodeck.png new file: tools/configurator/assets/icons/128/net.retrodeck.retrodeck.png.import new file: tools/configurator/assets/icons/128/net.rpcs3.RPCS3.png new file: tools/configurator/assets/icons/128/net.rpcs3.RPCS3.png.import new file: tools/configurator/assets/icons/128/org.DolphinEmu.dolphin-emu.png new file: tools/configurator/assets/icons/128/org.DolphinEmu.dolphin-emu.png.import new file: tools/configurator/assets/icons/128/org.citra_emu.citra.png new file: tools/configurator/assets/icons/128/org.citra_emu.citra.png.import new file: tools/configurator/assets/icons/128/org.mamedev.MAME.png new file: tools/configurator/assets/icons/128/org.mamedev.MAME.png.import new file: tools/configurator/assets/icons/128/org.ppsspp.PPSSPP.png new file: tools/configurator/assets/icons/128/org.ppsspp.PPSSPP.png.import new file: tools/configurator/assets/icons/128/org.ppsspp.PPSSPP_.png new file: tools/configurator/assets/icons/128/org.ppsspp.PPSSPP_.png.import new file: tools/configurator/assets/icons/128/org.ryujinx.Ryujinx.png new file: tools/configurator/assets/icons/128/org.ryujinx.Ryujinx.png.import new file: tools/configurator/assets/icons/128/org.zdoom.GZDoom.png new file: tools/configurator/assets/icons/128/org.zdoom.GZDoom.png.import new file: tools/configurator/assets/icons/128/retroarch.png new file: tools/configurator/assets/icons/128/retroarch.png.import new file: tools/configurator/assets/icons/16/app.xemu.xemu.png new file: tools/configurator/assets/icons/16/app.xemu.xemu.png.import new file: tools/configurator/assets/icons/16/duckstation-nogui.png new file: tools/configurator/assets/icons/16/duckstation-nogui.png.import new file: tools/configurator/assets/icons/16/duckstation.png new file: tools/configurator/assets/icons/16/duckstation.png.import new file: tools/configurator/assets/icons/16/net.pcsx2.PCSX2.png new file: tools/configurator/assets/icons/16/net.pcsx2.PCSX2.png.import new file: tools/configurator/assets/icons/16/net.retrodeck.retrodeck.png new file: tools/configurator/assets/icons/16/net.retrodeck.retrodeck.png.import new file: tools/configurator/assets/icons/16/net.rpcs3.RPCS3.png new file: tools/configurator/assets/icons/16/net.rpcs3.RPCS3.png.import new file: tools/configurator/assets/icons/16/org.DolphinEmu.dolphin-emu.png new file: tools/configurator/assets/icons/16/org.DolphinEmu.dolphin-emu.png.import new file: tools/configurator/assets/icons/16/org.gnome.Yelp.png new file: tools/configurator/assets/icons/16/org.gnome.Yelp.png.import new file: tools/configurator/assets/icons/16/org.mamedev.MAME.png new file: tools/configurator/assets/icons/16/org.mamedev.MAME.png.import new file: tools/configurator/assets/icons/16/org.ppsspp.PPSSPP.png new file: tools/configurator/assets/icons/16/org.ppsspp.PPSSPP.png.import new file: tools/configurator/assets/icons/16/org.ppsspp.PPSSPP_.png new file: tools/configurator/assets/icons/16/org.ppsspp.PPSSPP_.png.import new file: tools/configurator/assets/icons/16/org.ryujinx.Ryujinx.png new file: tools/configurator/assets/icons/16/org.ryujinx.Ryujinx.png.import new file: tools/configurator/assets/icons/16/org.xfce.session.png new file: tools/configurator/assets/icons/16/org.xfce.session.png.import new file: tools/configurator/assets/icons/16/org.zdoom.GZDoom.png new file: tools/configurator/assets/icons/16/org.zdoom.GZDoom.png.import new file: tools/configurator/assets/icons/16/retroarch.png new file: tools/configurator/assets/icons/16/retroarch.png.import new file: tools/configurator/assets/icons/16/security-medium.png new file: tools/configurator/assets/icons/16/security-medium.png.import new file: tools/configurator/assets/icons/32/retroarch.png new file: tools/configurator/assets/icons/32/retroarch.png.import new file: tools/configurator/assets/icons/dolphin-emu (1).svg new file: tools/configurator/assets/icons/dolphin-emu (1).svg.import new file: tools/configurator/assets/icons/dolphin-emu (2).svg new file: tools/configurator/assets/icons/dolphin-emu (2).svg.import new file: tools/configurator/assets/icons/dolphin-emu.svg new file: tools/configurator/assets/icons/dolphin-emu.svg.import new file: tools/configurator/assets/icons/retroarch (1).svg new file: tools/configurator/assets/icons/retroarch (1).svg.import new file: tools/configurator/assets/icons/retroarch (2).svg new file: tools/configurator/assets/icons/retroarch (2).svg.import new file: tools/configurator/assets/icons/retroarch.svg new file: tools/configurator/assets/icons/retroarch.svg.import new file: tools/configurator/assets/icons/retroarch2.svg new file: tools/configurator/assets/icons/retroarch2.svg.import new file: tools/configurator/assets/icons/retroarch_invert.svg new file: tools/configurator/assets/icons/retroarch_invert.svg.import modified: tools/configurator/main.gd modified: tools/configurator/main.tscn modified: tools/configurator/project.godot modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * Icons! * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/project.godot * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/main.gd * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/export/configurator.pck * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-configurator.yml * On branch feat/godot-configurator Changes to be committed: new file: .github/workflows/buid-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/buid-gdc.yml * On branch feat/godot-configurator Changes to be committed: deleted: .github/workflows/buid-gdc.yml Untracked files: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: new file: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * Create gd-test.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * modified: ../../.github/workflows/build-gdc.yml modified: data_list.json * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * modified: data_list.json modified: export_presets.cfg modified: res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * Changes to be committed: modified: ../../.github/workflows/build-gdc.yml deleted: ../../.github/workflows/godot.yml * On branch feat/godot-configurator Changes to be committed: deleted: ../../.github/workflows/gd-test.yml * Create test.yml * Delete .github/workflows/test.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: new file: ../../.github/workflows/go-simple.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/go-simple.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/go-simple.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/go-simple.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/go-simple.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/go-simple.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/go-simple.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-configurator.yml modified: ../../.github/workflows/go-simple.yml * On branch feat/godot-configurator Changes to be committed: modified: export_presets.cfg modified: res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/go-simple.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml deleted: .github/workflows/go-simple.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/export_presets.cfg * On branch feat/godot-configurator Changes to be committed: modified: tools/configurator/export_presets.cfg * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: deleted: ../../.github/workflows/build-configurator.yml modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * modified: main.tscn modified: res/pixel_ui_theme/RetroDECKTheme.tres * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml modified: ../../net.retrodeck.retrodeck.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: ../../.github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml modified: net.retrodeck.retrodeck.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch feat/godot-configurator Changes to be committed: modified: .github/workflows/build-gdc.yml modified: net.retrodeck.retrodeck.yml * On branch feat/godot-configurator Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch feat/godot-configurator Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch cooker Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch cooker Changes to be committed: modified: net.retrodeck.retrodeck.yml * GoDot Configurator install - Easy Mode ;) On branch cooker Changes to be committed: modified: net.retrodeck.retrodeck.yml modified: tools/configurator/data_list.json deleted: tools/configurator/export/configurator.console.exe deleted: tools/configurator/export/configurator.pck deleted: tools/configurator/export/configurator.sh deleted: tools/configurator/export/configurator.x86_64 renamed: tools/configurator/export/configurator.exe -> tools/configurator/export/godot_configurator.x86_64 modified: tools/configurator/export_presets.cfg modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * Embeded file test On branch cooker Changes to be committed: modified: .github/workflows/build-gdc.yml modified: tools/configurator/export_presets.cfg modified: tools/configurator/project.godot modified: tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres * On branch cooker Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch cooker Changes to be committed: modified: .github/workflows/build-gdc.yml * On branch cooker Changes to be committed: renamed: .github/workflows/build-gdc.yml -> .github/workflows/build-configurator.yml * On branch cooker Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch cooker Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch cooker Changes to be committed: modified: automation_tools/automation_task_list.cfg modified: net.retrodeck.retrodeck.yml * On branch cooker Changes to be committed: modified: automation_tools/automation_task_list.cfg * On branch cooker Changes to be committed: modified: automation_tools/automation_task_list.cfg * Test new ruffle maninfest On branch feat/ruffle2.0 Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch feat/ruffle2.0 Changes to be committed: modified: net.retrodeck.retrodeck.yml * Tidying up a bit On branch cooker Changes to be committed: modified: automation_tools/automation_task_list.cfg deleted: tools/configurator/export/configurator.console.exe deleted: tools/configurator/export/configurator.exe deleted: tools/configurator/export/configurator.pck deleted: tools/configurator/export/configurator.sh deleted: tools/configurator/export/configurator.x86_64 deleted: tools/configurator/export/godot_configurator.x86_64 * On branch cooker Changes to be committed: modified: tools/configurator/export_presets.cfg modified: tools/configurator/project.godot * On branch cooker Changes to be committed: modified: automation_tools/automation_task_list.cfg modified: tools/configurator/data_list.json * Delete RetroDECK-cooker.flatpak.sha * Delete .github/workflows/build-configurator.yml * On branch feat/ruffle2.0 Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch feat/ruffle2.0 Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch feat/ruffle2.0 Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch feat/ruffle2.0 Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch feat/ruffle2.0 Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch feat/ruffle2.0 Changes to be committed: modified: net.retrodeck.retrodeck.yml * On branch feat/ruffle2.0 Changes to be committed: modified: net.retrodeck.retrodeck.yml * Ruffle to cooker On branch feat/ruffle2.0 Changes to be committed: modified: net.retrodeck.retrodeck.yml * Triggering build * Triggering build * Triggering build * Triggering build * Triggering build * Triggering build * Triggering build * Triggering build --------- Co-authored-by: XargonWan Co-authored-by: GitHub Actions * RUFFLE: standaardized wrapper deployment * RUFFLE: added ruffle and flash system to features.json * PREPARE_COMPONENT: adding ruffle --------- Co-authored-by: MonkeyX Co-authored-by: GitHub Actions --- config/retrodeck/reference_lists/features.json | 6 ++++++ config/ruffle/ruffle-rdwrapper.sh | 16 ++++++++++++++++ functions/prepare_component.sh | 18 ++++++++++++++++++ net.retrodeck.retrodeck.yml | 18 ++++++++++++++++++ tools/configurator/data_list.json | 2 +- 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 config/ruffle/ruffle-rdwrapper.sh diff --git a/config/retrodeck/reference_lists/features.json b/config/retrodeck/reference_lists/features.json index 90014478..576fc38c 100644 --- a/config/retrodeck/reference_lists/features.json +++ b/config/retrodeck/reference_lists/features.json @@ -972,6 +972,12 @@ } ] }, + "ruffle": { + "description": "Flash Games emulator", + "name" : "Ruffle", + "system" : "flash", + "launch": "ruffle-rd-wrapper.sh" + }, "melonds": { "description": "MelonDS Nintendo DS Emulator", "name": "melonds", diff --git a/config/ruffle/ruffle-rdwrapper.sh b/config/ruffle/ruffle-rdwrapper.sh new file mode 100644 index 00000000..37ba0d89 --- /dev/null +++ b/config/ruffle/ruffle-rdwrapper.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +source /app/libexec/global.sh + +create_dir "$saves_folder/ruffle" + +static_invoke="--config /var/data/ruffle \ + --save-directory "$saves_folder/ruffle" \ + --fullscreen" + +#Check if Steam Deck in Desktop Mode +if [[ $(check_desktop_mode) == "true" ]]; then + ruffle --graphics vulkan $static_invoke "$@" +else + ruffle --graphics gl --no-gui $static_invoke "$@" +fi \ No newline at end of file diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 137a5bbe..ac3e47b9 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -857,6 +857,24 @@ prepare_component() { sed -i 's#RETRODECKSAVESDIR#'$saves_folder'#g' "/var/config/gzdoom/gzdoom.ini" # This is an unfortunate one-off because set_setting_value does not currently support JSON fi + if [[ "$component" =~ ^(ruffle|all)$ ]]; then + component_found="true" + log i "----------------------" + log i "Prepearing Ruffle" + log i "----------------------" + + rm -rf "/var/config/ruffle" + + # Ruffle creates a directory with the full rom paths in it, so this is necessary + # TODO: be aware of this when multi user support will be integrated for this component + dir_prep "$saves_folder/flash" "/var/data/ruffle/SharedObjects/localhost/$roms_folder/flash" + + if [[ "$action" == "postmove" ]]; then # Run only post-move commands + dir_prep "$saves_folder/flash" "/var/data/ruffle/SharedObjects/localhost/$roms_folder/flash" + fi + + fi + if [[ $component_found == "false" ]]; then log e "Supplied component $component not found, not resetting" fi diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b095d7e1..acda1f52 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -549,6 +549,20 @@ modules: url: https://github.com/RetroDECK/RetroDECK-theme commit: 975c41cac99d150b6ae86a1dfd19988058c69aad + # RUFFLE - START + # https://github.com/ruffle-rs/ruffle/releases + - name: ruffle + buildsystem: simple + build-commands: + - | + cp -p ruffle "${FLATPAK_DEST}/bin/" + chmod +x "${FLATPAK_DEST}/bin/ruffle" + sources: + - type: archive + strip-components: 0 + url: https://github.com/ruffle-rs/ruffle/releases/download/nightly-2024-08-09/ruffle-nightly-2024_08_09-linux-x86_64.tar.gz + sha256: d2c4c77d8426da6df8dc8b2a57565c151146464a8eec605d5faa68a297d8cad6 + - name: fetch-missing-libs buildsystem: simple build-commands: @@ -644,6 +658,10 @@ modules: - cp config/gzdoom/gzdoom.sh ${FLATPAK_DEST}/bin/gzdoom.sh - chmod +x ${FLATPAK_DEST}/bin/gzdoom.sh + # RUFFLE wrapper + - cp config/ruffle/ruffle-rdwrapper.sh "${FLATPAK_DEST}/bin/ruffle-rdwrapper.sh" + - chmod +x "${FLATPAK_DEST}/bin/ruffle-rdwrapper.sh" + sources: - type: git url: THISREPO diff --git a/tools/configurator/data_list.json b/tools/configurator/data_list.json index a671ea71..9f8a400d 100644 --- a/tools/configurator/data_list.json +++ b/tools/configurator/data_list.json @@ -405,4 +405,4 @@ ] } } -} \ No newline at end of file +} From 3258d2d824c93f59054c6cfee54eccf6046b3fdb Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 23 Aug 2024 23:31:41 +0900 Subject: [PATCH 05/23] RUFFLE: adding post-update reset command in order to init it [skip ci] --- functions/post_update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/post_update.sh b/functions/post_update.sh index 146a8d10..d5c72f5d 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -378,6 +378,7 @@ post_update() { # Placeholder for version 0.9.0b set_setting_value "$raconf" "libretro_info_path" "/var/config/retroarch/cores" "retroarch" + prepare_component "reset" "ruffle" # TODO: check this # rm /var/config/emulationstation/.emulationstation # remving the old symlink to .emulationstation as it might be not needed anymore From 40ed12913248dbab1c92bdb59a16704ff26c8a6d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 24 Aug 2024 22:07:12 +0900 Subject: [PATCH 06/23] WORKFLOW: tentative PR branch name fixes -fix2 [skip ci] --- .github/workflows/cooker-selfhosted.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index e24636bd..60264ac1 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -81,14 +81,19 @@ jobs: # Check if the event is related to a pull request if [[ "$GITHUB_EVENT_NAME" == "pull_request" || "$GITHUB_EVENT_NAME" == "pull_request_target" ]]; then - pr_number=$(echo "$GITHUB_REF" | awk -F'/' '{print $3}') - source_branch=$(curl -s "https://api.github.com/repos/RetroDECK/RetroDECK/pulls/$pr_number" | jq -r '.head.ref') - source_branch=${source_branch//\//-} # Replace '/' with '-' in the branch name + # Use GITHUB_HEAD_REF to get the source branch + source_branch="${GITHUB_HEAD_REF}" + + # Replace '/' with '-' in the branch name + source_branch=${source_branch//\//-} echo "[DEBUG] source branch is: $source_branch" - echo "TAG=PR-$pr_number-$(echo $source_branch-${{ env.buildid }} | sed 's/\//-/g')" >> $GITHUB_ENV - echo "MAKE_LATEST=false" >> $GITHUB_ENV # if it's a feature branch it will not marked as "latest" cooker version + + # Generate the tag for a pull request + echo "TAG=PR-$GITHUB_RUN_ID-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV + echo "MAKE_LATEST=false" >> $GITHUB_ENV # Not marked as the latest cooker version if it's a feature branch else - TAG="$MANIFEST_VERSION-${{ env.buildid }} | sed 's/\//-/g'" + # Generate the tag for non-pull request branches + TAG="$MANIFEST_VERSION-${{ env.buildid }}" echo "TAG=$TAG" >> $GITHUB_ENV echo "MAKE_LATEST=true" >> $GITHUB_ENV fi From 8726c03c21f46fd5015b261ec0c46b8accd1f794 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 24 Aug 2024 22:13:22 +0900 Subject: [PATCH 07/23] WORKFLOW: added remove stuck mounts for Monkey's runner [skip ci] --- .github/workflows/cooker-selfhosted.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 60264ac1..4e232e33 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -37,7 +37,9 @@ jobs: # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317 - name: Remove stuck mounts - run: sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* + run: | + sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* + sudo umount -f $HOME/actions-run/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* continue-on-error: true - name: Generate a token for Rekku From 9bf1c2d886a879160c8f0ae3ed5115373588e55a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 24 Aug 2024 22:55:31 +0900 Subject: [PATCH 08/23] POST_UPDATE: restoring old 0.8.4b missing region --- functions/post_update.sh | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/functions/post_update.sh b/functions/post_update.sh index d5c72f5d..8fa5338e 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -374,6 +374,61 @@ post_update() { fi fi + # Check if the version is older than 0.8.4b + if [[ $(check_version_is_older_than "0.8.4b") == "true" ]]; then + # In version 0.8.4b, the following changes were made: + # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations (AGAIN) + + log d "Injecting the new retrodeck/ES-DE subdir into the retrodeck.cfg" + # Check if ES-DE already exists in media_folder or themes_folder + if grep -E '^(media_folder|themes_folder)=.*ES-DE' "$rd_conf"; then + log d "ES-DE path already exists in media_folder or themes_folder" + else + # Update the paths if ES-DE does not exist + sed -i -e '/media_folder=/s|retrodeck/|retrodeck/ES-DE/|g' -e '/themes_folder=/s|retrodeck/|retrodeck/ES-DE/|g' "$rd_conf" && log d "Injection successful" + fi + log d "$(grep media_folder "$rd_conf")" + log d "$(grep themes_folder "$rd_conf")" + conf_read + conf_write + + log i "Checking if ES-DE downloaded_media, gamelist, and themes folder must be migrated from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug" + + # Use rsync to merge directories and overwrite existing files + if [[ -d "$rdhome/themes" ]]; then + rsync -a "$rdhome/themes/" "$rdhome/ES-DE/themes/" && log d "Move of \"$rdhome/themes\" to \"$rdhome/ES-DE/themes\" completed" + rm -rf "$rdhome/themes" # Remove the original directory after merging + else + log i "ES-DE themes appear to have already been migrated." + fi + + if [[ -d "$rdhome/downloaded_media" ]]; then + rsync -a "$rdhome/downloaded_media/" "$rdhome/ES-DE/downloaded_media/" && log d "Move of \"$rdhome/downloaded_media\" to \"$rdhome/ES-DE/downloaded_media\" completed" + rm -rf "$rdhome/downloaded_media" # Remove the original directory after merging + else + log i "ES-DE downloaded media appear to have already been migrated." + fi + + if [[ -d "$rdhome/gamelists" ]]; then + rsync -a "$rdhome/gamelists/" "$rdhome/ES-DE/gamelists/" && log d "Move of \"$rdhome/gamelists\" to \"$rdhome/ES-DE/gamelists\" completed" + rm -rf "$rdhome/gamelists" # Remove the original directory after merging + else + log i "ES-DE gamelists appear to have already been migrated." + fi + + if [[ -d "$rdhome/collections" ]]; then + rsync -a "$rdhome/collections/" "$rdhome/ES-DE/collections/" && log d "Move of \"$rdhome/collections\" to \"$rdhome/ES-DE/collections\" completed" + rm -rf "$rdhome/collections" # Remove the original directory after merging + else + log i "ES-DE collections appear to have already been migrated." + fi + + # Setting the correct variables once again + set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" + set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" + + fi + if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then # Placeholder for version 0.9.0b From bafc42f45e0d3266a3a1eda743d6b4c9cf21279d Mon Sep 17 00:00:00 2001 From: Rekku Date: Sun, 25 Aug 2024 01:28:08 +0100 Subject: [PATCH 09/23] Removed need for BIOS tmp file for Godot --- functions/configurator_functions.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/functions/configurator_functions.sh b/functions/configurator_functions.sh index 32f11a7f..db7f9c4d 100644 --- a/functions/configurator_functions.sh +++ b/functions/configurator_functions.sh @@ -5,10 +5,6 @@ check_bios_files() { # There is a "basic" and "expert" mode which outputs different levels of data # USAGE: check_bios_files "mode" - if [[ -f "$godot_bios_files_checked" ]]; then - rm -f "$godot_bios_files_checked" # Godot data transfer temp files - fi - touch "$godot_bios_files_checked" while IFS="^" read -r bios_file bios_subdir bios_hash bios_system bios_desc || [[ -n "$bios_file" ]]; do @@ -25,10 +21,10 @@ check_bios_files() { fi if [[ "$1" == "basic" ]]; then bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc") - echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc" >> "$godot_bios_files_checked" # Godot data transfer temp file + echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc" # Godot data transfer else bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc" "$bios_subdir" "$bios_hash") - echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc"^"$bios_subdir"^"$bios_hash" >> "$godot_bios_files_checked" # Godot data transfer temp file + echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc"^"$bios_subdir"^"$bios_hash" # Godot data transfer fi fi done < $bios_checklist From f12babdf0b9c0861088e5c43d2610888cd0549cf Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 25 Aug 2024 09:38:46 +0900 Subject: [PATCH 10/23] RPCS3: updated firmware to 4.91 [skip ci] --- functions/global.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/global.sh b/functions/global.sh index f00f6914..b0a62c0f 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -45,7 +45,7 @@ remote_network_target_2="$rd_repo" remote_network_target_3="https://one.one.one.one" # The URL of a common internet target for testing network access helper_files_folder="$config/retrodeck/helper_files" # The parent folder of RetroDECK documentation files for deployment rd_appdata="/app/share/appdata/net.retrodeck.retrodeck.appdata.xml" # The shipped appdata XML file for this version -rpcs3_firmware="http://dus01.ps3.update.playstation.net/update/ps3/image/us/2023_0228_05fe32f5dc8c78acbcd84d36ee7fdc5b/PS3UPDAT.PUP" +rpcs3_firmware="http://dus01.ps3.update.playstation.net/update/ps3/image/us/2024_0227_3694eb3fb8d9915c112e6ab41a60c69f/PS3UPDAT.PUP" RA_API_URL="https://retroachievements.org/dorequest.php" # API URL for RetroAchievements.org presets_dir="$config/retrodeck/presets" # Repository for all system preset config files git_organization_name="RetroDECK" # The name of the organization in our git repository such as GitHub From 16c2c2a50e3a2272fe17f0c804241365b058591f Mon Sep 17 00:00:00 2001 From: MonkeyX Date: Sun, 25 Aug 2024 01:42:09 +0100 Subject: [PATCH 11/23] Removed need for BIOS tmp file for Godot (#919) Co-authored-by: Rekku --- functions/configurator_functions.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/functions/configurator_functions.sh b/functions/configurator_functions.sh index 32f11a7f..db7f9c4d 100644 --- a/functions/configurator_functions.sh +++ b/functions/configurator_functions.sh @@ -5,10 +5,6 @@ check_bios_files() { # There is a "basic" and "expert" mode which outputs different levels of data # USAGE: check_bios_files "mode" - if [[ -f "$godot_bios_files_checked" ]]; then - rm -f "$godot_bios_files_checked" # Godot data transfer temp files - fi - touch "$godot_bios_files_checked" while IFS="^" read -r bios_file bios_subdir bios_hash bios_system bios_desc || [[ -n "$bios_file" ]]; do @@ -25,10 +21,10 @@ check_bios_files() { fi if [[ "$1" == "basic" ]]; then bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc") - echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc" >> "$godot_bios_files_checked" # Godot data transfer temp file + echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc" # Godot data transfer else bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc" "$bios_subdir" "$bios_hash") - echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc"^"$bios_subdir"^"$bios_hash" >> "$godot_bios_files_checked" # Godot data transfer temp file + echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc"^"$bios_subdir"^"$bios_hash" # Godot data transfer fi fi done < $bios_checklist From feed0a1e581ac3af75060118337f4926fe128760 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 25 Aug 2024 14:02:05 +0900 Subject: [PATCH 12/23] WORKFLOW: reverting the pull_request_target as it was not building the PR code [skip ci] --- .github/workflows/cooker-selfhosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 4e232e33..2994d14e 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -15,7 +15,7 @@ on: - '*.sh' - 'net.retrodeck.retrodeck.yml' - 'net.retrodeck.retrodeck.appdata.xml' - pull_request_target: + pull_request: branches: - cooker* From bf619738f8e4f1e3e9bc7839e79bf6c0579bd7dd Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 25 Aug 2024 14:18:01 +0900 Subject: [PATCH 13/23] WORKFLOW: tentative solution for PRs [skip ci] --- .github/workflows/cooker-selfhosted.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 2994d14e..ba1f8785 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -15,7 +15,7 @@ on: - '*.sh' - 'net.retrodeck.retrodeck.yml' - 'net.retrodeck.retrodeck.appdata.xml' - pull_request: + pull_request_target: branches: - cooker* @@ -56,6 +56,12 @@ jobs: with: submodules: 'true' + - name: Checkout PR branch (include changes) + if: ${{ github.event_name == 'pull_request' }} + run: | + git fetch origin +refs/pull/${{ github.event.pull_request.number }}/merge + git checkout -qf FETCH_HEAD + - name: "Install dependencies" run: "automation_tools/install_dependencies.sh" From 056179c62949dabe2ee8a76c1012c954acfff705 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 25 Aug 2024 17:42:50 +0900 Subject: [PATCH 14/23] WORKFLOW: tentative solution for PRs - try#2 [skip ci] --- .github/workflows/cooker-selfhosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index ba1f8785..9ac31a7c 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -57,7 +57,7 @@ jobs: submodules: 'true' - name: Checkout PR branch (include changes) - if: ${{ github.event_name == 'pull_request' }} + if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository }} run: | git fetch origin +refs/pull/${{ github.event.pull_request.number }}/merge git checkout -qf FETCH_HEAD From 2cfc71b588481746fea39df93392952660c29bc7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 25 Aug 2024 17:52:19 +0900 Subject: [PATCH 15/23] WORKFLOW: tentative solution for PRs - try#3 [skip ci] --- .github/workflows/cooker-selfhosted.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 9ac31a7c..bc9a6a40 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -55,12 +55,7 @@ jobs: uses: actions/checkout@v4 with: submodules: 'true' - - - name: Checkout PR branch (include changes) - if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository }} - run: | - git fetch origin +refs/pull/${{ github.event.pull_request.number }}/merge - git checkout -qf FETCH_HEAD + ref: ${{ github.sha }} - name: "Install dependencies" run: "automation_tools/install_dependencies.sh" From 11877adc380c3475c8df863010d057b1177af4ce Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 25 Aug 2024 17:56:21 +0900 Subject: [PATCH 16/23] WORKFLOW: simplyfing PR name [skip ci] --- .github/workflows/cooker-selfhosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index bc9a6a40..fd440a45 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -92,7 +92,7 @@ jobs: echo "[DEBUG] source branch is: $source_branch" # Generate the tag for a pull request - echo "TAG=PR-$GITHUB_RUN_ID-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV + echo "TAG=PR-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV echo "MAKE_LATEST=false" >> $GITHUB_ENV # Not marked as the latest cooker version if it's a feature branch else # Generate the tag for non-pull request branches From 5bad19fb3565eab7724de9c5db6e2a292c3b2a42 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 25 Aug 2024 18:03:38 +0900 Subject: [PATCH 17/23] WORKFLOW: tentative solution for PRs - try#4 [skip ci] --- .github/workflows/cooker-selfhosted.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index fd440a45..99aa131e 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -54,6 +54,7 @@ jobs: - name: Clone RetroDECK repo uses: actions/checkout@v4 with: + fetch-depth: 0 submodules: 'true' ref: ${{ github.sha }} From dac75b31b24bf7f547d52fb55713f6fd11521b23 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 25 Aug 2024 18:10:40 +0900 Subject: [PATCH 18/23] WORKFLOW: tentative solution for PRs - try#5 [skip ci] --- .github/workflows/cooker-selfhosted.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 99aa131e..cc3e7a64 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -15,9 +15,8 @@ on: - '*.sh' - 'net.retrodeck.retrodeck.yml' - 'net.retrodeck.retrodeck.appdata.xml' - pull_request_target: - branches: - - cooker* + pull_request_target: + pull_request: # Italy (CET): 11:00 PM # Japan (JST): 7:00 AM From de743a3e230ce376b2fec70dba1d74eacdbe9908 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 25 Aug 2024 20:56:43 +0900 Subject: [PATCH 19/23] WORKFLOW: tentative solution for PRs - try#8 [skip ci] --- .github/workflows/cooker-selfhosted.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index cc3e7a64..17c0855a 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -5,17 +5,16 @@ on: branches: - cooker* - feat* + - branch/cooker* paths: - '.github/workflows/**' - 'automation_tools/**' - 'config/**' - - 'config/es-de/**' - 'functions/**' - 'rd-submodules/**' - '*.sh' - 'net.retrodeck.retrodeck.yml' - 'net.retrodeck.retrodeck.appdata.xml' - pull_request_target: pull_request: # Italy (CET): 11:00 PM @@ -32,7 +31,7 @@ jobs: Building_RetroDECK: runs-on: retrodeck - steps: + steps: # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317 - name: Remove stuck mounts @@ -53,9 +52,7 @@ jobs: - name: Clone RetroDECK repo uses: actions/checkout@v4 with: - fetch-depth: 0 submodules: 'true' - ref: ${{ github.sha }} - name: "Install dependencies" run: "automation_tools/install_dependencies.sh" From 02fbffd7619ccb6ef4f57e3757aec91631f618cb Mon Sep 17 00:00:00 2001 From: monkeyx-net Date: Mon, 26 Aug 2024 19:32:45 +0100 Subject: [PATCH 20/23] fixed duplicate --- .github/workflows/cooker-selfhosted.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 6ec5cdcb..5d1790db 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -35,9 +35,6 @@ jobs: # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317 - name: Remove stuck mounts - run: | - sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* - sudo umount -f $HOME/actions-run/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* run: | sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* sudo umount -f $HOME/actions-run/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* From 699f5b9f38d16311686e4cac46630ef50a683078 Mon Sep 17 00:00:00 2001 From: monkeyx-net Date: Mon, 26 Aug 2024 19:34:28 +0100 Subject: [PATCH 21/23] fixed duplicate --- .github/workflows/cooker-selfhosted.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 5d1790db..2fadc593 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -70,14 +70,6 @@ jobs: branch_name=$(echo $GITHUB_REF | sed 's|refs/heads/||') echo "BRANCH_NAME=$branch_name" >> $GITHUB_ENV fi - run: | - if [[ "$GITHUB_EVENT_NAME" == "pull_request" || "$GITHUB_EVENT_NAME" == "pull_request_target" ]]; then - source_branch="${{ github.head_ref }}" - echo "BRANCH_NAME=$source_branch" >> $GITHUB_ENV - else - branch_name=$(echo $GITHUB_REF | sed 's|refs/heads/||') - echo "BRANCH_NAME=$branch_name" >> $GITHUB_ENV - fi # if the branch is coming from a PR the tag should be manually built - name: "Generate version tag and evaluating latest tag" From e2626b8d5fa1e21ec0ca310993ddd77553ee7625 Mon Sep 17 00:00:00 2001 From: monkeyx-net Date: Wed, 28 Aug 2024 11:10:27 +0100 Subject: [PATCH 22/23] Rekku gets the saw --- .github/workflows/cooker-selfhosted.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 2fadc593..34bb46d8 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -40,15 +40,7 @@ jobs: sudo umount -f $HOME/actions-run/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* continue-on-error: true - - name: Generate a token for Rekku - id: generate-rekku-token - uses: actions/create-github-app-token@v1 - with: - app-id: ${{ vars.REKKU_APP_ID }} - private-key: ${{ secrets.REKKU_PRIVATE_KEY }} - repositories: "RetroDECK,Cooker" - owner: "RetroDECK" - + - name: Clone RetroDECK repo uses: actions/checkout@v4 with: From 43c99f2e3399178ff77e0804e09f2fb3a0de84c8 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 28 Aug 2024 21:10:49 +0900 Subject: [PATCH 23/23] WORKFLOW: enhanced for outside runs, removed artifact for flathub as not needed in cooker [skip ci] --- .github/workflows/cooker-selfhosted.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 17c0855a..ff93253d 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -41,6 +41,7 @@ jobs: continue-on-error: true - name: Generate a token for Rekku + if: ${{ github.repository == 'RetroDECK/RetroDECK' }} id: generate-rekku-token uses: actions/create-github-app-token@v1 with: @@ -176,10 +177,11 @@ jobs: allowUpdates: true makeLatest: ${{env.MAKE_LATEST}} # if it's a feat branch is not considered the latest build token: ${{ steps.generate-rekku-token.outputs.token }} - repo: Cooker + repo: ${{ github.repository_owner == 'RetroDECK' && 'Cooker' || github.event.repository.name }} # "Cooker" if we are in RetroDECK Org, else "this repo" continue-on-error: true - name: Rewrite Tag + if: ${{ github.repository == 'RetroDECK/RetroDECK' }} run: | git submodule deinit -f --all git fetch --tags @@ -202,14 +204,6 @@ jobs: path: RetroDECK-cooker.flatpak continue-on-error: true - - name: Create Artifact for flathub - run: | - tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker . - hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz)) - echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.sha - mv -f RetroDECK-Artifact-cooker.* ${{ secrets.ARTIFACT_REPO }} - continue-on-error: true - # - name: Upload RetroDECK-cooker.flatpak to Gitea Release # run: | # # Set variables for Gitea host, organization, repository, access token, and release details