mirror of https://github.com/ppy/osu
Merge branch 'master' into clean-overlays-code-1
This commit is contained in:
commit
23b5271ce4
|
@ -14,8 +14,6 @@ public abstract class MultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen, I
|
|||
{
|
||||
public override bool DisallowExternalBeatmapRulesetChanges => false;
|
||||
|
||||
public override bool RemoveWhenNotAlive => false;
|
||||
|
||||
public virtual string ShortTitle => Title;
|
||||
|
||||
[Resolved(CanBeNull = true)]
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.3" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
|
||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.128.0" />
|
||||
<PackageReference Include="ppy.osu.Framework" Version="2019.323.0" />
|
||||
<PackageReference Include="ppy.osu.Framework" Version="2019.325.0" />
|
||||
<PackageReference Include="SharpCompress" Version="0.23.0" />
|
||||
<PackageReference Include="NUnit" Version="3.11.0" />
|
||||
<PackageReference Include="SharpRaven" Version="2.4.0" />
|
||||
|
|
|
@ -105,8 +105,8 @@
|
|||
<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.128.0" />
|
||||
<PackageReference Include="ppy.osu.Framework" Version="2019.323.0" />
|
||||
<PackageReference Include="ppy.osu.Framework.iOS" Version="2019.323.0" />
|
||||
<PackageReference Include="ppy.osu.Framework" Version="2019.325.0" />
|
||||
<PackageReference Include="ppy.osu.Framework.iOS" Version="2019.325.0" />
|
||||
<PackageReference Include="SharpCompress" Version="0.22.0" />
|
||||
<PackageReference Include="NUnit" Version="3.11.0" />
|
||||
<PackageReference Include="SharpRaven" Version="2.4.0" />
|
||||
|
|
Loading…
Reference in New Issue