h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 06:43:21 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables

Browse Source
This commit is contained in:
Andrei Zavatski 2019-11-28 20:43:17 +03:00
commit 36d694ad2d
7 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

@ -54,6 +54,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2019.1126.0" /> <PackageReference Include="ppy.osu.Framework.Android" Version="2019.1128.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
View File

@ -113,6 +113,7 @@ namespace osu.Game.Tests.Visual.Gameplay
} }
[Test] [Test]
[Ignore("Will be resolved with merge of https://github.com/ppy/osu/pull/6992")]
public void TestExitTooSoon() public void TestExitTooSoon()
{ {
pauseAndConfirm(); pauseAndConfirm();
@ -212,6 +213,7 @@ namespace osu.Game.Tests.Visual.Gameplay
} }
[Test] [Test]
[Ignore("Will be resolved with merge of https://github.com/ppy/osu/pull/6992")]
public void TestRestartAfterResume() public void TestRestartAfterResume()
{ {
pauseAndConfirm(); pauseAndConfirm();

4
osu.Game.Tournament/TournamentGameBase.cs
View File

@ -54,8 +54,8 @@ namespace osu.Game.Tournament
{ {
Resources.AddStore(new DllResourceStore(@"osu.Game.Tournament.dll")); Resources.AddStore(new DllResourceStore(@"osu.Game.Tournament.dll"));
Fonts.AddStore(new GlyphStore(Resources, @"Resources/Fonts/Aquatico-Regular")); AddFont(Resources, @"Resources/Fonts/Aquatico-Regular");
Fonts.AddStore(new GlyphStore(Resources, @"Resources/Fonts/Aquatico-Light")); AddFont(Resources, @"Resources/Fonts/Aquatico-Light");
Textures.AddStore(new TextureLoaderStore(new ResourceStore<byte[]>(new StorageBackedResourceStore(storage)))); Textures.AddStore(new TextureLoaderStore(new ResourceStore<byte[]>(new StorageBackedResourceStore(storage))));

9
osu.Game/Graphics/Backgrounds/Background.cs
View File

@ -16,6 +16,8 @@ namespace osu.Game.Graphics.Backgrounds
/// </summary> /// </summary>
public class Background : CompositeDrawable public class Background : CompositeDrawable
{ {
private const float blur_scale = 0.5f;
public readonly Sprite Sprite; public readonly Sprite Sprite;
private readonly string textureName; private readonly string textureName;
@ -43,7 +45,7 @@ namespace osu.Game.Graphics.Backgrounds
Sprite.Texture = textures.Get(textureName); Sprite.Texture = textures.Get(textureName);
} }
public Vector2 BlurSigma => bufferedContainer?.BlurSigma ?? Vector2.Zero; public Vector2 BlurSigma => bufferedContainer?.BlurSigma / blur_scale ?? Vector2.Zero;
/// <summary> /// <summary>
/// Smoothly adjusts <see cref="IBufferedContainer.BlurSigma"/> over time. /// Smoothly adjusts <see cref="IBufferedContainer.BlurSigma"/> over time.
@ -64,7 +66,10 @@ namespace osu.Game.Graphics.Backgrounds
}); });
} }
bufferedContainer?.BlurTo(newBlurSigma, duration, easing); if (bufferedContainer != null)
bufferedContainer.FrameBufferScale = newBlurSigma == Vector2.Zero ? Vector2.One : new Vector2(blur_scale);
bufferedContainer?.BlurTo(newBlurSigma * blur_scale, duration, easing);
} }
} }
} }

40
osu.Game/OsuGameBase.cs
View File

@ -131,29 +131,29 @@ namespace osu.Game
dependencies.CacheAs(this); dependencies.CacheAs(this);
dependencies.Cache(LocalConfig); dependencies.Cache(LocalConfig);
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont")); AddFont(Resources, @"Fonts/osuFont");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Medium")); AddFont(Resources, @"Fonts/Exo2.0-Medium");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-MediumItalic")); AddFont(Resources, @"Fonts/Exo2.0-MediumItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Noto-Basic")); AddFont(Resources, @"Fonts/Noto-Basic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Noto-Hangul")); AddFont(Resources, @"Fonts/Noto-Hangul");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Noto-CJK-Basic")); AddFont(Resources, @"Fonts/Noto-CJK-Basic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Noto-CJK-Compatibility")); AddFont(Resources, @"Fonts/Noto-CJK-Compatibility");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Regular")); AddFont(Resources, @"Fonts/Exo2.0-Regular");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-RegularItalic")); AddFont(Resources, @"Fonts/Exo2.0-RegularItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-SemiBold")); AddFont(Resources, @"Fonts/Exo2.0-SemiBold");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-SemiBoldItalic")); AddFont(Resources, @"Fonts/Exo2.0-SemiBoldItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Bold")); AddFont(Resources, @"Fonts/Exo2.0-Bold");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BoldItalic")); AddFont(Resources, @"Fonts/Exo2.0-BoldItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Light")); AddFont(Resources, @"Fonts/Exo2.0-Light");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-LightItalic")); AddFont(Resources, @"Fonts/Exo2.0-LightItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Black")); AddFont(Resources, @"Fonts/Exo2.0-Black");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BlackItalic")); AddFont(Resources, @"Fonts/Exo2.0-BlackItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera")); AddFont(Resources, @"Fonts/Venera");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera-Light")); AddFont(Resources, @"Fonts/Venera-Light");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera-Medium")); AddFont(Resources, @"Fonts/Venera-Medium");
runMigrations(); runMigrations();

2
osu.Game/osu.Game.csproj
View File

@ -23,7 +23,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" />
<PackageReference Include="ppy.osu.Framework" Version="2019.1126.0" /> <PackageReference Include="ppy.osu.Framework" Version="2019.1128.1" />
<PackageReference Include="Sentry" Version="1.2.0" /> <PackageReference Include="Sentry" Version="1.2.0" />
<PackageReference Include="SharpCompress" Version="0.24.0" /> <PackageReference Include="SharpCompress" Version="0.24.0" />
<PackageReference Include="NUnit" Version="3.12.0" /> <PackageReference Include="NUnit" Version="3.12.0" />

4
osu.iOS.props
View File

@ -74,7 +74,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Label="Package References"> <ItemGroup Label="Package References">
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" />
<PackageReference Include="ppy.osu.Framework.iOS" Version="2019.1126.0" /> <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.1128.1" />
</ItemGroup> </ItemGroup>
<!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. --> <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
<ItemGroup Label="Transitive Dependencies"> <ItemGroup Label="Transitive Dependencies">
@ -82,7 +82,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="ppy.osu.Framework" Version="2019.1126.0" /> <PackageReference Include="ppy.osu.Framework" Version="2019.1128.1" />
<PackageReference Include="SharpCompress" Version="0.24.0" /> <PackageReference Include="SharpCompress" Version="0.24.0" />
<PackageReference Include="NUnit" Version="3.12.0" /> <PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="SharpRaven" Version="2.4.0" /> <PackageReference Include="SharpRaven" Version="2.4.0" />