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

Merge branch 'master' into drawable-room-update

Browse Source
This commit is contained in:
Dean Herbert
2017-06-25 15:55:36 +09:00
committed by GitHub
parent 5e1cb14e62 b582fc3f39
commit df74a84b35
39 changed files with 39 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Menu/Button.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Screens.Menu
private readonly Key triggerKey;
private SampleChannel sampleClick;
protected override bool InternalContains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public Button(string text, string internalName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
{

8
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Menu
set { colourAndTriangles.Alpha = value ? 1 : 0; }
}
protected override bool InternalContains(Vector2 screenSpacePos) => logoContainer.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => logoContainer.Contains(screenSpacePos);
public bool Ripple
{
@ -227,9 +227,6 @@ namespace osu.Game.Screens.Menu
{
base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
if (Hovering)
sampleBeat.Play();
lastBeatIndex = beatIndex;
var beatLength = timingPoint.BeatLength;
@ -238,6 +235,9 @@ namespace osu.Game.Screens.Menu
if (beatIndex < 0) return;
if (Hovering)
sampleBeat.Play();
logoBeatContainer.ScaleTo(1 - 0.02f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
using (logoBeatContainer.BeginDelayedSequence(beat_in_time))
logoBeatContainer.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint);

2
osu.Game/Screens/Multiplayer/RoomInspector.cs
View File

@ -378,7 +378,7 @@ namespace osu.Game.Screens.Multiplayer
{
participants.Text = value.Length.ToString();
participantInfo.Participants = value;
participantsFlow.Children = value.Select(u => new UserTile(u));
participantsFlow.ChildrenEnumerable = value.Select(u => new UserTile(u));
}
private class UserTile : Container, IHasTooltip

6
osu.Game/Screens/Play/KeyCounterCollection.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Input;
using osu.Framework.Configuration;
using osu.Framework.Allocation;
using osu.Game.Configuration;
using OpenTK;
namespace osu.Game.Screens.Play
{
@ -20,8 +21,6 @@ namespace osu.Game.Screens.Play
public KeyCounterCollection()
{
AlwaysReceiveInput = true;
Direction = FillDirection.Horizontal;
AutoSizeAxes = Axes.Both;
}
@ -124,11 +123,12 @@ namespace osu.Game.Screens.Play
public Receptor(KeyCounterCollection target)
{
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
this.target = target;
}
public override bool Contains(Vector2 screenSpacePos) => true;
public override bool HandleInput => true;
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) => target.Children.Any(c => c.TriggerOnKeyDown(state, args));

4
osu.Game/Screens/Play/KeyCounterMouse.cs
View File

@ -3,6 +3,7 @@
using osu.Framework.Input;
using OpenTK.Input;
using OpenTK;
namespace osu.Game.Screens.Play
{
@ -12,10 +13,11 @@ namespace osu.Game.Screens.Play
public KeyCounterMouse(MouseButton button) : base(getStringRepresentation(button))
{
AlwaysReceiveInput = true;
Button = button;
}
public override bool Contains(Vector2 screenSpacePos) => true;
private static string getStringRepresentation(MouseButton button)
{
switch (button)

1
osu.Game/Screens/Play/MenuOverlay.cs
View File

@ -186,7 +186,6 @@ namespace osu.Game.Screens.Play
protected MenuOverlay()
{
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
}

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

@ -34,8 +34,6 @@ namespace osu.Game.Screens.Play
public SkipButton(double startTime)
{
AlwaysReceiveInput = true;
this.startTime = startTime;
RelativePositionAxes = Axes.Both;

2
osu.Game/Screens/Ranking/ResultsPageScore.cs
View File

@ -164,7 +164,7 @@ namespace osu.Game.Screens.Ranking
}
};
statisticsContainer.Children = Score.Statistics.Select(s => new DrawableScoreStatistic(s));
statisticsContainer.ChildrenEnumerable = Score.Statistics.Select(s => new DrawableScoreStatistic(s));
}
protected override void LoadComplete()

2
osu.Game/Screens/Select/BeatmapDetails.cs
View File

@ -439,7 +439,7 @@ namespace osu.Game.Screens.Select
{
Show();
if (header.Text == "Tags")
content.Children = value.Split(' ').Select(text => new OsuSpriteText
content.ChildrenEnumerable = value.Split(' ').Select(text => new OsuSpriteText
{
Text = text,
Font = "Exo2.0-Regular",

4
osu.Game/Screens/Select/FilterControl.cs
View File

@ -67,7 +67,7 @@ namespace osu.Game.Screens.Select
private readonly SearchTextBox searchTextBox;
protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || groupTabs.Contains(screenSpacePos) || sortTabs.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || groupTabs.Contains(screenSpacePos) || sortTabs.Contains(screenSpacePos);
public FilterControl()
{
@ -82,7 +82,6 @@ namespace osu.Game.Screens.Select
new Container
{
Padding = new MarginPadding(20),
AlwaysReceiveInput = true,
RelativeSizeAxes = Axes.Both,
Width = 0.5f,
Anchor = Anchor.TopRight,
@ -109,7 +108,6 @@ namespace osu.Game.Screens.Select
Direction = FillDirection.Horizontal,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
AlwaysReceiveInput = true,
Children = new Drawable[]
{
groupTabs = new OsuTabControl<GroupMode>

2
osu.Game/Screens/Select/Footer.cs
View File

@ -124,7 +124,7 @@ namespace osu.Game.Screens.Select
updateModeLight();
}
protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || StartButton.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || StartButton.Contains(screenSpacePos);
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;

2
osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
View File

@ -83,7 +83,7 @@ namespace osu.Game.Screens.Select.Options
return false;
}
protected override bool InternalContains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public BeatmapOptionsButton()
{

2
osu.Game/Screens/Tournament/Components/VisualiserContainer.cs
View File

@ -84,7 +84,7 @@ namespace osu.Game.Screens.Tournament.Components
{
base.UpdateAfterChildren();
while (Children.Count() < 3)
while (Children.Count < 3)
addLine();
float pos = leftPos;