mirror of https://github.com/ppy/osu
Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.1' into fix-catch-catcher
This commit is contained in:
commit
858828d4ef
|
@ -60,7 +60,7 @@
|
|||
<Reference Include="Java.Interop" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.903.0" />
|
||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.903.1" />
|
||||
<PackageReference Include="ppy.osu.Framework.Android" Version="2019.830.1" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
@ -25,7 +25,7 @@ private void load(TextureStore textures)
|
|||
{
|
||||
Anchor = Anchor.Centre,
|
||||
Origin = Anchor.Centre,
|
||||
Texture = textures.Get("ring-glow"),
|
||||
Texture = textures.Get("Gameplay/osu/ring-glow"),
|
||||
Blending = BlendingParameters.Additive,
|
||||
Alpha = 0.5f
|
||||
};
|
||||
|
|
|
@ -121,10 +121,11 @@ public ChannelListItem(Channel channel)
|
|||
{
|
||||
new SpriteIcon
|
||||
{
|
||||
Anchor = Anchor.CentreLeft,
|
||||
Origin = Anchor.CentreLeft,
|
||||
Icon = FontAwesome.Solid.User,
|
||||
Size = new Vector2(text_size - 2),
|
||||
Shadow = false,
|
||||
Margin = new MarginPadding { Top = 1 },
|
||||
},
|
||||
new OsuSpriteText
|
||||
{
|
||||
|
|
|
@ -190,10 +190,11 @@ public Statistic(IconUsage icon, int value = 0)
|
|||
text = new OsuSpriteText { Font = OsuFont.GetFont(weight: FontWeight.SemiBold, italics: true) },
|
||||
new SpriteIcon
|
||||
{
|
||||
Anchor = Anchor.CentreLeft,
|
||||
Origin = Anchor.CentreLeft,
|
||||
Icon = icon,
|
||||
Shadow = true,
|
||||
Size = new Vector2(14),
|
||||
Margin = new MarginPadding { Top = 1 },
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -161,12 +161,12 @@ private class PlaylistItemHandle : SpriteIcon
|
|||
{
|
||||
public PlaylistItemHandle()
|
||||
{
|
||||
Anchor = Anchor.TopLeft;
|
||||
Origin = Anchor.TopLeft;
|
||||
Anchor = Anchor.CentreLeft;
|
||||
Origin = Anchor.CentreLeft;
|
||||
Size = new Vector2(12);
|
||||
Icon = FontAwesome.Solid.Bars;
|
||||
Alpha = 0f;
|
||||
Margin = new MarginPadding { Left = 5, Top = 2 };
|
||||
Margin = new MarginPadding { Left = 5 };
|
||||
}
|
||||
|
||||
public override bool HandlePositionalInput => IsPresent;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
|
||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.903.0" />
|
||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.903.1" />
|
||||
<PackageReference Include="ppy.osu.Framework" Version="2019.830.1" />
|
||||
<PackageReference Include="SharpCompress" Version="0.24.0" />
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
|
|
|
@ -117,7 +117,7 @@
|
|||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.1" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
|
||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.903.0" />
|
||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.903.1" />
|
||||
<PackageReference Include="ppy.osu.Framework" Version="2019.830.1" />
|
||||
<PackageReference Include="ppy.osu.Framework.iOS" Version="2019.830.1" />
|
||||
<PackageReference Include="SharpCompress" Version="0.24.0" />
|
||||
|
|
Loading…
Reference in New Issue