Merge branch 'master' into general-fixes

.editorconfig

@@ -7,3 +7,21 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+
+#Roslyn naming styles
+
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase

osu.Desktop.VisualTests/Benchmark.cs

@@ -13,7 +13,7 @@ public class Benchmark : OsuGameBase
         private double timePerTest = 200;
 
         [BackgroundDependencyLoader]
-        private void load(Framework.Game game)
+        private void load()
         {
             Host.MaximumDrawHz = int.MaxValue;
             Host.MaximumUpdateHz = int.MaxValue;

osu.Desktop/Overlays/VersionManager.cs

@@ -37,7 +37,7 @@ public class VersionManager : OverlayContainer
         [BackgroundDependencyLoader]
         private void load(NotificationManager notification, OsuColour colours, TextureStore textures)
         {
-            this.notificationManager = notification;
+            notificationManager = notification;
 
             AutoSizeAxes = Axes.Both;
             Anchor = Anchor.BottomCentre;

osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs

@@ -16,7 +16,7 @@ public BeatmapBackgroundSprite(WorkingBeatmap working)
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game)
+        private void load()
         {
             if (working.Background != null)
                 Texture = working.Background;

osu.Game/Graphics/Cursor/OsuCursorContainer.cs

@@ -52,7 +52,7 @@ public OsuCursor()
             }
 
             [BackgroundDependencyLoader]
-            private void load(TextureStore textures, OsuConfigManager config)
+            private void load(OsuConfigManager config)
             {
                 cursorScale = config.GetBindable<double>(OsuConfig.CursorSize);
 

osu.Game/Graphics/UserInterface/StarCounter.cs

@@ -14,8 +14,6 @@ public class StarCounter : Container
     {
         private readonly Container<Star> stars;
 
-        private double transformStartTime;
-
         /// <summary>
         /// Maximum amount of stars displayed.
         /// </summary>

osu.Game/OsuGame.cs

@@ -214,7 +214,7 @@ private bool globalHotkeyPressed(InputState state, KeyDownEventArgs args)
                 }
             }
 
-            return base.OnKeyDown(state, args);
+            return false;
         }
 
         public event Action<Screen> ModeChanged;

osu.Game/Overlays/ChatOverlay.cs

@@ -29,8 +29,6 @@ public class ChatOverlay : FocusedOverlayContainer, IOnlineComponent
     {
         const float textbox_height = 40;
 
-        private DrawableChannel channelDisplay;
-
         private ScheduledDelegate messageRequest;
 
         private Container content;
@@ -126,7 +124,7 @@ private void load(APIAccess api)
 
         private void addChannel(Channel channel)
         {
-            Add(channelDisplay = new DrawableChannel(channel));
+            Add(new DrawableChannel(channel));
             careChannels.Add(channel);
         }
 

osu.Game/Overlays/MusicController.cs

@@ -75,8 +75,7 @@ protected override bool OnDragEnd(InputState state)
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame, OsuConfigManager config, BeatmapDatabase beatmaps, AudioManager audio,
-            TextureStore textures, OsuColour colours)
+        private void load(OsuGameBase osuGame, OsuConfigManager config, BeatmapDatabase beatmaps, OsuColour colours)
         {
             game = osuGame;
 

osu.Game/Overlays/NotificationManager.cs

@@ -25,7 +25,7 @@ public class NotificationManager : FocusedOverlayContainer
         private FlowContainer<NotificationSection> sections;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuColour colours)
+        private void load()
         {
             Width = width;
             RelativeSizeAxes = Axes.Y;

osu.Game/Overlays/Notifications/Notification.cs

@@ -256,7 +256,7 @@ public bool Pulsate
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load()
             {
                 Size = new Vector2(6, 15);
 

osu.Game/Overlays/Options/OptionDropDown.cs

@@ -101,7 +101,7 @@ public OptionDropDown()
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
-                    Items = this.Items,
+                    Items = Items,
                 }
             };
             dropdown.ValueChanged += dropdown_ValueChanged;

osu.Game/Overlays/Options/OptionTextBox.cs

@@ -21,7 +21,7 @@ public Bindable<string> Bindable
                 bindable = value;
                 if (bindable != null)
                 {
-                    base.Text = bindable.Value;
+                    Text = bindable.Value;
                     bindable.ValueChanged += bindableValueChanged;
                 }
 

osu.Game/Overlays/Options/Sections/GameplaySection.cs

@@ -14,7 +14,7 @@ public class GameplaySection : OptionsSection
 
         public GameplaySection()
         {
-            base.Children = new Drawable[]
+            Children = new Drawable[]
             {
                 new GeneralOptions(),
                 new SongSelectOptions(),

osu.Game/Overlays/Pause/QuitButton.cs

@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Pause
     public class QuitButton : PauseButton
     {
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuColour colours)
+        private void load(AudioManager audio)
         {
             ButtonColour = new Color4(170, 27, 39, 255); // The red from the design isn't in the palette so it's used directly
             SampleHover = audio.Sample.Get(@"Menu/menuclick");

osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs

@@ -9,7 +9,7 @@ namespace osu.Game.Screens.Backgrounds
     public class BackgroundScreenDefault : BackgroundScreen
     {
         [BackgroundDependencyLoader]
-        private void load(Framework.Game game)
+        private void load()
         {
             Add(new Background(@"Backgrounds/bg1"));
         }

osu.Game/Screens/Menu/ButtonSystem.cs

@@ -117,7 +117,7 @@ public ButtonSystem()
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, OsuGame game = null)
+        private void load(OsuGame game = null)
         {
             toolbar = game?.Toolbar;
         }