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

Merge branch 'master' into fix-song-select-shift-delete

Browse Source
This commit is contained in:
Salman Ahmed 2023-09-21 20:25:43 +03:00 committed by GitHub
commit 095812c6b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 11 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> <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ppy.osu.Framework.Android" Version="2023.914.0" /> <PackageReference Include="ppy.osu.Framework.Android" Version="2023.922.0" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<!-- Fody does not handle Android build well, and warns when unchanged. <!-- Fody does not handle Android build well, and warns when unchanged.

2
osu.Game/Beatmaps/FramedBeatmapClock.cs
View File

@ -216,8 +216,6 @@ namespace osu.Game.Beatmaps
public double FramesPerSecond => finalClockSource.FramesPerSecond; public double FramesPerSecond => finalClockSource.FramesPerSecond;
public FrameTimeInfo TimeInfo => finalClockSource.TimeInfo;
#endregion #endregion
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)

2
osu.Game/Rulesets/UI/FrameStabilityContainer.cs
View File

@ -264,8 +264,6 @@ namespace osu.Game.Rulesets.UI
public double FramesPerSecond => framedClock.FramesPerSecond; public double FramesPerSecond => framedClock.FramesPerSecond;
public FrameTimeInfo TimeInfo => framedClock.TimeInfo;
public double StartTime => parentGameplayClock?.StartTime ?? 0; public double StartTime => parentGameplayClock?.StartTime ?? 0;
private readonly AudioAdjustments gameplayAdjustments = new AudioAdjustments(); private readonly AudioAdjustments gameplayAdjustments = new AudioAdjustments();

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

@ -231,8 +231,6 @@ namespace osu.Game.Screens.Edit
public double FramesPerSecond => underlyingClock.FramesPerSecond; public double FramesPerSecond => underlyingClock.FramesPerSecond;
public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
public void ChangeSource(IClock source) public void ChangeSource(IClock source)
{ {
track.Value = source as Track; track.Value = source as Track;

2
osu.Game/Screens/Play/GameplayClockContainer.cs
View File

@ -234,7 +234,5 @@ namespace osu.Game.Screens.Play
public double ElapsedFrameTime => GameplayClock.ElapsedFrameTime; public double ElapsedFrameTime => GameplayClock.ElapsedFrameTime;
public double FramesPerSecond => GameplayClock.FramesPerSecond; public double FramesPerSecond => GameplayClock.FramesPerSecond;
public FrameTimeInfo TimeInfo => GameplayClock.TimeInfo;
} }
} }

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

@ -36,7 +36,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Realm" Version="11.5.0" /> <PackageReference Include="Realm" Version="11.5.0" />
<PackageReference Include="ppy.osu.Framework" Version="2023.914.0" /> <PackageReference Include="ppy.osu.Framework" Version="2023.922.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" />
<PackageReference Include="Sentry" Version="3.39.1" /> <PackageReference Include="Sentry" Version="3.39.1" />
<PackageReference Include="SharpCompress" Version="0.33.0" /> <PackageReference Include="SharpCompress" Version="0.33.0" />

2
osu.iOS.props
View File

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