sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer

Browse Source
This commit is contained in:
jorolf
2019-03-02 19:04:48 +01:00
parent 4c10185f5b c8cf966e81
commit 176cbc7f2e
365 changed files with 3211 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Menu/Button.cs
View File

@ -242,7 +242,7 @@ namespace osu.Game.Screens.Menu
public ButtonState State
{
get { return state; }
get => state;
set
{

2
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -206,7 +206,7 @@ namespace osu.Game.Screens.Menu
public ButtonSystemState State
{
get { return state; }
get => state;
set
{

4
osu.Game/Screens/Menu/Disclaimer.cs
View File

@ -76,13 +76,13 @@ namespace osu.Game.Screens.Menu
textFlow.AddParagraph("Things may not work as expected", t => t.Font = t.Font.With(size: 20));
textFlow.NewParagraph();
Action<SpriteText> format = t => t.Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold);
Action<SpriteText> format = t => t.Font = OsuFont.GetFont(size: 15, weight: FontWeight.SemiBold);
textFlow.AddParagraph("Detailed bug reports are welcomed via github issues.", format);
textFlow.NewParagraph();
textFlow.AddText("Visit ", format);
textFlow.AddLink("discord.gg/ppy", "https://discord.gg/ppy", creationParameters:format);
textFlow.AddLink("discord.gg/ppy", "https://discord.gg/ppy", creationParameters: format);
textFlow.AddText(" to help out or follow progress!", format);
textFlow.NewParagraph();

2
osu.Game/Screens/Menu/IntroSequence.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Menu
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both,
Children = new []
Children = new[]
{
lineTopLeft = new Box
{

3
osu.Game/Screens/Menu/LogoVisualisation.cs
View File

@ -156,7 +156,9 @@ namespace osu.Game.Screens.Menu
{
public Shader Shader;
public Texture Texture;
public VisualiserSharedData Shared;
//Asuming the logo is a circle, we don't need a second dimension.
public float Size;
@ -213,6 +215,7 @@ namespace osu.Game.Screens.Menu
}
}
}
Shader.Unbind();
}
}

6
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -62,7 +62,7 @@ namespace osu.Game.Screens.Menu
public bool Triangles
{
set { colourAndTriangles.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint); }
set => colourAndTriangles.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint);
}
public bool BeatMatching = true;
@ -71,8 +71,8 @@ namespace osu.Game.Screens.Menu
public bool Ripple
{
get { return rippleContainer.Alpha > 0; }
set { rippleContainer.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint); }
get => rippleContainer.Alpha > 0;
set => rippleContainer.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint);
}
private readonly Box flashLayer;