diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-07-21 18:02:38 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-07-21 18:02:38 +0200 |
| commit | 40e412da4a11de97dda041287e306ca285c50ccf (patch) | |
| tree | a0b28dffaba50d351cab1619f54516be23d2aa6f /game/src/Game/MusicConductor | |
| parent | f3f240853b15a9f9b7cb561dc6626e7f342c5c74 (diff) | |
| parent | 62d001b0fa209f259440e160503dc5ffe5bcaa8f (diff) | |
Merge pull request #142 from OpenVicProject/tidying
Tidying: missing req comments, submodules, hotkeys, user data folder
Diffstat (limited to 'game/src/Game/MusicConductor')
| -rw-r--r-- | game/src/Game/MusicConductor/MusicConductor.gd | 2 | ||||
| -rw-r--r-- | game/src/Game/MusicConductor/MusicPlayer.gd | 6 | ||||
| -rw-r--r-- | game/src/Game/MusicConductor/MusicPlayer.tscn | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/game/src/Game/MusicConductor/MusicConductor.gd b/game/src/Game/MusicConductor/MusicConductor.gd index da0fb1e..1326a30 100644 --- a/game/src/Game/MusicConductor/MusicConductor.gd +++ b/game/src/Game/MusicConductor/MusicConductor.gd @@ -66,7 +66,7 @@ func select_previous_song() -> void: start_current_song() # REQUIREMENTS -# * SND-2 +# * SND-2, SND-3 func _ready(): var dir = DirAccess.open(music_directory) for fname in dir.get_files(): diff --git a/game/src/Game/MusicConductor/MusicPlayer.gd b/game/src/Game/MusicConductor/MusicPlayer.gd index 47be158..e0a9006 100644 --- a/game/src/Game/MusicConductor/MusicPlayer.gd +++ b/game/src/Game/MusicConductor/MusicPlayer.gd @@ -31,18 +31,22 @@ func _on_play_pause_button_pressed(): MusicConductor.toggle_play_pause() _update_play_pause_button() +# REQUIREMENTS +# * UIFUN-93 func _on_next_song_button_pressed(): MusicConductor.select_next_song() _update_song_name_visual() _update_play_pause_button() +# REQUIREMENTS +# * UIFUN-94 func _on_previous_song_button_pressed(): MusicConductor.select_previous_song() _update_song_name_visual() _update_play_pause_button() # REQUIREMENTS -# * UIFUN-92 +# * UIFUN-95 func _on_option_button_item_selected(index): MusicConductor.start_song_by_index(index) _update_song_name_visual() diff --git a/game/src/Game/MusicConductor/MusicPlayer.tscn b/game/src/Game/MusicConductor/MusicPlayer.tscn index 498750d..27bb476 100644 --- a/game/src/Game/MusicConductor/MusicPlayer.tscn +++ b/game/src/Game/MusicConductor/MusicPlayer.tscn @@ -17,7 +17,7 @@ _next_song_button = NodePath("ButtonList/NextSongButton") _visbility_button = NodePath("MusicUIVisibilityButton") [node name="SongSelectorButton" type="OptionButton" parent="."] -editor_description = "UI-107" +editor_description = "UI-105, UI-107, UI-110, UIFUN-92" custom_minimum_size = Vector2(150, 0) layout_mode = 2 focus_mode = 0 @@ -37,6 +37,7 @@ size_flags_horizontal = 4 mouse_filter = 2 [node name="PreviousSongButton" type="Button" parent="ButtonList"] +editor_description = "UI-109" layout_mode = 2 focus_mode = 0 text = "<" @@ -48,6 +49,7 @@ focus_mode = 0 text = "▶" [node name="NextSongButton" type="Button" parent="ButtonList"] +editor_description = "UI-108" layout_mode = 2 focus_mode = 0 text = ">" |