h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 15:23:14 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into markdown-footnote-support

Browse Source
This commit is contained in:
Dean Herbert 2022-12-20 13:48:35 +09:00 committed by GitHub
commit 4a9b58adda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Android.props
View File

@ -12,9 +12,6 @@
<ItemGroup>
<PackageReference Include="ppy.osu.Framework.Android" Version="2022.1219.0" />
</ItemGroup>
<ItemGroup>
<LinkDescription Include="$(MSBuildThisFileDirectory)\osu.Android\Linker.xml"/>
</ItemGroup>
<PropertyGroup>
<!-- Fody does not handle Android build well, and warns when unchanged.
Since Realm objects are not declared directly in Android projects, simply disable Fody. -->

7
osu.Android/Linker.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<linker>
<assembly fullname="mscorlib">
<!-- see https://github.com/ppy/osu/issues/21516 -->
<type fullname="System.Globalization.*Calendar"/>
</assembly>
</linker>

4
osu.Game/Graphics/Containers/OsuClickableContainer.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -46,5 +47,8 @@ namespace osu.Game.Graphics.Containers
AddInternal(content);
Add(CreateHoverSounds(sampleSet));
}
protected override void ClearInternal(bool disposeChildren = true) =>
throw new InvalidOperationException($"Clearing {nameof(InternalChildren)} will cause critical failure. Use {nameof(Clear)} instead.");
}
}

4
osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
View File

@ -147,7 +147,7 @@ namespace osu.Game.Overlays.FirstRunSetup
[BackgroundDependencyLoader]
private void load()
{
InternalChildren = new Drawable[]
AddRange(new Drawable[]
{
backgroundBox = new Box
{
@ -162,7 +162,7 @@ namespace osu.Game.Overlays.FirstRunSetup
Colour = colourProvider.Light1,
Text = Language.GetDescription(),
}
};
});
}
protected override void LoadComplete()

31
osu.iOS/Linker.xml
View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<linker>
<assembly fullname="System.Linq.Queryable">
<type fullname="*" />
</assembly>
<assembly fullname="osu.Framework">
<type fullname="*" />
</assembly>
<assembly fullname="osu.Framework.iOS">
<type fullname="*" />
</assembly>
<assembly fullname="osu.Game.Resources">
<type fullname="*" />
</assembly>
<assembly fullname="osu.Game.Rulesets.Catch">
<type fullname="*" />
</assembly>
<assembly fullname="osu.Game.Rulesets.Taiko">
<type fullname="*" />
</assembly>
<assembly fullname="osu.Game.Rulesets.Mania">
<type fullname="*" />
</assembly>
<assembly fullname="osu.Game.Rulesets.Osu">
<type fullname="*" />
</assembly>
<assembly fullname="mscorlib">
<!-- see https://github.com/ppy/osu/issues/21516 -->
<type fullname="System.Globalization.*Calendar"/>
</assembly>
</linker>