RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-27 01:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28882 from peppy/update-framework

Browse Source 
Update framework
This commit is contained in:
Bartłomiej Dach 2024-07-16 12:28:51 +02:00 committed by GitHub
commit ad2db3f853
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

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

2
osu.Game/Screens/Edit/Editor.cs
View File

@ -328,7 +328,7 @@ namespace osu.Game.Screens.Edit
{
Name = "Screen container",
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = 40, Bottom = 40 },
Padding = new MarginPadding { Top = 40, Bottom = 50 },
Child = screenContainer = new Container<EditorScreen>
{
RelativeSizeAxes = Axes.Both,

3
osu.Game/Screens/Edit/Timing/ControlPointTable.cs
View File

@ -104,10 +104,11 @@ namespace osu.Game.Screens.Edit.Timing
// child items valid coordinates from the start, so ballpark something similar
// using estimated row height.
var row = Items.FlowingChildren.SingleOrDefault(item => item.Row.Equals(val.NewValue));
if (row == null)
return;
float minPos = Items.GetLayoutPosition(row) * row_height;
float minPos = row.Y;
float maxPos = minPos + row_height;
if (minPos < Scroll.Current)

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

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

2
osu.iOS.props
View File

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