sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fallback-intro

Browse Source
This commit is contained in:
Dean Herbert
2020-06-12 17:19:11 +09:00
committed by GitHub
parent 0b6ae08c93 8d550a7b29
commit c0afe4c880
129 changed files with 2464 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Menu/IntroTriangles.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader]
private void load()
{
if (MenuVoice.Value && !MenuMusic.Value)
if (MenuVoice.Value && !UsingThemedIntro)
welcome = audio.Samples.Get(@"Intro/lazer/welcome");
}
@ -61,7 +61,7 @@ namespace osu.Game.Screens.Menu
LoadComponentAsync(new TrianglesIntroSequence(logo, background)
{
RelativeSizeAxes = Axes.Both,
Clock = new FramedClock(MenuMusic.Value ? Track : null),
Clock = new FramedClock(UsingThemedIntro ? Track : null),
LoadMenu = LoadMenu
}, t =>
{