1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 22:34:09 +08:00

Merge pull request #917 from johnneijzen/master

More Clean Up
This commit is contained in:
Dean Herbert 2017-06-08 20:39:53 +09:00 committed by GitHub
commit 6047bfc3ec
43 changed files with 33 additions and 55 deletions

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);
});

View File

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

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();

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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>

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;
}
}
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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;

View File

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

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);

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
}
});
}
}
}

View File

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