h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 20:07:25 +08:00
Code Issues Releases Wiki Activity

Merge pull request #25113 from nekodex/generic-error-sfx

Browse Source 
Use new `generic-error` sample in appropriate places
This commit is contained in:
Dean Herbert 2023-10-14 04:35:12 +09:00 committed by GitHub
commit 54722bf251
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
View File

@ -40,6 +40,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
private readonly KeyBindingRow.KeyBindingConflictInfo conflictInfo;
protected override string PopInSampleName => @"UI/generic-error";
public KeyBindingConflictPopover(KeyBindingRow.KeyBindingConflictInfo conflictInfo)
{
this.conflictInfo = conflictInfo;

2
osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
View File

@ -239,7 +239,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
}
};
sampleJoinFail = audio.Samples.Get(@"UI/password-fail");
sampleJoinFail = audio.Samples.Get(@"UI/generic-error");
joinButton.Action = performJoin;
}

2
osu.Game/osu.Game.csproj
View File

@ -37,7 +37,7 @@
</PackageReference>
<PackageReference Include="Realm" Version="11.5.0" />
<PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2023.1014.0" />
<PackageReference Include="Sentry" Version="3.40.0" />
<PackageReference Include="SharpCompress" Version="0.34.1" />
<PackageReference Include="NUnit" Version="3.13.3" />