1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 10:33:30 +08:00

Merge branch 'drawnode-subtree-draw-cleanup' into dropdown-search

This commit is contained in:
Dean Herbert 2023-12-13 14:03:46 +09:00
commit ae8a70ddfc
No known key found for this signature in database
12 changed files with 12 additions and 12 deletions

View File

@ -10,7 +10,7 @@
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Framework.Android" Version="2023.1201.1" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2023.1213.0" />
</ItemGroup>
<PropertyGroup>
<!-- Fody does not handle Android build well, and warns when unchanged.

View File

@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
relativeGlowSize = Source.glowSize / Source.DrawSize.X;
}
public override void Draw(IRenderer renderer)
protected override void Draw(IRenderer renderer)
{
base.Draw(renderer);
drawGlow(renderer);

View File

@ -231,7 +231,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
points.AddRange(Source.SmokePoints.Skip(firstVisiblePointIndex).Take(futurePointIndex - firstVisiblePointIndex));
}
public sealed override void Draw(IRenderer renderer)
protected sealed override void Draw(IRenderer renderer)
{
base.Draw(renderer);

View File

@ -258,7 +258,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
private IUniformBuffer<CursorTrailParameters> cursorTrailParameters;
public override void Draw(IRenderer renderer)
protected override void Draw(IRenderer renderer)
{
base.Draw(renderer);

View File

@ -286,7 +286,7 @@ namespace osu.Game.Graphics.Backgrounds
private IUniformBuffer<TriangleBorderData> borderDataBuffer;
public override void Draw(IRenderer renderer)
protected override void Draw(IRenderer renderer)
{
base.Draw(renderer);

View File

@ -228,7 +228,7 @@ namespace osu.Game.Graphics.Backgrounds
private IUniformBuffer<TriangleBorderData>? borderDataBuffer;
public override void Draw(IRenderer renderer)
protected override void Draw(IRenderer renderer)
{
base.Draw(renderer);

View File

@ -134,7 +134,7 @@ namespace osu.Game.Graphics.UserInterface
lengths.AddRange(Source.bars.InstantaneousLengths);
}
public override void Draw(IRenderer renderer)
protected override void Draw(IRenderer renderer)
{
base.Draw(renderer);

View File

@ -221,7 +221,7 @@ namespace osu.Game.Graphics.UserInterface
tierColours.AddRange(Source.tierColours);
}
public override void Draw(IRenderer renderer)
protected override void Draw(IRenderer renderer)
{
base.Draw(renderer);

View File

@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Mods
private IUniformBuffer<FlashlightParameters>? flashlightParametersBuffer;
public override void Draw(IRenderer renderer)
protected override void Draw(IRenderer renderer)
{
base.Draw(renderer);

View File

@ -189,7 +189,7 @@ namespace osu.Game.Screens.Menu
Source.frequencyAmplitudes.AsSpan().CopyTo(audioData);
}
public override void Draw(IRenderer renderer)
protected override void Draw(IRenderer renderer)
{
base.Draw(renderer);

View File

@ -36,7 +36,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Realm" Version="11.5.0" />
<PackageReference Include="ppy.osu.Framework" Version="2023.1201.1" />
<PackageReference Include="ppy.osu.Framework" Version="2023.1213.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2023.1127.0" />
<PackageReference Include="Sentry" Version="3.40.0" />
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->

View File

@ -23,6 +23,6 @@
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1201.1" />
<PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1213.0" />
</ItemGroup>
</Project>