Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode

This commit is contained in:
Roman Kapustin
2018-06-21 19:44:29 +03:00
32 changed files with 1614 additions and 201 deletions

View File

@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Notifications
}
});
Content.Add(textDrawable = new OsuTextFlowContainer(t => t.TextSize = 16)
Content.Add(textDrawable = new OsuTextFlowContainer(t => t.TextSize = 14)
{
Colour = OsuColour.Gray(128),
AutoSizeAxes = Axes.Y,