sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into osu-fontusage

Browse Source 
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
This commit is contained in:
smoogipoo
2019-02-20 15:04:08 +09:00
parent a2aa3ec5cb 5ac1288f9e
commit 0693ab8e7d
134 changed files with 2930 additions and 1557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/Containers/BeatSyncedContainer.cs
View File

@ -74,7 +74,7 @@ namespace osu.Game.Graphics.Containers
}
[BackgroundDependencyLoader]
private void load(IBindableBeatmap beatmap)
private void load(IBindable<WorkingBeatmap> beatmap)
{
Beatmap.BindTo(beatmap);
}

3
osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
View File

@ -9,12 +9,13 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input;
using osu.Framework.Input.Events;
using osu.Framework.Platform;
namespace osu.Game.Graphics.UserInterface
{
public class OsuPasswordTextBox : OsuTextBox
public class OsuPasswordTextBox : OsuTextBox, ISuppressKeyEventLogging
{
protected override Drawable GetDrawableCharacter(char c) => new PasswordMaskChar(CalculatedTextSize);

2
osu.Game/Graphics/UserInterface/TriangleButton.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Graphics.UserInterface
});
}
public IEnumerable<string> FilterTerms => new[] { Text };
public virtual IEnumerable<string> FilterTerms => new[] { Text };
public bool MatchingFilter
{