h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:47:29 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-decoding-loop

Browse Source
This commit is contained in:
Shane Woolcock 2019-08-22 17:02:13 +09:30 committed by GitHub
commit f19b5ba570
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Overlays/SettingsSubPanel.cs
View File

@ -57,7 +57,6 @@ namespace osu.Game.Overlays
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Y = -15,
Size = new Vector2(15), Size = new Vector2(15),
Shadow = true, Shadow = true,
Icon = FontAwesome.Solid.ChevronLeft Icon = FontAwesome.Solid.ChevronLeft

1
osu.Game/Rulesets/UI/ModIcon.cs
View File

@ -52,7 +52,6 @@ namespace osu.Game.Rulesets.UI
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Size = new Vector2(size), Size = new Vector2(size),
Icon = OsuIcon.ModBg, Icon = OsuIcon.ModBg,
Y = -6.5f,
Shadow = true, Shadow = true,
}, },
modIcon = new SpriteIcon modIcon = new SpriteIcon

1
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
View File

@ -98,6 +98,7 @@ namespace osu.Game.Screens.Select.Carousel
new FillFlowContainer<FilterableDifficultyIcon> new FillFlowContainer<FilterableDifficultyIcon>
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Spacing = new Vector2(3),
Children = ((CarouselBeatmapSet)Item).Beatmaps.Select(b => new FilterableDifficultyIcon(b)).ToList() Children = ((CarouselBeatmapSet)Item).Beatmaps.Select(b => new FilterableDifficultyIcon(b)).ToList()
}, },
} }