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

Merge remote-tracking branch 'origin/master' into multiplayer-room-settings

Browse Source
This commit is contained in:
smoogipoo
2018-11-26 16:27:22 +09:00
parent e6d5bbd886 e94c5dfabe
commit dcf740e5d3
696 changed files with 10602 additions and 5266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Screens/Multi/Components/BeatmapTitle.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Localisation;
@ -14,8 +13,6 @@ namespace osu.Game.Screens.Multi.Components
{
private readonly OsuSpriteText beatmapTitle, beatmapDash, beatmapArtist;
private LocalisationEngine localisation;
public float TextSize
{
set { beatmapTitle.TextSize = beatmapDash.TextSize = beatmapArtist.TextSize = value; }
@ -48,12 +45,6 @@ namespace osu.Game.Screens.Multi.Components
};
}
[BackgroundDependencyLoader]
private void load(LocalisationEngine localisation)
{
this.localisation = localisation;
}
protected override void LoadComplete()
{
base.LoadComplete();
@ -64,15 +55,14 @@ namespace osu.Game.Screens.Multi.Components
{
if (beatmap == null)
{
beatmapTitle.Current = beatmapArtist.Current = null;
beatmapTitle.Text = "Changing map";
beatmapDash.Text = beatmapArtist.Text = string.Empty;
}
else
{
beatmapTitle.Current = localisation.GetUnicodePreference(beatmap.Metadata.TitleUnicode, beatmap.Metadata.Title);
beatmapTitle.Text = new LocalisedString((beatmap.Metadata.TitleUnicode, beatmap.Metadata.Title));
beatmapDash.Text = @" - ";
beatmapArtist.Current = localisation.GetUnicodePreference(beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist);
beatmapArtist.Text = new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist));
}
}
}

2
osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
View File

@ -8,7 +8,7 @@ using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Multiplayer;
using OpenTK;
using osuTK;
namespace osu.Game.Screens.Multi.Components
{

8
osu.Game/Screens/Multi/Components/DrawableRoom.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.States;
using osu.Framework.Input.Events;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics;
@ -19,8 +19,8 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer;
using osu.Game.Users;
using OpenTK;
using OpenTK.Graphics;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Components
{
@ -246,7 +246,7 @@ namespace osu.Game.Screens.Multi.Components
this.FadeInFromZero(transition_duration);
}
protected override bool OnClick(InputState state)
protected override bool OnClick(ClickEvent e)
{
if (Enabled.Value)
{

2
osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Online.Multiplayer;
using OpenTK;
using osuTK;
namespace osu.Game.Screens.Multi.Components
{

2
osu.Game/Screens/Multi/Components/ParticipantInfo.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Users;
using OpenTK;
using osuTK;
namespace osu.Game.Screens.Multi.Components
{

4
osu.Game/Screens/Multi/Components/RoomInspector.cs
View File

@ -18,8 +18,8 @@ using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Multiplayer;
using osu.Game.Users;
using OpenTK;
using OpenTK.Graphics;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Components
{

4
osu.Game/Screens/Multi/Header.cs
View File

@ -11,8 +11,8 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays.SearchableList;
using osu.Game.Screens.Multi.Screens;
using OpenTK;
using OpenTK.Graphics;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi
{

2
osu.Game/Screens/Multi/Screens/Lounge/FilterControl.cs
View File

@ -4,7 +4,7 @@
using osu.Game.Graphics;
using osu.Game.Online.Multiplayer;
using osu.Game.Overlays.SearchableList;
using OpenTK.Graphics;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Screens.Lounge
{

6
osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
View File

@ -6,13 +6,13 @@ using System.Linq;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input.States;
using osu.Framework.Input.Events;
using osu.Framework.Screens;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer;
using osu.Game.Overlays.SearchableList;
using osu.Game.Screens.Multi.Components;
using OpenTK;
using osuTK;
namespace osu.Game.Screens.Multi.Screens.Lounge
{
@ -112,7 +112,7 @@ namespace osu.Game.Screens.Multi.Screens.Lounge
};
}
protected override void OnFocus(InputState state)
protected override void OnFocus(FocusEvent e)
{
GetContainingInputManager().ChangeFocus(Filter.Search);
}

21
osu.Game/Screens/Multi/Screens/Match/Header.cs
View File

@ -8,8 +8,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.EventArgs;
using osu.Framework.Input.States;
using osu.Framework.Input.Events;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics;
@ -17,7 +16,7 @@ using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays.SearchableList;
using OpenTK.Graphics;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Screens.Match
{
@ -151,28 +150,28 @@ namespace osu.Game.Screens.Multi.Screens.Match
border.BorderColour = colours.Yellow;
}
protected override bool OnHover(InputState state)
protected override bool OnHover(HoverEvent e)
{
border.FadeIn(transition_duration);
return base.OnHover(state);
return base.OnHover(e);
}
protected override void OnHoverLost(InputState state)
protected override void OnHoverLost(HoverLostEvent e)
{
base.OnHoverLost(state);
base.OnHoverLost(e);
border.FadeOut(transition_duration);
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
protected override bool OnMouseDown(MouseDownEvent e)
{
bg.FadeTo(0.75f, 1000, Easing.Out);
return base.OnMouseDown(state, args);
return base.OnMouseDown(e);
}
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
protected override bool OnMouseUp(MouseUpEvent e)
{
bg.FadeTo(bg_opacity, transition_duration);
return base.OnMouseUp(state, args);
return base.OnMouseUp(e);
}
}
}

2
osu.Game/Screens/Multi/Screens/Match/Info.cs
View File

@ -15,7 +15,7 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer;
using osu.Game.Overlays.SearchableList;
using osu.Game.Screens.Multi.Components;
using OpenTK;
using osuTK;
namespace osu.Game.Screens.Multi.Screens.Match
{

2
osu.Game/Screens/Multi/Screens/Match/Participants.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Overlays.SearchableList;
using osu.Game.Screens.Multi.Components;
using osu.Game.Users;
using OpenTK;
using osuTK;
namespace osu.Game.Screens.Multi.Screens.Match
{