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

Merge remote-tracking branch 'upstream/master' into replay

Browse Source 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
This commit is contained in:
Dean Herbert
2017-03-07 13:50:08 +09:00
parent bc74f453aa 688388333b
commit 4430255ec4
171 changed files with 513 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Allocation;
using osu.Game.Beatmaps;
using osu.Game.Database;
@ -21,9 +22,11 @@ namespace osu.Game.Screens.Select
public BeatmapDeleteDialog(WorkingBeatmap beatmap)
{
if (beatmap == null) throw new ArgumentNullException(nameof(beatmap));
Icon = FontAwesome.fa_trash_o;
HeaderText = @"Confirm deletion of";
BodyText = $@"{beatmap?.Beatmap?.Metadata?.Artist} - {beatmap?.Beatmap?.Metadata?.Title}";
BodyText = $@"{beatmap.Beatmap?.Metadata?.Artist} - {beatmap.Beatmap?.Metadata?.Title}";
Buttons = new PopupDialogButton[]
{
new PopupDialogOkButton

4
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -24,7 +24,7 @@ using osu.Game.Modes;
namespace osu.Game.Screens.Select
{
class BeatmapInfoWedge : Container
internal class BeatmapInfoWedge : Container
{
private static readonly Vector2 wedged_container_shear = new Vector2(0.15f, 0);
@ -55,7 +55,7 @@ namespace osu.Game.Screens.Select
public void UpdateBeatmap(WorkingBeatmap beatmap)
{
if (beatmap == null)
if (beatmap?.BeatmapInfo == null)
return;
var lastContainer = beatmapInfoContainer;

4
osu.Game/Screens/Select/CarouselContainer.cs
View File

@ -18,7 +18,7 @@ using System.Diagnostics;
namespace osu.Game.Screens.Select
{
class CarouselContainer : ScrollContainer, IEnumerable<BeatmapGroup>
internal class CarouselContainer : ScrollContainer, IEnumerable<BeatmapGroup>
{
private Container<Panel> scrollableContent;
private List<BeatmapGroup> groups = new List<BeatmapGroup>();
@ -354,7 +354,7 @@ namespace osu.Game.Screens.Select
public void SelectRandom()
{
List<BeatmapGroup> visibleGroups = this.groups.Where((BeatmapGroup selectGroup) => selectGroup.State != BeatmapGroupState.Hidden).ToList();
List<BeatmapGroup> visibleGroups = groups.Where(selectGroup => selectGroup.State != BeatmapGroupState.Hidden).ToList();
if (visibleGroups.Count < 1)
return;
BeatmapGroup group = visibleGroups[RNG.Next(visibleGroups.Count)];

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

@ -8,7 +8,7 @@ using osu.Game.Screens.Edit;
namespace osu.Game.Screens.Select
{
class EditSongSelect : ScreenWhiteBox
internal class EditSongSelect : ScreenWhiteBox
{
protected override IEnumerable<Type> PossibleChildren => new[] {
typeof(Editor)

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

@ -5,7 +5,7 @@ using osu.Game.Screens.Backgrounds;
namespace osu.Game.Screens.Select
{
class MatchSongSelect : ScreenWhiteBox
internal class MatchSongSelect : ScreenWhiteBox
{
protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4");
}

2
osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
View File

@ -124,7 +124,7 @@ namespace osu.Game.Screens.Select.Options
};
}
class ButtonFlow : FillFlowContainer<BeatmapOptionsButton>
private class ButtonFlow : FillFlowContainer<BeatmapOptionsButton>
{
protected override IComparer<Drawable> DepthComparer => new ReverseCreationOrderDepthComparer();
protected override IEnumerable<BeatmapOptionsButton> FlowingChildren => base.FlowingChildren.Reverse();

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

@ -59,7 +59,7 @@ namespace osu.Game.Screens.Select
private BeatmapOptionsOverlay beatmapOptions;
private Footer footer;
OsuScreen player;
private OsuScreen player;
private FilterControl filter;
public FilterControl Filter