Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 osu.Game/Graphics/Carousel/Carousel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ private void traverseSelection(int direction, Func<CarouselItem, bool> predicate

private void loadSamples(AudioManager audio)
{
sampleKeyboardTraversal = audio.Samples.Get(@"UI/button-hover");
sampleKeyboardTraversal = audio.Samples.Get(@"SongSelect/select-difficulty");
}

private void playTraversalSound()
Expand Down
11 changes: 3 additions & 8 deletions osu.Game/Screens/SelectV2/BeatmapCarousel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -451,17 +451,15 @@ private void setExpansionStateOfSetItems(BeatmapSetInfo set, bool expanded)

private Sample? sampleChangeDifficulty;
private Sample? sampleChangeSet;
private Sample? sampleOpen;
private Sample? sampleClose;
private Sample? sampleToggleGroup;

private double audioFeedbackLastPlaybackTime;

private void loadSamples(AudioManager audio)
{
sampleChangeDifficulty = audio.Samples.Get(@"SongSelect/select-difficulty");
sampleChangeSet = audio.Samples.Get(@"SongSelect/select-expand");
sampleOpen = audio.Samples.Get(@"UI/menu-open");
sampleClose = audio.Samples.Get(@"UI/menu-close");
sampleToggleGroup = audio.Samples.Get(@"SongSelect/select-group");

spinSample = audio.Samples.Get("SongSelect/random-spin");
randomSelectSample = audio.Samples.Get(@"SongSelect/select-random");
Expand All @@ -474,10 +472,7 @@ private void playActivationSound(CarouselItem item)
switch (item.Model)
{
case GroupDefinition:
if (item.IsExpanded)
sampleOpen?.Play();
else
sampleClose?.Play();
sampleToggleGroup?.Play();
return;

case BeatmapSetInfo:
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/osu.Game.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</PackageReference>
<PackageReference Include="Realm" Version="20.1.0" />
<PackageReference Include="ppy.osu.Framework" Version="2025.704.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2025.605.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2025.705.0" />
<PackageReference Include="Sentry" Version="5.1.1" />
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
<PackageReference Include="SharpCompress" Version="0.39.0" />
Expand Down
Loading