sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 23:53:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into partial-judgements

Browse Source
This commit is contained in:
Dean Herbert
2017-03-30 14:07:43 +09:00
committed by GitHub
parent 6287ba321d 1004546327
commit 77ac205b62
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
View File

@ -36,7 +36,8 @@ namespace osu.Game.Beatmaps.Drawables
new DelayedLoadContainer new DelayedLoadContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
TimeBeforeLoad = 100, TimeBeforeLoad = 300,
FinishedLoading = d => d.FadeInFromZero(400, EasingTypes.Out),
Children = new[] Children = new[]
{ {
new PanelBackground(beatmap) new PanelBackground(beatmap)

2
osu.Game/OsuGame.cs
View File

@ -199,7 +199,7 @@ namespace osu.Game
{ {
Depth = -3, Depth = -3,
OnHome = delegate { intro?.ChildScreen?.MakeCurrent(); }, OnHome = delegate { intro?.ChildScreen?.MakeCurrent(); },
OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; }, OnPlayModeChange = m => PlayMode.Value = m,
}).LoadAsync(this, t => }).LoadAsync(this, t =>
{ {
PlayMode.ValueChanged += delegate { Toolbar.SetGameMode(PlayMode.Value); }; PlayMode.ValueChanged += delegate { Toolbar.SetGameMode(PlayMode.Value); };

5
osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
View File

@ -65,14 +65,13 @@ namespace osu.Game.Overlays.Toolbar
foreach (PlayMode m in Ruleset.PlayModes) foreach (PlayMode m in Ruleset.PlayModes)
{ {
var localMode = m;
modeButtons.Add(new ToolbarModeButton modeButtons.Add(new ToolbarModeButton
{ {
Mode = m, Mode = m,
Action = delegate Action = delegate
{ {
SetGameMode(localMode); SetGameMode(m);
OnPlayModeChange?.Invoke(localMode); OnPlayModeChange?.Invoke(m);
} }
}); });
} }

5
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -181,7 +181,8 @@ namespace osu.Game.Screens.Select
{ {
if (!IsLoaded) return; if (!IsLoaded) return;
criteria = newCriteria ?? criteria ?? new FilterCriteria(); if (newCriteria != null)
criteria = newCriteria;
Action perform = delegate Action perform = delegate
{ {
@ -202,6 +203,8 @@ namespace osu.Game.Screens.Select
if (selectedGroup == null || selectedGroup.State == BeatmapGroupState.Hidden) if (selectedGroup == null || selectedGroup.State == BeatmapGroupState.Hidden)
SelectNext(); SelectNext();
else
selectGroup(selectedGroup);
}; };
filterTask?.Cancel(); filterTask?.Cancel();

1
osu.Game/Screens/Select/FilterControl.cs
View File

@ -175,6 +175,7 @@ namespace osu.Game.Screens.Select
if (osu != null) if (osu != null)
playMode.BindTo(osu.PlayMode); playMode.BindTo(osu.PlayMode);
playMode.ValueChanged += (s, e) => FilterChanged?.Invoke(CreateCriteria());
} }
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true; protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -276,7 +276,7 @@ namespace osu.Game.Screens.Select
initialAddSetsTask.Cancel(); initialAddSetsTask.Cancel();
} }
private void playMode_ValueChanged(object sender, EventArgs e) => carousel.Filter(); private void playMode_ValueChanged(object sender, EventArgs e) => Beatmap.PreferredPlayMode = playMode;
private void changeBackground(WorkingBeatmap beatmap) private void changeBackground(WorkingBeatmap beatmap)
{ {