Merge pull request #912 from johnneijzen/master

Clean up

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs

@@ -448,7 +448,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             return curveData.RepeatSamples[index];
         }
 
-
         /// <summary>
         /// Constructs and adds a note to a pattern.
         /// </summary>
@@ -480,7 +479,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     Tail = { Samples = sampleInfoListAt(endTime) }
                 };
 
-
                 newObject = holdNote;
             }
 

osu.Game/Configuration/OsuConfigManager.cs

@@ -13,7 +13,6 @@ namespace osu.Game.Configuration
         protected override void InitialiseDefaults()
         {
             // UI/selection defaults
-
             Set(OsuSetting.Ruleset, 0, 0, int.MaxValue);
             Set(OsuSetting.BeatmapDetailTab, BeatmapDetailTab.Details);
 
@@ -25,7 +24,6 @@ namespace osu.Game.Configuration
             Set(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2, 1);
 
             // Online settings
-
             Set(OsuSetting.Username, string.Empty);
             Set(OsuSetting.Token, string.Empty);
 
@@ -40,14 +38,12 @@ namespace osu.Game.Configuration
             };
 
             // Audio
-
             Set(OsuSetting.MenuVoice, true);
             Set(OsuSetting.MenuMusic, true);
 
             Set(OsuSetting.AudioOffset, 0, -500.0, 500.0);
 
             // Input
-
             Set(OsuSetting.MenuCursorSize, 1.0, 0.5f, 2);
             Set(OsuSetting.GameplayCursorSize, 1.0, 0.5f, 2);
             Set(OsuSetting.AutoCursorSize, false);
@@ -56,7 +52,6 @@ namespace osu.Game.Configuration
             Set(OsuSetting.MouseDisableWheel, false);
 
             // Graphics
-
             Set(OsuSetting.ShowFpsDisplay, false);
 
             Set(OsuSetting.MenuParallax, true);
@@ -65,7 +60,6 @@ namespace osu.Game.Configuration
             Set(OsuSetting.SnakingOutSliders, true);
 
             // Gameplay
-
             Set(OsuSetting.DimLevel, 0.3, 0, 1);
 
             Set(OsuSetting.ShowInterface, true);
@@ -75,7 +69,6 @@ namespace osu.Game.Configuration
             Set(OsuSetting.PlaybackSpeed, 1.0, 0.5f, 2);
 
             // Update
-
             Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
         }
 

osu.Game/OsuGame.cs

@@ -150,7 +150,7 @@ namespace osu.Game
                     RelativeSizeAxes = Axes.Both,
                 },
                 volume = new VolumeControl(),
-                overlayContent = new Container{ RelativeSizeAxes = Axes.Both },
+                overlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 new OnScreenDisplay(),
                 new GlobalHotkeys //exists because UserInputManager is at a level below us.
                 {

osu.Game/Overlays/ChatOverlay.cs

@@ -367,7 +367,6 @@ namespace osu.Game.Overlays
             }
             else
             {
-
                 careChannels.Add(channel);
                 channelTabs.AddItem(channel);
             }

osu.Game/Screens/Menu/Button.cs

@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Menu
                     Scale = new Vector2(0, 1),
                     Size = boxSize,
                     Shear = new Vector2(ButtonSystem.WEDGE_WIDTH / boxSize.Y, 0),
-                    Children = new []
+                    Children = new[]
                     {
                         new Box
                         {
@@ -282,10 +282,10 @@ namespace osu.Game.Screens.Menu
 
         public ButtonState State
         {
-            get { return state; }
+            get{ return state; }
+
             set
             {
-
                 if (state == value)
                     return;
 

osu.Game/Screens/Menu/OsuLogo.cs

@@ -51,10 +51,7 @@ namespace osu.Game.Screens.Menu
 
         public bool Triangles
         {
-            set
+            set { colourAndTriangles.Alpha = value ? 1 : 0; }
-            {
-                colourAndTriangles.Alpha = value ? 1 : 0;
-            }
         }
 
         protected override bool InternalContains(Vector2 screenSpacePos) => logoContainer.Contains(screenSpacePos);
@@ -62,10 +59,7 @@ namespace osu.Game.Screens.Menu
         public bool Ripple
         {
             get { return rippleContainer.Alpha > 0; }
-            set
+            set { rippleContainer.Alpha = value ? 1 : 0; }
-            {
-                rippleContainer.Alpha = value ? 1 : 0;
-            }
         }
 
         public bool Interactive = true;

osu.Game/Screens/Play/Player.cs

@@ -278,7 +278,6 @@ namespace osu.Game.Screens.Play
                 {
                     if (!pauseContainer.IsPaused)
                         decoupledClock.Start();
-
                 });
 
             pauseContainer.Alpha = 0;

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -244,7 +244,7 @@ namespace osu.Game.Screens.Select
 
         private BeatmapGroup createGroup(BeatmapSetInfo beatmapSet)
         {
-            foreach(var b in beatmapSet.Beatmaps)
+            foreach (var b in beatmapSet.Beatmaps)
             {
                 if (b.Metadata == null)
                     b.Metadata = beatmapSet.Metadata;

osu.Game/Screens/Select/BeatmapDetails.cs

@@ -47,6 +47,7 @@ namespace osu.Game.Screens.Select
         public BeatmapInfo Beatmap
         {
             get { return beatmap; }
+
             set
             {
                 if (beatmap == value) return;
@@ -165,7 +166,7 @@ namespace osu.Game.Screens.Select
                     Direction = FillDirection.Vertical,
                     LayoutDuration = 200,
                     LayoutEasing = EasingTypes.OutQuint,
-                    Children = new []
+                    Children = new[]
                     {
                         description = new MetadataSegment("Description"),
                         source = new MetadataSegment("Source"),
@@ -199,9 +200,9 @@ namespace osu.Game.Screens.Select
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
                                     Direction = FillDirection.Vertical,
-                                    Spacing = new Vector2(0,5),
+                                    Spacing = new Vector2(0, 5),
                                     Padding = new MarginPadding(10),
-                                    Children = new []
+                                    Children = new[]
                                     {
                                         circleSize = new DifficultyRow("Circle Size", 7),
                                         drainRate = new DifficultyRow("HP Drain"),
@@ -479,7 +480,7 @@ namespace osu.Game.Screens.Select
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Direction = FillDirection.Full,
-                        Spacing = new Vector2(5,0),
+                        Spacing = new Vector2(5, 0),
                         Margin = new MarginPadding { Top = header.TextSize }
                     }
                 };

osu.Game/Screens/Tournament/ScrollingTeamContainer.cs

@@ -83,6 +83,7 @@ namespace osu.Game.Screens.Tournament
         private ScrollState scrollState
         {
             get { return _scrollState; }
+
             set
             {
                 if (_scrollState == value)
@@ -329,6 +330,7 @@ namespace osu.Game.Screens.Tournament
             public bool Selected
             {
                 get { return selected; }
+
                 set
                 {
                     selected = value;