Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
cc4f00d
Merge pull request #445 from ikostan/main
ikostan Mar 2, 2026
6c01e4d
Merge pull request #484 from ikostan/main
ikostan Mar 18, 2026
1258204
Create ui_navigation.mp3
espanakosta-jpg Mar 20, 2026
2c86f40
Add UI Volume Controls to Options Menu & Sub-Issue 1: UI Navigation &…
ikostan Mar 22, 2026
69b4c4e
Update globals.gd
ikostan Mar 22, 2026
2fe7d69
Update audio_settings.gd
ikostan Mar 22, 2026
623867c
Update audio_manager.gd
ikostan Mar 22, 2026
ff20858
Update audio_manager.gd
ikostan Mar 22, 2026
c5a53cf
issue (bug_risk): Menu slider mute state should likely use menu_muted…
ikostan Mar 22, 2026
cf566a0
Fix the copied tooltips for the menu row.
ikostan Mar 22, 2026
f9ae750
Include menu_label in _update_label_colors().
ikostan Mar 22, 2026
0cd9c9d
Merge branch 'SFX' of https://github.com/ikostan/SkyLockAssault into SFX
espanakosta-jpg Mar 22, 2026
b80751d
Delete ui_navigation.mp3
espanakosta-jpg Mar 22, 2026
b200cf3
Create ui_navigation.wav
espanakosta-jpg Mar 22, 2026
74b14bd
Create ui_navigation.wav.import
espanakosta-jpg Mar 22, 2026
1f65dea
Create ui_navigation.mp3
espanakosta-jpg Mar 22, 2026
33d721b
Create ui_navigation.mp3.import
espanakosta-jpg Mar 22, 2026
280e757
Update default_bus_layout.tres
espanakosta-jpg Mar 22, 2026
f0cebe3
Update ui_navigation.wav.import
espanakosta-jpg Mar 22, 2026
06a5fd0
Delete ui_navigation.mp3
espanakosta-jpg Mar 22, 2026
6dc8741
Delete ui_navigation.mp3.import
espanakosta-jpg Mar 22, 2026
e2f2489
Update ui_navigation.wav
espanakosta-jpg Mar 22, 2026
5be2d23
Delete ui_navigation.wav.import
espanakosta-jpg Mar 22, 2026
7f32d3d
Delete ui_navigation.wav
espanakosta-jpg Mar 22, 2026
cbdefba
Create ui_navigation.wav
espanakosta-jpg Mar 22, 2026
b3004c5
Create ui_navigation.wav.import
espanakosta-jpg Mar 22, 2026
928260f
Update globals.gd
ikostan Mar 23, 2026
88c87ef
Step 1: Add Broadcasters
ikostan Mar 25, 2026
efdb2e9
Update audio_manager.gd
ikostan Mar 25, 2026
b83df50
Step 2: Create the Bridge
ikostan Mar 25, 2026
711e957
Step 3: Create the Bridge
ikostan Mar 25, 2026
e1b11cb
Step 3 & 4: Migrate JS → Godot
ikostan Mar 25, 2026
eee0b45
Step 5. Purge the UI (clean up audio_settings.gd)
ikostan Mar 25, 2026
2cb41b3
Update audio_web_bridge.gd
ikostan Mar 25, 2026
9ea7ad6
Update globals.gd
ikostan Mar 25, 2026
0d5171f
Update audio_settings.gd
ikostan Mar 25, 2026
e8fff44
Update audio_web_bridge.gd
ikostan Mar 25, 2026
ebf09fe
Update test_audio_unexpected_exit.gd
ikostan Mar 25, 2026
1e3f044
Update test_audio_settings.gd
ikostan Mar 25, 2026
4a1a5f1
Update audio_settings.gd
ikostan Mar 25, 2026
366dac8
Update test_audio_settings.gd
ikostan Mar 25, 2026
e294b30
Update audio_settings.gd
ikostan Mar 25, 2026
51a6d5b
Update test_basic_save_load_without_other_settings.gd
ikostan Mar 25, 2026
d4f71e4
Add focus navigation properties to SFXMenu and update surrounding nodes.
ikostan Mar 25, 2026
68fabdd
Update audio_settings.tscn
ikostan Mar 25, 2026
70c0963
Update project.godot
ikostan Mar 25, 2026
4a834ca
[FEATURE] Unit Test Suite for AudioWebBridge #504
ikostan Mar 25, 2026
76cd14c
Update test_audio_web_bridge.gd
ikostan Mar 25, 2026
5759663
Update test_audio_web_bridge.gd
ikostan Mar 25, 2026
080ef42
Update test_audio_web_bridge.gd
ikostan Mar 25, 2026
1840647
Update audio_web_bridge.gd
ikostan Mar 28, 2026
fbcd118
Update test_volume_slider.gd
ikostan Mar 28, 2026
7749947
Update audio_settings.gd
ikostan Mar 28, 2026
5180533
Update audio_web_bridge.gd
ikostan Mar 28, 2026
9c567b1
Update volume_sliders_mutes_test.py
ikostan Mar 28, 2026
fcf45a6
Update audio_settings.gd
ikostan Mar 28, 2026
a139ce0
style: format code with Black and isort
deepsource-autofix[bot] Mar 28, 2026
6bf01a9
Update audio_settings.gd
ikostan Mar 29, 2026
be4e25d
Update back_flow_test.py
ikostan Mar 29, 2026
82d61ec
Update audio_settings.gd
ikostan Mar 29, 2026
7056810
Merge branch 'SFX' of https://github.com/ikostan/SkyLockAssault into SFX
ikostan Mar 29, 2026
35003d2
style: format code with Black and isort
deepsource-autofix[bot] Mar 29, 2026
4c89b90
Update audio_settings.gd
ikostan Mar 29, 2026
e0d1f2b
Merge branch 'SFX' of https://github.com/ikostan/SkyLockAssault into SFX
ikostan Mar 29, 2026
2715d23
Update audio_web_bridge.gd
ikostan Mar 29, 2026
d809538
Update audio_settings.gd
ikostan Mar 29, 2026
81db6dd
Update ui_navigation.wav
espanakosta-jpg Mar 29, 2026
a1a4993
Merge branch 'SFX' of https://github.com/ikostan/SkyLockAssault into SFX
espanakosta-jpg Mar 29, 2026
7169c85
Reset AudioManager in the fixture.
ikostan Mar 30, 2026
b05562f
The two Back handlers have diverged.
ikostan Mar 30, 2026
0e476c6
Update advanced_settings.gd
ikostan Mar 30, 2026
5d3c775
Update advanced_settings.gd
ikostan Mar 30, 2026
4675e3a
Update advanced_settings.gd
ikostan Mar 30, 2026
c7b7e7e
issue (bug_risk): Global nav SFX in _input may trigger in non‑UI cont…
ikostan Mar 31, 2026
a8377eb
Update test_globals_resource.gd
ikostan Mar 31, 2026
9c574b7
Update test_settings_observer.gd
ikostan Mar 31, 2026
11c9f4c
Update globals.gd
ikostan Mar 31, 2026
0bce76a
Update globals.gd
ikostan Mar 31, 2026
a874899
Update globals.gd
ikostan Mar 31, 2026
e53b252
Update globals.gd
ikostan Mar 31, 2026
4456c19
Update audio_settings.gd
ikostan Mar 31, 2026
be761b7
Update audio_settings.gd
ikostan Mar 31, 2026
2972370
Update audio_settings.gd
ikostan Mar 31, 2026
89994d5
The two Back handlers have diverged.
ikostan Mar 31, 2026
ce589c4
Update test_audio_settings.gd
ikostan Mar 31, 2026
fedfd9a
Replace is_echo() debouncing with is_action_just_pressed() for proper…
ikostan Mar 31, 2026
6026c22
Update globals.gd
ikostan Mar 31, 2026
7bda25a
Update globals.gd
ikostan Mar 31, 2026
64ea19e
Triple-nested call_deferred appears to be a mistake.
ikostan Mar 31, 2026
b572c40
Update scripts/audio_web_bridge.gd
ikostan Mar 31, 2026
5c14205
Mute toggle handler lacks parent-mute guard.
ikostan Mar 31, 2026
5f4296b
Merge branch 'SFX' of https://github.com/ikostan/SkyLockAssault into SFX
ikostan Mar 31, 2026
7ff62e7
Update scripts/audio_settings.gd
ikostan Mar 31, 2026
d7da407
issue (bug_risk): Consider disconnecting AudioManager signals on exit…
ikostan Mar 31, 2026
bcd0ed8
Update audio_settings.gd
ikostan Mar 31, 2026
d467cfa
Update audio_settings.gd
ikostan Mar 31, 2026
9793b73
suggestion (performance): The per-navigation DEBUG log can be very no…
ikostan Mar 31, 2026
bf7d5ec
Update scripts/audio_settings.gd
ikostan Mar 31, 2026
f4f40e3
Merge branch 'SFX' of https://github.com/ikostan/SkyLockAssault into SFX
ikostan Mar 31, 2026
b33d179
Update audio_settings.gd
ikostan Mar 31, 2026
a8e1479
Update audio_settings.gd
ikostan Mar 31, 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
4 changes: 4 additions & 0 deletions custom_shell.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,14 @@
<input id="sfx-slider" type="range" min="0" max="1" step="0.01" value="1.0" style="top: 50%; width: 200px; display: none;">
<input id="weapon-slider" type="range" min="0" max="1" step="0.01" value="1.0" style="top: 60%; width: 200px; display: none;">
<input id="rotors-slider" type="range" min="0" max="1" step="0.01" value="1.0" style="top: 70%; width: 200px; display: none;">
<input id="menu-slider" type="range" min="0" max="1" step="0.01" value="1.0" style="top: 80%; width: 200px; display: none;">

<input id="mute-master" type="checkbox" checked style="top: 30%; left: 60%; width: 50px; height: 50px; display: none;">
<input id="mute-music" type="checkbox" checked style="top: 40%; left: 60%; width: 50px; height: 50px; display: none;">
<input id="mute-sfx" type="checkbox" checked style="top: 50%; left: 60%; width: 50px; height: 50px; display: none;">
<input id="mute-weapon" type="checkbox" checked style="top: 60%; left: 60%; width: 50px; height: 50px; display: none;">
<input id="mute-rotors" type="checkbox" checked style="top: 70%; left: 60%; width: 50px; height: 50px; display: none;">
<input id="mute-menu" type="checkbox" checked style="top: 80%; left: 60%; width: 50px; height: 50px; display: none;">

<button id="audio-reset-button" style="top: 80%; width: 150px;">Reset</button>
<button id="audio-back-button">Back</button>
Expand Down Expand Up @@ -220,10 +222,12 @@
document.getElementById('sfx-slider').onchange = (e) => window.changeSfxVolume([parseFloat(e.target.value)]);
document.getElementById('weapon-slider').onchange = (e) => window.changeWeaponVolume([parseFloat(e.target.value)]);
document.getElementById('rotors-slider').onchange = (e) => window.changeRotorsVolume([parseFloat(e.target.value)]);
document.getElementById('menu-slider').onchange = (e) => window.changeMenuVolume([parseFloat(e.target.value)]);
document.getElementById('mute-master').onchange = (e) => window.toggleMuteMaster([e.target.checked]);
document.getElementById('mute-music').onchange = (e) => window.toggleMuteMusic([e.target.checked]);
document.getElementById('mute-sfx').onchange = (e) => window.toggleMuteSfx([e.target.checked]);
document.getElementById('mute-weapon').onchange = (e) => window.toggleMuteWeapon([e.target.checked]);
document.getElementById('mute-menu').onchange = (e) => window.toggleMuteMenu([e.target.checked]);
document.getElementById('mute-rotors').onchange = (e) => window.toggleMuteRotors([e.target.checked]);
document.getElementById('options-back-button').onclick = () => window.optionsBackPressed([]); // Add this for options back
document.getElementById('controls-back-button').onclick = () => window.controlsBackPressed([]); // Add this for controls back
Expand Down
6 changes: 6 additions & 0 deletions default_bus_layout.tres
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,9 @@ bus/6/mute = false
bus/6/bypass_fx = false
bus/6/volume_db = 0.0
bus/6/send = &"SFX"
bus/7/name = &"SFX_Menu"
bus/7/solo = false
bus/7/mute = false
bus/7/bypass_fx = false
bus/7/volume_db = 0.0
bus/7/send = &"SFX"
12 changes: 8 additions & 4 deletions scenes/audio_settings.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=14 format=3 uid="uid://r8xidy68s04r"]
[gd_scene load_steps=15 format=3 uid="uid://r8xidy68s04r"]

[ext_resource type="FontFile" uid="uid://borwvgqdgawbj" path="res://files/fonts/EMPIREST.TTF" id="1_j3be7"]
[ext_resource type="Script" uid="uid://c2u0utdi762fi" path="res://scripts/audio_settings.gd" id="1_yonr6"]
Expand All @@ -7,6 +7,7 @@
[ext_resource type="PackedScene" uid="uid://ckj1bkdiy65dd" path="res://scenes/volume_controls/sfx_volume_control.tscn" id="5_w6v8r"]
[ext_resource type="PackedScene" uid="uid://ckgawrkjfsld5" path="res://scenes/volume_controls/sfx_weapon_volume_control.tscn" id="6_axthr"]
[ext_resource type="PackedScene" uid="uid://nrunltyo5m58" path="res://scenes/volume_controls/sfx_rotors_volume_control.tscn" id="7_ut8uj"]
[ext_resource type="PackedScene" uid="uid://cm2nruujxhdhu" path="res://scenes/volume_controls/sfx_menu_volume_control.tscn" id="8_a0ntd"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_j3be7"]
bg_color = Color(0.2627451, 0.2627451, 0.2627451, 0.5882353)
Expand Down Expand Up @@ -73,7 +74,7 @@ anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -225.0
offset_top = -250.0
offset_top = -270.0
offset_right = 225.0
offset_bottom = 270.0
grow_horizontal = 2
Expand All @@ -90,9 +91,9 @@ anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -197.5
offset_top = -230.0
offset_top = -240.0
offset_right = 197.5
offset_bottom = 151.0
offset_bottom = 160.0
grow_horizontal = 2
grow_vertical = 2
theme_override_constants/separation = 27
Expand Down Expand Up @@ -152,6 +153,9 @@ focus_neighbor_bottom = NodePath("../../BtnContainer/AudioBackButton")
focus_next = NodePath("../../BtnContainer/AudioBackButton")
focus_previous = NodePath("../SFXWeapon")

[node name="SFXMenu" parent="Panel/VolumeControls" instance=ExtResource("8_a0ntd")]
layout_mode = 2

Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
[node name="BtnContainer" type="HBoxContainer" parent="Panel"]
layout_mode = 1
anchors_preset = 12
Expand Down
65 changes: 65 additions & 0 deletions scenes/volume_controls/sfx_menu_volume_control.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[gd_scene load_steps=4 format=3 uid="uid://cm2nruujxhdhu"]

[ext_resource type="FontFile" uid="uid://borwvgqdgawbj" path="res://files/fonts/EMPIREST.TTF" id="1_f34wo"]
[ext_resource type="Script" uid="uid://8hd1kvmb5bt1" path="res://scripts/volume_slider.gd" id="2_3a0os"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_y238m"]
corner_radius_top_left = 20
corner_radius_top_right = 20
corner_radius_bottom_right = 20
corner_radius_bottom_left = 20
shadow_size = 5

[node name="SFXMenu" type="Control"]
custom_minimum_size = Vector2(385, 24)
layout_mode = 3
anchors_preset = 0
offset_right = 400.0
offset_bottom = 24.0
size_flags_horizontal = 3
size_flags_vertical = 3
tooltip_text = "SFX Rotors Volume Control"
Comment thread
ikostan marked this conversation as resolved.
Resolved

[node name="SFXMenuLabel" type="Label" parent="."]
layout_mode = 0
offset_top = 3.0
offset_right = 100.0
offset_bottom = 21.0
size_flags_horizontal = 0
theme_override_fonts/font = ExtResource("1_f34wo")
theme_override_font_sizes/font_size = 18
text = "{MENU}"

[node name="HSlider" type="HSlider" parent="."]
layout_direction = 2
layout_mode = 0
offset_left = 125.0
offset_right = 345.0
offset_bottom = 24.0
size_flags_horizontal = 3
size_flags_vertical = 1
tooltip_text = "Slide to control menu effects volume."
focus_neighbor_right = NodePath("../Mute")
focus_next = NodePath("../Mute")
max_value = 1.0
step = 0.05
tick_count = 16
ticks_on_borders = true
script = ExtResource("2_3a0os")
bus_name = "SFX_Menu"

[node name="Mute" type="CheckButton" parent="."]
layout_direction = 1
layout_mode = 0
offset_left = 360.0
offset_right = 404.0
offset_bottom = 24.0
size_flags_horizontal = 8
tooltip_text = "Mute Rotors"
focus_neighbor_left = NodePath("../HSlider")
focus_previous = NodePath("../HSlider")
theme_override_styles/focus = SubResource("StyleBoxFlat_y238m")
button_pressed = true
icon_alignment = 2
vertical_icon_alignment = 0
expand_icon = true
8 changes: 8 additions & 0 deletions scripts/audio_constants.gd
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const BUS_MUSIC: String = "Music"
const BUS_SFX: String = "SFX"
const BUS_SFX_ROTORS: String = "SFX_Rotors"
const BUS_SFX_WEAPON: String = "SFX_Weapon"
const BUS_SFX_MENU: String = "SFX_Menu"

# Centralized config with defaults and var mappings
const BUS_CONFIG: Dictionary = {
Expand Down Expand Up @@ -49,5 +50,12 @@ const BUS_CONFIG: Dictionary = {
"muted_var": "rotors_muted",
"default_volume": 1.0,
"default_muted": false
},
BUS_SFX_MENU:
{
"volume_var": "menu_volume",
"muted_var": "menu_muted",
"default_volume": 1.0,
"default_muted": false
}
}
43 changes: 31 additions & 12 deletions scripts/audio_manager.gd
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ extends Node
@export var weapon_muted: bool
@export var rotors_volume: float
@export var rotors_muted: bool
@export var menu_volume: float
@export var menu_muted: bool

var current_config_path: String = Settings.CONFIG_PATH

Expand Down Expand Up @@ -68,20 +70,25 @@ func set_bus_state(bus_name: String, volume: float, muted: bool) -> void:
## :type bus_name: String
## :rtype: float
func get_volume(bus_name: String) -> float:
var current_vol: float = 0.0

match bus_name:
AudioConstants.BUS_MASTER:
return master_volume
current_vol = master_volume
AudioConstants.BUS_MUSIC:
return music_volume
current_vol = music_volume
AudioConstants.BUS_SFX:
return sfx_volume
current_vol = sfx_volume
AudioConstants.BUS_SFX_WEAPON:
return weapon_volume
current_vol = weapon_volume
AudioConstants.BUS_SFX_ROTORS:
return rotors_volume
current_vol = rotors_volume
AudioConstants.BUS_SFX_MENU:
current_vol = menu_volume
_:
Globals.log_message("Unknown bus for get_volume: " + bus_name, Globals.LogLevel.WARNING)
return 0.0

return current_vol


## Set volume for a bus
Expand Down Expand Up @@ -120,6 +127,11 @@ func set_volume(bus_name: String, vol: float) -> void:
Globals.log_message(
"Rotors Volume Level in AudioManager: " + str(vol), Globals.LogLevel.DEBUG
)
AudioConstants.BUS_SFX_MENU:
menu_volume = vol
Globals.log_message(
"Menu Volume Level in AudioManager: " + str(vol), Globals.LogLevel.DEBUG
)
_:
Globals.log_message(
"Unsupported bus in set_volume match (check config drift): " + bus_name,
Expand All @@ -132,20 +144,25 @@ func set_volume(bus_name: String, vol: float) -> void:
## :type bus_name: String
## :rtype: bool
func get_muted(bus_name: String) -> bool:
var is_muted: bool = false

match bus_name:
AudioConstants.BUS_MASTER:
return master_muted
is_muted = master_muted
AudioConstants.BUS_MUSIC:
return music_muted
is_muted = music_muted
AudioConstants.BUS_SFX:
return sfx_muted
is_muted = sfx_muted
AudioConstants.BUS_SFX_WEAPON:
return weapon_muted
is_muted = weapon_muted
AudioConstants.BUS_SFX_ROTORS:
return rotors_muted
is_muted = rotors_muted
AudioConstants.BUS_SFX_MENU:
is_muted = menu_muted
_:
Globals.log_message("Unknown bus for get_muted: " + bus_name, Globals.LogLevel.WARNING)
return false

return is_muted


## Set muted state for a bus
Expand All @@ -166,6 +183,8 @@ func set_muted(bus_name: String, muted: bool) -> void:
weapon_muted = muted
AudioConstants.BUS_SFX_ROTORS:
rotors_muted = muted
AudioConstants.BUS_SFX_MENU:
menu_muted = muted
_:
Globals.log_message("Unknown bus for set_muted: " + bus_name, Globals.LogLevel.WARNING)

Expand Down
Loading
Loading