From 2a9f4e6950b2bd8d98c99a5bbc70e95130f48477 Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Fri, 14 Apr 2017 12:42:42 -0500 Subject: [PATCH 01/13] Get MenuMusic and MenuVoice woking --- osu.Game/Configuration/OsuConfigManager.cs | 5 +- osu.Game/Screens/Menu/Intro.cs | 60 ++++++++++++++++++---- 2 files changed, 52 insertions(+), 13 deletions(-) diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs index e2f33479c0..38fe739a12 100644 --- a/osu.Game/Configuration/OsuConfigManager.cs +++ b/osu.Game/Configuration/OsuConfigManager.cs @@ -35,6 +35,9 @@ namespace osu.Game.Configuration Set(OsuConfig.MenuParallax, true); + Set(OsuConfig.MenuVoice, true); + Set(OsuConfig.MenuMusic, true); + Set(OsuConfig.ShowInterface, true); Set(OsuConfig.KeyOverlay, false); //todo: implement all settings below this line (remove the Disabled set when doing so). @@ -145,8 +148,6 @@ namespace osu.Game.Configuration Set(OsuConfig.YahooIntegration, false).Disabled = true; Set(OsuConfig.ForceFrameFlush, false).Disabled = true; Set(OsuConfig.DetectPerformanceIssues, true).Disabled = true; - Set(OsuConfig.MenuMusic, true).Disabled = true; - Set(OsuConfig.MenuVoice, true).Disabled = true; Set(OsuConfig.RawInput, false).Disabled = true; Set(OsuConfig.AbsoluteToOsuWindow, Get(OsuConfig.RawInput)).Disabled = true; Set(OsuConfig.ShowMenuTips, true).Disabled = true; diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index ac926cba0c..b65c221fa3 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -1,12 +1,18 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using System.Threading.Tasks; using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Audio.Sample; using osu.Framework.Audio.Track; +using osu.Framework.Configuration; +using osu.Framework.MathUtils; using osu.Framework.Screens; using osu.Framework.Graphics; +using osu.Game.Beatmaps; +using osu.Game.Configuration; +using osu.Game.Database; using osu.Game.Graphics.Containers; using osu.Game.Screens.Backgrounds; using OpenTK.Graphics; @@ -56,30 +62,60 @@ namespace osu.Game.Screens.Menu }; } + private Bindable menuVoice; + private Bindable osuBGM; + private BeatmapDatabase beatmaps; + private TrackManager trackManager; + private BeatmapInfo beatmap; + private WorkingBeatmap song; + [BackgroundDependencyLoader] - private void load(AudioManager audio) + private void load(OsuGameBase game, AudioManager audio, OsuConfigManager config, BeatmapDatabase beatmaps) { + menuVoice = config.GetBindable(OsuConfig.MenuVoice); + osuBGM = config.GetBindable(OsuConfig.MenuMusic); + + if (osuBGM) + { + bgm = audio.Track.Get(@"circles"); + bgm.Looping = true; + } + else + { + this.beatmaps = beatmaps; + trackManager = game.Audio.Track; + beatmap = beatmaps.GetWithChildren(RNG.Next(0, beatmaps.Query().Count() - 1)).Beatmaps[0]; + song = beatmaps.GetWorkingBeatmap(beatmap, null); + } + welcome = audio.Sample.Get(@"welcome"); + seeya = audio.Sample.Get(@"seeya"); - bgm = audio.Track.Get(@"circles"); - bgm.Looping = true; } protected override void OnEntering(Screen last) { base.OnEntering(last); - welcome.Play(); - + if(menuVoice) + welcome.Play(); Scheduler.AddDelayed(delegate { - bgm.Start(); + if(osuBGM) + bgm.Start(); LoadComponentAsync(mainMenu = new MainMenu()); Scheduler.AddDelayed(delegate { + if (!osuBGM) + Task.Run(() => + { + trackManager.SetExclusive(song.Track); + song.Track.Seek(beatmap.Metadata.PreviewTime); + song.Track.Start(); + }); DidLoadMenu = true; Push(mainMenu); }, 2300); @@ -109,15 +145,17 @@ namespace osu.Game.Screens.Menu if (!(last is MainMenu)) Content.FadeIn(300); + double fadeOutTime = 2000; //we also handle the exit transition. - seeya.Play(); + if (menuVoice) + seeya.Play(); + else + fadeOutTime = 500; - const double fade_out_time = 2000; - - Scheduler.AddDelayed(Exit, fade_out_time); + Scheduler.AddDelayed(Exit, fadeOutTime); //don't want to fade out completely else we will stop running updates and shit will hit the fan. - Game.FadeTo(0.01f, fade_out_time); + Game.FadeTo(0.01f, fadeOutTime); base.OnResuming(last); } From 2eb73a7c701d0df5294eda590626507fdc8aa15f Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Fri, 14 Apr 2017 12:58:47 -0500 Subject: [PATCH 02/13] More smoothness when MenuMusic is false --- osu.Game/Screens/Menu/Intro.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index b65c221fa3..e42e9ce475 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -104,18 +104,23 @@ namespace osu.Game.Screens.Menu { if(osuBGM) bgm.Start(); + else + { + Task.Run(() => + { + trackManager.SetExclusive(song.Track); + song.Track.Seek(beatmap.Metadata.PreviewTime); + if (beatmap.Metadata.PreviewTime == -1) + song.Track.Seek(song.Track.Length * .4f); + }); + } LoadComponentAsync(mainMenu = new MainMenu()); Scheduler.AddDelayed(delegate { if (!osuBGM) - Task.Run(() => - { - trackManager.SetExclusive(song.Track); - song.Track.Seek(beatmap.Metadata.PreviewTime); - song.Track.Start(); - }); + Task.Run(() => song.Track.Start()); DidLoadMenu = true; Push(mainMenu); }, 2300); From b5fc84087fd0bfc51f9fc2f53c8eae5116d5f97c Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Fri, 14 Apr 2017 12:59:15 -0500 Subject: [PATCH 03/13] Show song in MusicController and SongSelect --- osu.Game/Screens/Menu/Intro.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index e42e9ce475..0ec7ed13d3 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -86,6 +86,7 @@ namespace osu.Game.Screens.Menu trackManager = game.Audio.Track; beatmap = beatmaps.GetWithChildren(RNG.Next(0, beatmaps.Query().Count() - 1)).Beatmaps[0]; song = beatmaps.GetWorkingBeatmap(beatmap, null); + Beatmap = song; } welcome = audio.Sample.Get(@"welcome"); From b7d61add45555ce9bcd14722e66da91e9336d86d Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Fri, 14 Apr 2017 13:10:59 -0500 Subject: [PATCH 04/13] Cleanup + AppVeyor fixes --- osu.Game/Screens/Menu/Intro.cs | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index 0ec7ed13d3..faacb04876 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -63,8 +63,7 @@ namespace osu.Game.Screens.Menu } private Bindable menuVoice; - private Bindable osuBGM; - private BeatmapDatabase beatmaps; + private Bindable menuMusic; private TrackManager trackManager; private BeatmapInfo beatmap; private WorkingBeatmap song; @@ -73,24 +72,19 @@ namespace osu.Game.Screens.Menu private void load(OsuGameBase game, AudioManager audio, OsuConfigManager config, BeatmapDatabase beatmaps) { menuVoice = config.GetBindable(OsuConfig.MenuVoice); - osuBGM = config.GetBindable(OsuConfig.MenuMusic); - - if (osuBGM) + menuMusic = config.GetBindable(OsuConfig.MenuMusic); + if (!menuMusic) { - bgm = audio.Track.Get(@"circles"); - bgm.Looping = true; - } - else - { - this.beatmaps = beatmaps; trackManager = game.Audio.Track; - beatmap = beatmaps.GetWithChildren(RNG.Next(0, beatmaps.Query().Count() - 1)).Beatmaps[0]; - song = beatmaps.GetWorkingBeatmap(beatmap, null); + beatmap = beatmaps.GetWithChildren(RNG.Next(beatmaps.Query().Count() - 1)).Beatmaps[0]; + song = beatmaps.GetWorkingBeatmap(beatmap); Beatmap = song; } - welcome = audio.Sample.Get(@"welcome"); + bgm = audio.Track.Get(@"circles"); + bgm.Looping = true; + welcome = audio.Sample.Get(@"welcome"); seeya = audio.Sample.Get(@"seeya"); } @@ -103,7 +97,7 @@ namespace osu.Game.Screens.Menu welcome.Play(); Scheduler.AddDelayed(delegate { - if(osuBGM) + if(menuMusic) bgm.Start(); else { @@ -120,7 +114,7 @@ namespace osu.Game.Screens.Menu Scheduler.AddDelayed(delegate { - if (!osuBGM) + if (!menuMusic) Task.Run(() => song.Track.Start()); DidLoadMenu = true; Push(mainMenu); From 984c7092a6b18252993656bde25cf6bd7f939aed Mon Sep 17 00:00:00 2001 From: Javier Flores Date: Fri, 14 Apr 2017 16:33:58 -0500 Subject: [PATCH 05/13] Pls AppVeyor don't die --- osu.Game/Screens/Menu/Intro.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index faacb04876..62fe2431bf 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -95,6 +95,7 @@ namespace osu.Game.Screens.Menu if(menuVoice) welcome.Play(); + Scheduler.AddDelayed(delegate { if(menuMusic) From 2c6327fca9ff5b940b6545a9ecd818e02d6e37fb Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Fri, 14 Apr 2017 17:17:51 -0500 Subject: [PATCH 06/13] Build for real this time --- osu.Game/Screens/Menu/Intro.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index 62fe2431bf..1fbb9b7197 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -95,7 +95,7 @@ namespace osu.Game.Screens.Menu if(menuVoice) welcome.Play(); - + Scheduler.AddDelayed(delegate { if(menuMusic) From ca1f89f2cf391599528b0fc1c5cf69e292f63dc6 Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Fri, 14 Apr 2017 17:48:27 -0500 Subject: [PATCH 07/13] Fix crash when there's no beatmaps --- osu.Game/Screens/Menu/Intro.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index 1fbb9b7197..60493ff356 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -67,6 +67,7 @@ namespace osu.Game.Screens.Menu private TrackManager trackManager; private BeatmapInfo beatmap; private WorkingBeatmap song; + private int choosableBeatmapsetAmmout; [BackgroundDependencyLoader] private void load(OsuGameBase game, AudioManager audio, OsuConfigManager config, BeatmapDatabase beatmaps) @@ -76,9 +77,13 @@ namespace osu.Game.Screens.Menu if (!menuMusic) { trackManager = game.Audio.Track; - beatmap = beatmaps.GetWithChildren(RNG.Next(beatmaps.Query().Count() - 1)).Beatmaps[0]; - song = beatmaps.GetWorkingBeatmap(beatmap); - Beatmap = song; + choosableBeatmapsetAmmout = beatmaps.Query().Count(); + if (choosableBeatmapsetAmmout > 0) + { + beatmap = beatmaps.GetWithChildren(RNG.Next(1, choosableBeatmapsetAmmout)).Beatmaps[0]; + song = beatmaps.GetWorkingBeatmap(beatmap); + Beatmap = song; + } } bgm = audio.Track.Get(@"circles"); @@ -100,7 +105,7 @@ namespace osu.Game.Screens.Menu { if(menuMusic) bgm.Start(); - else + else if (song != null) { Task.Run(() => { @@ -115,7 +120,7 @@ namespace osu.Game.Screens.Menu Scheduler.AddDelayed(delegate { - if (!menuMusic) + if (!menuMusic && song != null) Task.Run(() => song.Track.Start()); DidLoadMenu = true; Push(mainMenu); From 094a0f9639e2e9ed36426770248b53269f6ddcfc Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Sun, 23 Apr 2017 00:36:23 -0500 Subject: [PATCH 08/13] Move MenuMusic logic to MainMenu --- osu.Game/Screens/Menu/Intro.cs | 23 ------------------- osu.Game/Screens/Menu/MainMenu.cs | 37 ++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index 60493ff356..a899e483b4 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -74,17 +74,6 @@ namespace osu.Game.Screens.Menu { menuVoice = config.GetBindable(OsuConfig.MenuVoice); menuMusic = config.GetBindable(OsuConfig.MenuMusic); - if (!menuMusic) - { - trackManager = game.Audio.Track; - choosableBeatmapsetAmmout = beatmaps.Query().Count(); - if (choosableBeatmapsetAmmout > 0) - { - beatmap = beatmaps.GetWithChildren(RNG.Next(1, choosableBeatmapsetAmmout)).Beatmaps[0]; - song = beatmaps.GetWorkingBeatmap(beatmap); - Beatmap = song; - } - } bgm = audio.Track.Get(@"circles"); bgm.Looping = true; @@ -105,23 +94,11 @@ namespace osu.Game.Screens.Menu { if(menuMusic) bgm.Start(); - else if (song != null) - { - Task.Run(() => - { - trackManager.SetExclusive(song.Track); - song.Track.Seek(beatmap.Metadata.PreviewTime); - if (beatmap.Metadata.PreviewTime == -1) - song.Track.Seek(song.Track.Length * .4f); - }); - } LoadComponentAsync(mainMenu = new MainMenu()); Scheduler.AddDelayed(delegate { - if (!menuMusic && song != null) - Task.Run(() => song.Track.Start()); DidLoadMenu = true; Push(mainMenu); }, 2300); diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index 59528dad91..59ba52dc58 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -2,8 +2,14 @@ // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Allocation; +using osu.Framework.Audio.Track; +using osu.Framework.Configuration; using osu.Framework.Graphics; +using osu.Framework.MathUtils; using osu.Framework.Screens; +using osu.Game.Beatmaps; +using osu.Game.Configuration; +using osu.Game.Database; using osu.Game.Graphics.Containers; using osu.Game.Screens.Backgrounds; using osu.Game.Screens.Charts; @@ -15,6 +21,7 @@ using osu.Game.Screens.Select; using osu.Game.Screens.Tournament; using osu.Framework.Input; using OpenTK.Input; +using System.Threading.Tasks; namespace osu.Game.Screens.Menu { @@ -54,11 +61,30 @@ namespace osu.Game.Screens.Menu }; } + private Bindable menuMusic; + private TrackManager trackManager; + private BeatmapInfo beatmap; + private WorkingBeatmap song; + private int choosableBeatmapsetAmmout; + [BackgroundDependencyLoader] - private void load(OsuGame game) + private void load(OsuGame game, OsuConfigManager config, BeatmapDatabase beatmaps) { + menuMusic = config.GetBindable(OsuConfig.MenuMusic); LoadComponentAsync(background); + if (!menuMusic) + { + trackManager = game.Audio.Track; + choosableBeatmapsetAmmout = beatmaps.Query().Count(); + if (choosableBeatmapsetAmmout > 0) + { + beatmap = beatmaps.GetWithChildren(RNG.Next(1, choosableBeatmapsetAmmout)).Beatmaps[0]; + song = beatmaps.GetWorkingBeatmap(beatmap); + Beatmap = song; + } + } + buttons.OnSettings = game.ToggleOptions; preloadSongSelect(); @@ -81,6 +107,15 @@ namespace osu.Game.Screens.Menu { base.OnEntering(last); buttons.FadeInFromZero(500); + if(last is Intro && song != null) + Task.Run(() => + { + trackManager.SetExclusive(song.Track); + song.Track.Seek(beatmap.Metadata.PreviewTime); + if (beatmap.Metadata.PreviewTime == -1) + song.Track.Seek(song.Track.Length * .4f); + song.Track.Start(); + }); } protected override void OnSuspending(Screen next) From fe35d20defd4249fbacfa7212dd30e9cf8af91b8 Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Sun, 23 Apr 2017 00:50:02 -0500 Subject: [PATCH 09/13] Remove not needed stuff (+typo fix) --- osu.Game/Screens/Menu/Intro.cs | 10 +--------- osu.Game/Screens/Menu/MainMenu.cs | 7 +++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index a899e483b4..fe32965e64 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -1,18 +1,14 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System.Threading.Tasks; using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Audio.Sample; using osu.Framework.Audio.Track; using osu.Framework.Configuration; -using osu.Framework.MathUtils; using osu.Framework.Screens; using osu.Framework.Graphics; -using osu.Game.Beatmaps; using osu.Game.Configuration; -using osu.Game.Database; using osu.Game.Graphics.Containers; using osu.Game.Screens.Backgrounds; using OpenTK.Graphics; @@ -64,13 +60,9 @@ namespace osu.Game.Screens.Menu private Bindable menuVoice; private Bindable menuMusic; - private TrackManager trackManager; - private BeatmapInfo beatmap; - private WorkingBeatmap song; - private int choosableBeatmapsetAmmout; [BackgroundDependencyLoader] - private void load(OsuGameBase game, AudioManager audio, OsuConfigManager config, BeatmapDatabase beatmaps) + private void load(OsuGameBase game, AudioManager audio, OsuConfigManager config) { menuVoice = config.GetBindable(OsuConfig.MenuVoice); menuMusic = config.GetBindable(OsuConfig.MenuMusic); diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index 59ba52dc58..b2bb1ff29c 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -65,7 +65,6 @@ namespace osu.Game.Screens.Menu private TrackManager trackManager; private BeatmapInfo beatmap; private WorkingBeatmap song; - private int choosableBeatmapsetAmmout; [BackgroundDependencyLoader] private void load(OsuGame game, OsuConfigManager config, BeatmapDatabase beatmaps) @@ -76,10 +75,10 @@ namespace osu.Game.Screens.Menu if (!menuMusic) { trackManager = game.Audio.Track; - choosableBeatmapsetAmmout = beatmaps.Query().Count(); - if (choosableBeatmapsetAmmout > 0) + int choosableBeatmapsetAmmount = beatmaps.Query().Count(); + if (choosableBeatmapsetAmmount > 0) { - beatmap = beatmaps.GetWithChildren(RNG.Next(1, choosableBeatmapsetAmmout)).Beatmaps[0]; + beatmap = beatmaps.GetWithChildren(RNG.Next(1, choosableBeatmapsetAmmount)).Beatmaps[0]; song = beatmaps.GetWorkingBeatmap(beatmap); Beatmap = song; } From 30b7a029dcee4af5fb5fc9f877e219ec4922fc1f Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Sun, 23 Apr 2017 00:57:41 -0500 Subject: [PATCH 10/13] Remove for real this time --- osu.Game/Screens/Menu/Intro.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index fe32965e64..f9b95dd7eb 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -62,7 +62,7 @@ namespace osu.Game.Screens.Menu private Bindable menuMusic; [BackgroundDependencyLoader] - private void load(OsuGameBase game, AudioManager audio, OsuConfigManager config) + private void load(AudioManager audio, OsuConfigManager config) { menuVoice = config.GetBindable(OsuConfig.MenuVoice); menuMusic = config.GetBindable(OsuConfig.MenuMusic); From 1df50adc3a0314c6cb67a808d6161bcb7583d6de Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Mon, 24 Apr 2017 22:48:25 -0500 Subject: [PATCH 11/13] Post-merge fixes (and CodeFactor fixes) --- osu.Game/Configuration/OsuConfigManager.cs | 9 +++++---- osu.Game/Screens/Menu/Intro.cs | 5 ++--- osu.Game/Screens/Menu/MainMenu.cs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs index de3acf7a71..c4765fb05c 100644 --- a/osu.Game/Configuration/OsuConfigManager.cs +++ b/osu.Game/Configuration/OsuConfigManager.cs @@ -35,12 +35,15 @@ namespace osu.Game.Configuration Set(OsuConfig.MenuParallax, true); + Set(OsuConfig.MenuVoice, true); + Set(OsuConfig.MenuMusic, true); + Set(OsuConfig.BeatmapDetailTab, BeatmapDetailTab.Details); Set(OsuConfig.ShowInterface, true); Set(OsuConfig.KeyOverlay, false); - //todo: implement all settings below this line (remove the Disabled set when doing so). + //todo: implement all settings below this line (remove the Disabled set when doing so). Set(OsuConfig.AudioOffset, 0, -500.0, 500.0); Set(OsuConfig.MouseSpeed, 1.0).Disabled = true; @@ -178,8 +181,7 @@ namespace osu.Game.Configuration Set(OsuConfig.CanForceOptimusCompatibility, true).Disabled = true; Set(OsuConfig.ConfineMouse, Get(OsuConfig.ConfineMouseToFullscreen) ? ConfineMouseMode.Fullscreen : ConfineMouseMode.Never).Disabled = true; - - + GetOriginalBindable(OsuConfig.SavePassword).ValueChanged += delegate { if (Get(OsuConfig.SavePassword)) Set(OsuConfig.SaveUsername, true); @@ -344,6 +346,5 @@ namespace osu.Game.Configuration Ticker, CompatibilityContext, CanForceOptimusCompatibility, - } } diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index f9b95dd7eb..92032e5120 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -72,19 +72,18 @@ namespace osu.Game.Screens.Menu welcome = audio.Sample.Get(@"welcome"); seeya = audio.Sample.Get(@"seeya"); - } protected override void OnEntering(Screen last) { base.OnEntering(last); - if(menuVoice) + if (menuVoice) welcome.Play(); Scheduler.AddDelayed(delegate { - if(menuMusic) + if (menuMusic) bgm.Start(); LoadComponentAsync(mainMenu = new MainMenu()); diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index b2bb1ff29c..32d7835694 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -106,7 +106,7 @@ namespace osu.Game.Screens.Menu { base.OnEntering(last); buttons.FadeInFromZero(500); - if(last is Intro && song != null) + if (last is Intro && song != null) Task.Run(() => { trackManager.SetExclusive(song.Track); From 51c577624bbaf27d114a5ed0b57b058329ca4a60 Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Mon, 24 Apr 2017 22:59:33 -0500 Subject: [PATCH 12/13] Remove BeatmapInfo field --- osu.Game/Configuration/OsuConfigManager.cs | 4 +--- osu.Game/Screens/Menu/MainMenu.cs | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs index c4765fb05c..f0279aa2de 100644 --- a/osu.Game/Configuration/OsuConfigManager.cs +++ b/osu.Game/Configuration/OsuConfigManager.cs @@ -151,8 +151,6 @@ namespace osu.Game.Configuration Set(OsuConfig.YahooIntegration, false).Disabled = true; Set(OsuConfig.ForceFrameFlush, false).Disabled = true; Set(OsuConfig.DetectPerformanceIssues, true).Disabled = true; - Set(OsuConfig.MenuMusic, true).Disabled = true; - Set(OsuConfig.MenuVoice, true).Disabled = true; Set(OsuConfig.RawInput, false).Disabled = true; Set(OsuConfig.AbsoluteToOsuWindow, Get(OsuConfig.RawInput)).Disabled = true; Set(OsuConfig.ShowMenuTips, true).Disabled = true; @@ -181,7 +179,7 @@ namespace osu.Game.Configuration Set(OsuConfig.CanForceOptimusCompatibility, true).Disabled = true; Set(OsuConfig.ConfineMouse, Get(OsuConfig.ConfineMouseToFullscreen) ? ConfineMouseMode.Fullscreen : ConfineMouseMode.Never).Disabled = true; - + GetOriginalBindable(OsuConfig.SavePassword).ValueChanged += delegate { if (Get(OsuConfig.SavePassword)) Set(OsuConfig.SaveUsername, true); diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index 32d7835694..6c393d7498 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -63,7 +63,6 @@ namespace osu.Game.Screens.Menu private Bindable menuMusic; private TrackManager trackManager; - private BeatmapInfo beatmap; private WorkingBeatmap song; [BackgroundDependencyLoader] @@ -78,8 +77,7 @@ namespace osu.Game.Screens.Menu int choosableBeatmapsetAmmount = beatmaps.Query().Count(); if (choosableBeatmapsetAmmount > 0) { - beatmap = beatmaps.GetWithChildren(RNG.Next(1, choosableBeatmapsetAmmount)).Beatmaps[0]; - song = beatmaps.GetWorkingBeatmap(beatmap); + song = beatmaps.GetWorkingBeatmap(beatmaps.GetWithChildren(RNG.Next(1, choosableBeatmapsetAmmount)).Beatmaps[0]); Beatmap = song; } } @@ -110,8 +108,8 @@ namespace osu.Game.Screens.Menu Task.Run(() => { trackManager.SetExclusive(song.Track); - song.Track.Seek(beatmap.Metadata.PreviewTime); - if (beatmap.Metadata.PreviewTime == -1) + song.Track.Seek(song.Beatmap.Metadata.PreviewTime); + if (song.Beatmap.Metadata.PreviewTime == -1) song.Track.Seek(song.Track.Length * .4f); song.Track.Start(); }); From f93adebc52f933ebed8e3ee102d7f29f2f8c1884 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 25 Apr 2017 13:33:34 +0900 Subject: [PATCH 13/13] Minor style fixes. --- osu.Game/Screens/Menu/MainMenu.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index 6c393d7498..dc4ec92ee2 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -105,14 +105,16 @@ namespace osu.Game.Screens.Menu base.OnEntering(last); buttons.FadeInFromZero(500); if (last is Intro && song != null) + { Task.Run(() => { trackManager.SetExclusive(song.Track); song.Track.Seek(song.Beatmap.Metadata.PreviewTime); if (song.Beatmap.Metadata.PreviewTime == -1) - song.Track.Seek(song.Track.Length * .4f); + song.Track.Seek(song.Track.Length * 0.4f); song.Track.Start(); }); + } } protected override void OnSuspending(Screen next)