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

Merge remote-tracking branch 'upstream/master' into raw-input-osd

Browse Source
This commit is contained in:
Dean Herbert 2017-06-08 20:41:04 +09:00
commit 83cdec3ee6
49 changed files with 43 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
View File

@ -79,7 +79,8 @@ namespace osu.Desktop.VisualTests.Tests
{
score.Current.Value += 300 + (ulong)(300.0 * (comboCounter.Current > 0 ? comboCounter.Current - 1 : 0) / 25.0);
comboCounter.Increment();
numerator++; denominator++;
numerator++;
denominator++;
accuracyCounter.SetFraction(numerator, denominator);
});

1
osu.Game.Rulesets.Mania/MathUtils/FastRandom.cs
View File

@ -87,6 +87,5 @@ namespace osu.Game.Rulesets.Mania.MathUtils
bitIndex++;
return ((bitBuffer >>= 1) & 1) == 1;
}
}
}

2
osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
View File

@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Mania.Timing
public override void InvalidateFromChild(Invalidation invalidation)
{
// We only want to re-compute our size when a child's size or position has changed
if ((invalidation & Invalidation.Geometry) == 0)
if ((invalidation & Invalidation.RequiredParentSizeToFit) == 0)
{
base.InvalidateFromChild(invalidation);
return;

1
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@ -229,7 +229,6 @@ namespace osu.Game.Rulesets.Taiko.UI
if (judgedObject.HitObject.Kiai)
kiaiExplosionContainer.Add(new KiaiHitExplosion(judgedObject.Judgement, isRim));
}
else
hitExplosionContainer.Children.FirstOrDefault(e => e.Judgement == judgedObject.Judgement)?.VisualiseSecondHit();

1
osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
View File

@ -166,4 +166,3 @@ namespace osu.Game.Tests.Beatmaps.IO
}
}
}

1
osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs
View File

@ -86,4 +86,3 @@ namespace osu.Game.Tests.Beatmaps.IO
}
}
}

1
osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
View File

@ -10,7 +10,6 @@ using OpenTK.Graphics;
namespace osu.Game.Beatmaps.Drawables
{
public class DifficultyIcon : DifficultyColouredContainer
{
private readonly BeatmapInfo beatmap;

1
osu.Game/Database/BeatmapDifficulty.cs
View File

@ -39,4 +39,3 @@ namespace osu.Game.Database
}
}
}

1
osu.Game/Database/BeatmapSetInfo.cs
View File

@ -36,4 +36,3 @@ namespace osu.Game.Database
public string StoryboardFile { get; set; }
}
}

1
osu.Game/Online/API/OAuthToken.cs
View File

@ -59,7 +59,6 @@ namespace osu.Game.Online.API
{
}
return null;
}
}

2
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -86,6 +86,6 @@ namespace osu.Game.Overlays.Chat
}
}
private void scrollToEnd() => Scheduler.AddDelayed(() => scroll.ScrollToEnd(), 50);
private void scrollToEnd() => ScheduleAfterChildren(() => scroll.ScrollToEnd());
}
}

5
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -20,7 +20,6 @@ using osu.Framework.Graphics.Cursor;
namespace osu.Game.Overlays.Mods
{
/// <summary>
/// Represents a clickable button which can cycle through one of more mods.
/// </summary>
@ -80,7 +79,7 @@ namespace osu.Game.Overlays.Mods
backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
backgroundIcon.Icon = modAfter.Icon;
using (iconsContainer.BeginDelayedSequence(mod_switch_duration, true))
using (BeginDelayedSequence(mod_switch_duration, true))
{
foregroundIcon.RotateTo(-rotate_angle * direction);
foregroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
@ -88,7 +87,7 @@ namespace osu.Game.Overlays.Mods
backgroundIcon.RotateTo(rotate_angle * direction);
backgroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
iconsContainer.Schedule(() => displayMod(modAfter));
Schedule(() => displayMod(modAfter));
}
}

5
osu.Game/Overlays/Music/PlaylistItem.cs
View File

@ -137,6 +137,7 @@ namespace osu.Game.Overlays.Music
public bool MatchingFilter
{
get { return matching; }
set
{
if (matching == value) return;
@ -145,10 +146,6 @@ namespace osu.Game.Overlays.Music
FadeTo(matching ? 1 : 0, 200);
}
get
{
return matching;
}
}
}
}

1
osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
View File

@ -41,4 +41,3 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
}
}
}

2
osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
set
{
bounding = value;
Invalidate(Invalidation.Geometry);
Invalidate(Invalidation.MiscGeometry);
}
}

1
osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
View File

@ -33,4 +33,3 @@ namespace osu.Game.Overlays.Settings.Sections.General
}
}
}

1
osu.Game/Overlays/Settings/Sections/GeneralSection.cs
View File

@ -22,4 +22,3 @@ namespace osu.Game.Overlays.Settings.Sections
}
}
}

1
osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
View File

@ -24,4 +24,3 @@ namespace osu.Game.Overlays.Settings.Sections
}
}
}

1
osu.Game/Overlays/Settings/Sections/InputSection.cs
View File

@ -22,4 +22,3 @@ namespace osu.Game.Overlays.Settings.Sections
}
}
}

1
osu.Game/Overlays/Settings/SettingsSubsection.cs
View File

@ -52,4 +52,3 @@ namespace osu.Game.Overlays.Settings
}
}
}

4
osu.Game/Screens/Edit/Editor.cs
View File

@ -25,13 +25,13 @@ namespace osu.Game.Screens.Edit
protected override void OnEntering(Screen last)
{
base.OnEntering(last);
Background.Schedule(() => Background.FadeColour(Color4.DarkGray, 500));
Background.FadeColour(Color4.DarkGray, 500);
Beatmap?.Track?.Stop();
}
protected override bool OnExiting(Screen next)
{
Background.Schedule(() => Background.FadeColour(Color4.White, 500));
Background.FadeColour(Color4.White, 500);
Beatmap?.Track?.Start();
return base.OnExiting(next);
}

6
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -192,10 +192,8 @@ namespace osu.Game.Screens.Menu
public MenuState State
{
get
{
return state;
}
get { return state; }
set
{
if (state == value) return;

4
osu.Game/Screens/Multiplayer/Match.cs
View File

@ -24,12 +24,12 @@ namespace osu.Game.Screens.Multiplayer
{
base.OnEntering(last);
Background.Schedule(() => Background.FadeColour(Color4.DarkGray, 500));
Background.FadeColour(Color4.DarkGray, 500);
}
protected override bool OnExiting(Screen next)
{
Background.Schedule(() => Background.FadeColour(Color4.White, 500));
Background.FadeColour(Color4.White, 500);
return base.OnExiting(next);
}
}

1
osu.Game/Screens/Play/HUD/ModDisplay.cs
View File

@ -54,7 +54,6 @@ namespace osu.Game.Screens.Play.HUD
{
AutoSizeAxes = Axes.Both,
Scale = new Vector2(0.6f),
});
}

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

@ -69,7 +69,7 @@ namespace osu.Game.Screens.Play
public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
{
if ((invalidation & Invalidation.SizeInParentSpace) > 0)
if ((invalidation & Invalidation.DrawSize) > 0)
layout.Invalidate();
return base.Invalidate(invalidation, source, shallPropagate);
}

1
osu.Game/Screens/Ranking/Results.cs
View File

@ -71,7 +71,6 @@ namespace osu.Game.Screens.Ranking
using (BeginDelayedSequence(transition_time * 0.25f, true))
{
circleOuter.ScaleTo(1, transition_time, EasingTypes.OutQuint);
circleOuter.FadeTo(1, transition_time, EasingTypes.OutQuint);

4
osu.Game/Screens/Ranking/ResultsPage.cs
View File

@ -64,7 +64,8 @@ namespace osu.Game.Screens.Ranking
Origin = Anchor.Centre,
Children = new Drawable[]
{
new Box{
new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
AlwaysPresent = true
@ -87,6 +88,5 @@ namespace osu.Game.Screens.Ranking
}
});
}
}
}

1
osu.Game/Screens/Tournament/Drawings.cs
View File

@ -335,7 +335,6 @@ namespace osu.Game.Screens.Tournament
{
Logger.Error(ex, "Failed to read last drawings results.");
}
}
else
{