Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
7a5fae2
Merge pull request #761 from ikostan/main
ikostan Jun 18, 2026
7826648
Add UI SFX and improve input handling
ikostan Jun 18, 2026
3cb9cd1
Update main_menu.gd
ikostan Jun 18, 2026
04562fb
Update main_menu.gd
ikostan Jun 18, 2026
74c45a8
Update globals.gd
ikostan Jun 18, 2026
9292fdd
Update export_presets.cfg
ikostan Jun 21, 2026
48c66fd
issue (bug_risk): The async delay before quitting might weaken the br…
ikostan Jun 21, 2026
3ca249d
Sanitize QuitDialog button connections
ikostan Jun 21, 2026
31627a2
Update main_menu.gd
ikostan Jun 21, 2026
772feef
Add configurable audio flush delay
ikostan Jun 21, 2026
079659a
Update main_menu.gd
ikostan Jun 21, 2026
e3b82a0
Add node unique_ids and ui_cancel sfx guard
ikostan Jun 22, 2026
a06bd31
Skip global SFX for flat/no_sound buttons
ikostan Jun 22, 2026
810e6dc
Update globals.gd
ikostan Jun 22, 2026
242c5d8
Refactor main menu init and dialog audio hooks
ikostan Jun 22, 2026
58dc3f8
Format connect call and remove extra blank lines
ikostan Jun 22, 2026
f808b2a
Bump actions/checkout from 6 to 7
dependabot[bot] Jun 22, 2026
a3ae67e
Bump release-drafter/release-drafter from 7.3.1 to 7.4.0
dependabot[bot] Jun 22, 2026
3ebd21a
Play cancel SFX on cancel button click
ikostan Jun 23, 2026
9fd086d
Update main_menu.gd
ikostan Jun 23, 2026
cd40b4d
Attach global SFX handler to Buttons
ikostan Jun 23, 2026
bf77a5b
Update main_menu.gd
ikostan Jun 23, 2026
f746c4d
Add guards to main menu fade-in sequence
ikostan Jun 23, 2026
ae2bd9d
Update main_menu.gd
ikostan Jun 23, 2026
5e0a51c
Update main_menu.gd
ikostan Jun 23, 2026
f9f14e3
Use event.is_action_pressed in _input handler
ikostan Jun 23, 2026
e1ef181
Tighten disconnect checks in quit dialog
ikostan Jun 23, 2026
293352c
Clarify quit dialog audio cleanup comments
ikostan Jun 23, 2026
30fe739
Remove CONNECT_DEFERRED for button signals
ikostan Jun 23, 2026
15ef31a
Update globals.gd
ikostan Jun 23, 2026
202d828
Set button metadata in _enter_tree
ikostan Jun 24, 2026
7314b6d
Merge pull request #767 from ikostan/main
ikostan Jun 25, 2026
c02d3a9
Merge pull request #768 from ikostan/dependabot/github_actions/action…
ikostan Jun 25, 2026
3ca9221
Merge pull request #769 from ikostan/dependabot/github_actions/releas…
ikostan Jun 25, 2026
7b58da8
Merge pull request #770 from ikostan/maintenance
ikostan Jun 25, 2026
47debdc
Use strict class check for Button hook
ikostan Jun 25, 2026
8009742
Merge branch 'SFX' of https://github.com/ikostan/SkyLockAssault into SFX
ikostan Jun 25, 2026
43a08c1
Update globals.gd
ikostan Jun 25, 2026
4cae6a6
New sound effects
espanakosta-jpg Jun 25, 2026
15aeb65
Add unique_ids to splash screen and clear audio
ikostan Jun 25, 2026
fa2357a
Add PR summary for UI accept/cancel SFX
ikostan Jun 25, 2026
cfb0625
Update Part_1_UI_Accept_&_Cancel_SFX.md
ikostan Jun 25, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/browser_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
env:
PW_TIMEOUT: "${{ inputs.pw_timeout }}"
steps:
- uses: "actions/checkout@v6.0.1"
- uses: "actions/checkout@v7"

- name: "Disable Editor Plugins (Prevent Headless Crash)"
run: |
Expand Down Expand Up @@ -106,11 +106,11 @@
id: "playwright-cache"
with:
path: "~/.cache/ms-playwright"
# FIX: Cache key is now strictly tied to the installed Playwright package version

Check warning on line 109 in .github/workflows/browser_test.yml

View workflow job for this annotation

GitHub Actions / YAML Lint / build (3.x)

109:91 [line-length] line too long (91 > 90 characters)
key: "${{ runner.os }}-playwright-v2-${{ steps.playwright-version.outputs.version }}"

Check warning on line 110 in .github/workflows/browser_test.yml

View workflow job for this annotation

GitHub Actions / YAML Lint / build (3.x)

110:91 [line-length] line too long (95 > 90 characters)

- name: "Install Playwright Browsers"
if: steps.playwright-cache.outputs.cache-hit != 'true'

Check warning on line 113 in .github/workflows/browser_test.yml

View workflow job for this annotation

GitHub Actions / YAML Lint / build (3.x)

113:13 [quoted-strings] string value is not quoted with double quotes
run: |
playwright install --with-deps chromium

Expand All @@ -122,7 +122,7 @@
def end_headers(self):
self.send_header('Cross-Origin-Opener-Policy', 'same-origin')
self.send_header('Cross-Origin-Embedder-Policy', 'require-corp')
self.send_header('Cache-Control', 'no-store, no-cache, must-revalidate')

Check warning on line 125 in .github/workflows/browser_test.yml

View workflow job for this annotation

GitHub Actions / YAML Lint / build (3.x)

125:91 [line-length] line too long (92 > 90 characters)
super().end_headers()
socketserver.TCPServer.allow_reuse_address = True
with socketserver.TCPServer(('', 8080), MyHandler) as httpd:
Expand Down Expand Up @@ -157,7 +157,7 @@
- name: "Set up Node.js for Coverage Conversion"
uses: "actions/setup-node@v6"
with:
node-version: '20' # Stable for Win10 compat

Check warning on line 160 in .github/workflows/browser_test.yml

View workflow job for this annotation

GitHub Actions / YAML Lint / build (3.x)

160:25 [quoted-strings] string value is not quoted with double quotes

- name: "Install Conversion Tools"
# For conversion and report
Expand Down Expand Up @@ -208,10 +208,10 @@
# yamllint enable rule:line-length

- name: "Upload LCOV Artifact"
if: always()

Check warning on line 211 in .github/workflows/browser_test.yml

View workflow job for this annotation

GitHub Actions / YAML Lint / build (3.x)

211:13 [quoted-strings] string value is not quoted with double quotes
uses: "actions/upload-artifact@v7"
with:
name: lcov-report

Check warning on line 214 in .github/workflows/browser_test.yml

View workflow job for this annotation

GitHub Actions / YAML Lint / build (3.x)

214:17 [quoted-strings] string value is not quoted with double quotes
path: "./coverage/lcov/lcov.info"
retention-days: 5

Expand All @@ -234,11 +234,11 @@
fi

- name: "Upload Test Report Artifact"
if: always()

Check warning on line 237 in .github/workflows/browser_test.yml

View workflow job for this annotation

GitHub Actions / YAML Lint / build (3.x)

237:13 [quoted-strings] string value is not quoted with double quotes
uses: "actions/upload-artifact@v7"
with:
name: test-report

Check warning on line 240 in .github/workflows/browser_test.yml

View workflow job for this annotation

GitHub Actions / YAML Lint / build (3.x)

240:17 [quoted-strings] string value is not quoted with double quotes
path: junit.xml

Check warning on line 241 in .github/workflows/browser_test.yml

View workflow job for this annotation

GitHub Actions / YAML Lint / build (3.x)

241:17 [quoted-strings] string value is not quoted with double quotes

- name: "Upload Screenshot and Coverage Artifacts"
if: always()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: "Checkout repository"
uses: "actions/checkout@v6"
uses: "actions/checkout@v7"
with:
# This explicitly tells the runner to use the branch that triggered the workflow
ref: ${{ github.ref_name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_to_itch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
timeout-minutes: 10
steps:
- name: "Checkout code"
uses: "actions/checkout@v6.0.1"
uses: "actions/checkout@v7"

- name: "Inject Version into project.godot"
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gdlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
timeout-minutes: 10
steps:
- name: "Checkout code"
uses: "actions/checkout@v6.0.1"
uses: "actions/checkout@v7"
- name: "Set up Python"
uses: "actions/setup-python@v6"
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gdunit4_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
GODOT_VERSION: ${{ inputs.godot_version }}
GODOT_SHA256: ${{ inputs.godot_sha256 }}
steps:
- uses: "actions/checkout@v6.0.1"
- uses: "actions/checkout@v7"
- name: "Download and Verify Godot Binary"
run: |
wget -q https://github.com/godotengine/godot/releases/download/${GODOT_VERSION}/Godot_v${GODOT_VERSION}_linux.x86_64.zip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gut_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
GODOT_VERSION: ${{ inputs.godot_version }}
GODOT_SHA256: ${{ inputs.godot_sha256 }}
steps:
- uses: "actions/checkout@v6"
- uses: "actions/checkout@v7"
- name: "Download and Verify Godot Binary"
run: |
wget -q https://github.com/godotengine/godot/releases/download/${GODOT_VERSION}/Godot_v${GODOT_VERSION}_linux.x86_64.zip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint_readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
python-version: ["3.x"] # Single entry for consistent display
steps:
- name: "Checkout code"
uses: "actions/checkout@v6.0.1"
uses: "actions/checkout@v7"
- name: "Lint MARKDOWN Files"
# Lints Markdown for formatting/spelling
# Pinned to SHA for security (was @v19)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
tag_name: "${{ steps.drafter.outputs.tag_name }}" # Expose from step
steps:
# yamllint disable-line rule:line-length
- uses: "release-drafter/release-drafter@693d20e7c1ce1a81d3a41962f85914253b518449"
- uses: "release-drafter/release-drafter@ed4bc48ec97379be2258e7b7ac2624a3e26ab809"
id: drafter # Add ID to access outputs
with:
config-name: "release-drafter.yml" # Explicitly point to your config
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_drafter_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
# yamllint disable-line rule:line-length
- uses: "release-drafter/release-drafter@693d20e7c1ce1a81d3a41962f85914253b518449"
- uses: "release-drafter/release-drafter@ed4bc48ec97379be2258e7b7ac2624a3e26ab809"
with:
config-name: "release-drafter.yml" # Your existing config
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
security-events: "write" # For SARIF uploads to GitHub Security tab
steps:
- name: "Checkout repository"
uses: "actions/checkout@v6.0.1"
uses: "actions/checkout@v7"

- name: "List files in export/web (for visibility)"
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_ci_scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: "actions/checkout@v6.0.1"
uses: "actions/checkout@v7"

- name: "Set up Python"
uses: "actions/setup-python@v6"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
security-events: write # For uploading SARIF to Security tab
steps:
- name: "Checkout repository"
uses: "actions/checkout@v6"
uses: "actions/checkout@v7"
with:
# This explicitly tells the runner to use the branch that triggered the workflow
ref: ${{ github.ref_name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yamllint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
matrix:
python-version: ["3.x"]
steps:
- uses: "actions/checkout@v6.0.1"
- uses: "actions/checkout@v7"
- name: "Cache PIP Dependencies"
uses: "actions/cache@v5"
with:
Expand Down
12 changes: 10 additions & 2 deletions export_presets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
name="Web"
platform="Web"
runnable=true
advanced_options=true
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path="export/web/index.html"
patches=PackedStringArray()
patch_delta_encoding=false
patch_delta_compression_level_zstd=19
patch_delta_min_reduction=0.1
patch_delta_include_filters="*"
patch_delta_exclude_filters=""
encryption_include_filters=""
encryption_exclude_filters=""
seed=0
Expand Down Expand Up @@ -49,14 +53,18 @@ threads/godot_pool_size=4
name="Web_thread_off"
platform="Web"
runnable=false
advanced_options=false
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path="export/web_thread_off/index.html"
patches=PackedStringArray()
patch_delta_encoding=false
patch_delta_compression_level_zstd=19
patch_delta_min_reduction=0.1
patch_delta_include_filters="*"
patch_delta_exclude_filters=""
encryption_include_filters=""
encryption_exclude_filters=""
seed=0
Expand Down
100 changes: 100 additions & 0 deletions files/docs/milestones/21/Part_1_UI_Accept_&_Cancel_SFX.md

Large diffs are not rendered by default.

Binary file added files/sounds/sfx/ui_accept.wav
Binary file not shown.
24 changes: 24 additions & 0 deletions files/sounds/sfx/ui_accept.wav.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[remap]

importer="wav"
type="AudioStreamWAV"
uid="uid://dab12hx4n1y8y"
path="res://.godot/imported/ui_accept.wav-d41b483c4d3c629f1e5ef731e133ec05.sample"

[deps]

source_file="res://files/sounds/sfx/ui_accept.wav"
dest_files=["res://.godot/imported/ui_accept.wav-d41b483c4d3c629f1e5ef731e133ec05.sample"]

[params]

force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
Binary file added files/sounds/sfx/ui_cancel.wav
Binary file not shown.
24 changes: 24 additions & 0 deletions files/sounds/sfx/ui_cancel.wav.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[remap]

importer="wav"
type="AudioStreamWAV"
uid="uid://0auwepvjny1a"
path="res://.godot/imported/ui_cancel.wav-96d0eb88e56df780441712a3fb88d56a.sample"

[deps]

source_file="res://files/sounds/sfx/ui_cancel.wav"
dest_files=["res://.godot/imported/ui_cancel.wav-96d0eb88e56df780441712a3fb88d56a.sample"]

[params]

force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
24 changes: 12 additions & 12 deletions scenes/advanced_settings.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=13 format=3 uid="uid://du088cq02x8ws"]
[gd_scene format=3 uid="uid://du088cq02x8ws"]

[ext_resource type="Script" uid="uid://c0howk0q12qpa" path="res://scripts/ui/menus/advanced_settings.gd" id="1_o600e"]
[ext_resource type="FontFile" uid="uid://borwvgqdgawbj" path="res://files/fonts/EMPIREST.TTF" id="2_vw8ml"]
Expand Down Expand Up @@ -85,7 +85,7 @@ corner_radius_bottom_right = 40
corner_radius_bottom_left = 40
shadow_size = 5

[node name="AdvancedSettings" type="Control"]
[node name="AdvancedSettings" type="Control" unique_id=1404066766]
layout_mode = 3
anchors_preset = 8
anchor_left = 0.5
Expand All @@ -97,7 +97,7 @@ grow_vertical = 2
size_flags_horizontal = 4
script = ExtResource("1_o600e")

[node name="Panel" type="Panel" parent="."]
[node name="Panel" type="Panel" parent="." unique_id=777703237]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
Expand All @@ -114,7 +114,7 @@ size_flags_horizontal = 4
tooltip_text = "Advanced Settings"
theme_override_styles/panel = SubResource("StyleBoxFlat_j3be7")

[node name="Controls" type="VBoxContainer" parent="Panel"]
[node name="Controls" type="VBoxContainer" parent="Panel" unique_id=1500592321]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
Expand All @@ -129,7 +129,7 @@ grow_horizontal = 2
grow_vertical = 2
theme_override_constants/separation = 15

[node name="MainLabel" type="Label" parent="Panel/Controls"]
[node name="MainLabel" type="Label" parent="Panel/Controls" unique_id=317986468]
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 6
Expand All @@ -138,29 +138,29 @@ theme_override_fonts/font = ExtResource("2_vw8ml")
theme_override_font_sizes/font_size = 55
text = "{OPTIONS}"

[node name="SubLabel" type="Label" parent="Panel/Controls"]
[node name="SubLabel" type="Label" parent="Panel/Controls" unique_id=1533283147]
layout_mode = 2
theme_override_colors/font_color = Color(0.9607843, 0.9607843, 0.050980393, 1)
theme_override_fonts/font = ExtResource("2_vw8ml")
theme_override_font_sizes/font_size = 28
text = "{ADVANCED=SETTINGS}"
horizontal_alignment = 1

[node name="LogLevelContainer" type="HBoxContainer" parent="Panel/Controls"]
[node name="LogLevelContainer" type="HBoxContainer" parent="Panel/Controls" unique_id=1424792941]
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 6
theme_override_constants/separation = 35

[node name="Label" type="Label" parent="Panel/Controls/LogLevelContainer"]
[node name="Label" type="Label" parent="Panel/Controls/LogLevelContainer" unique_id=849949417]
layout_mode = 2
size_flags_horizontal = 4
theme_override_colors/font_color = Color(0.9607843, 0.9607843, 0.050980393, 1)
theme_override_fonts/font = ExtResource("2_vw8ml")
theme_override_font_sizes/font_size = 20
text = "{LOG=LEVEL}"

[node name="LogLevelOptionButton" type="OptionButton" parent="Panel/Controls/LogLevelContainer"]
[node name="LogLevelOptionButton" type="OptionButton" parent="Panel/Controls/LogLevelContainer" unique_id=1652415882]
custom_minimum_size = Vector2(175, 0)
layout_mode = 2
size_flags_vertical = 4
Expand All @@ -184,12 +184,12 @@ theme_override_styles/pressed = SubResource("StyleBoxFlat_o600e")
theme_override_styles/hover = SubResource("StyleBoxFlat_o3hvc")
theme_override_styles/focus = SubResource("StyleBoxFlat_6dctt")

[node name="BtnContainer" type="HBoxContainer" parent="Panel/Controls"]
[node name="BtnContainer" type="HBoxContainer" parent="Panel/Controls" unique_id=617440997]
layout_mode = 2
size_flags_vertical = 3
theme_override_constants/separation = 5

[node name="BackButton" type="Button" parent="Panel/Controls/BtnContainer"]
[node name="BackButton" type="Button" parent="Panel/Controls/BtnContainer" unique_id=2130459941]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
Expand All @@ -209,7 +209,7 @@ theme_override_styles/hover = SubResource("StyleBoxFlat_a0ntd")
theme_override_styles/focus = SubResource("StyleBoxFlat_cfdt5")
text = "{BACK}"

[node name="ResetButton" type="Button" parent="Panel/Controls/BtnContainer"]
[node name="ResetButton" type="Button" parent="Panel/Controls/BtnContainer" unique_id=782978532]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
Expand Down
Loading
Loading