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

Keyword Spacing and Brackets Fixing

Browse Source
This commit is contained in:
John Neijzen 2017-06-08 14:35:10 +08:00
parent bf45155ed5
commit 431d225a60
17 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs
View File

@ -41,7 +41,7 @@ namespace osu.Desktop.VisualTests.Tests
StarDifficulty = 5.3f, StarDifficulty = 5.3f,
Metrics = new BeatmapMetrics Metrics = new BeatmapMetrics
{ {
Ratings = Enumerable.Range(0,10), Ratings = Enumerable.Range(0, 10),
Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6), Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6),
Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6), Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6),
}, },

2
osu.Desktop.VisualTests/Tests/TestCaseGraph.cs
View File

@ -30,7 +30,7 @@ namespace osu.Desktop.VisualTests.Tests
}, },
}; };
AddStep("values from 1-10", () => graph.Values = Enumerable.Range(1,10).Select(i => (float)i)); AddStep("values from 1-10", () => graph.Values = Enumerable.Range(1, 10).Select(i => (float)i));
AddStep("values from 1-100", () => graph.Values = Enumerable.Range(1, 100).Select(i => (float)i)); AddStep("values from 1-100", () => graph.Values = Enumerable.Range(1, 100).Select(i => (float)i));
AddStep("reversed values from 1-10", () => graph.Values = Enumerable.Range(1, 10).Reverse().Select(i => (float)i)); AddStep("reversed values from 1-10", () => graph.Values = Enumerable.Range(1, 10).Reverse().Select(i => (float)i));
AddStep("Bottom to top", () => graph.Direction = BarDirection.BottomToTop); AddStep("Bottom to top", () => graph.Direction = BarDirection.BottomToTop);

2
osu.Desktop.VisualTests/Tests/TestCaseMenuOverlays.cs
View File

@ -35,7 +35,7 @@ namespace osu.Desktop.VisualTests.Tests
}); });
AddStep(@"Pause", delegate { AddStep(@"Pause", delegate {
if(failOverlay.State == Visibility.Visible) if (failOverlay.State == Visibility.Visible)
{ {
failOverlay.Hide(); failOverlay.Hide();
} }

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); score.Current.Value += 300 + (ulong)(300.0 * (comboCounter.Current > 0 ? comboCounter.Current - 1 : 0) / 25.0);
comboCounter.Increment(); comboCounter.Increment();
numerator++; denominator++; numerator++;
denominator++;
accuracyCounter.SetFraction(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++; bitIndex++;
return ((bitBuffer >>= 1) & 1) == 1; return ((bitBuffer >>= 1) & 1) == 1;
} }
} }
} }

2
osu.Game.Rulesets.Osu/OsuDifficultyCalculator.cs
View File

@ -186,7 +186,7 @@ namespace osu.Game.Rulesets.Osu
public enum DifficultyType public enum DifficultyType
{ {
Speed = 0, Speed = 0,
Aim, Aim
}; };
} }
} }

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

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

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

@ -81,7 +81,7 @@ namespace osu.Game.Graphics.UserInterface
background = new Box background = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = new Color4(0,0,0,0) Colour = new Color4(0, 0, 0, 0)
}, },
bar = new Box bar = new Box
{ {

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

@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
throw new InvalidOperationException("OsuEnumDropdown only supports enums as the generic type argument"); throw new InvalidOperationException("OsuEnumDropdown only supports enums as the generic type argument");
List<KeyValuePair<string, T>> items = new List<KeyValuePair<string, T>>(); List<KeyValuePair<string, T>> items = new List<KeyValuePair<string, T>>();
foreach(var val in (T[])Enum.GetValues(typeof(T))) foreach (var val in (T[])Enum.GetValues(typeof(T)))
{ {
var field = typeof(T).GetField(Enum.GetName(typeof(T), val)); var field = typeof(T).GetField(Enum.GetName(typeof(T), val));
items.Add( items.Add(

2
osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
View File

@ -65,7 +65,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
letterboxSettings.ClearTransforms(); letterboxSettings.ClearTransforms();
letterboxSettings.AutoSizeAxes = isVisible ? Axes.Y : Axes.None; letterboxSettings.AutoSizeAxes = isVisible ? Axes.Y : Axes.None;
if(!isVisible) if (!isVisible)
letterboxSettings.ResizeHeightTo(0, transition_duration, EasingTypes.OutQuint); letterboxSettings.ResizeHeightTo(0, transition_duration, EasingTypes.OutQuint);
}; };
letterboxing.TriggerChange(); letterboxing.TriggerChange();

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

@ -282,7 +282,7 @@ namespace osu.Game.Screens.Menu
public ButtonState State public ButtonState State
{ {
get{ return state; } get { return state; }
set set
{ {

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

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

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

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

2
osu.Game/Screens/Play/ReplaySettings/ReplayGroup.cs
View File

@ -79,7 +79,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
{ {
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.CentreRight, Anchor = Anchor.CentreRight,
Position = new Vector2(-15,0), Position = new Vector2(-15, 0),
Icon = FontAwesome.fa_bars, Icon = FontAwesome.fa_bars,
Scale = new Vector2(0.75f), Scale = new Vector2(0.75f),
Action = toggleContentVisibility, Action = toggleContentVisibility,

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

@ -146,7 +146,7 @@ namespace osu.Game.Screens.Play
double progress = ((audioClock?.CurrentTime ?? Time.Current) - firstHitTime) / (lastHitTime - firstHitTime); double progress = ((audioClock?.CurrentTime ?? Time.Current) - firstHitTime) / (lastHitTime - firstHitTime);
if(progress < 1) if (progress < 1)
{ {
bar.UpdatePosition((float)progress); bar.UpdatePosition((float)progress);
graph.Progress = (int)(graph.ColumnCount * progress); graph.Progress = (int)(graph.ColumnCount * progress);

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

@ -64,7 +64,8 @@ namespace osu.Game.Screens.Ranking
Origin = Anchor.Centre, Origin = Anchor.Centre,
Children = new Drawable[] Children = new Drawable[]
{ {
new Box{ new Box
{
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0, Alpha = 0,
AlwaysPresent = true 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."); Logger.Error(ex, "Failed to read last drawings results.");
} }
} }
else else
{ {