RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 03:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pluginManager

Browse Source
This commit is contained in:
Jorolf 2017-02-28 20:34:56 +01:00 committed by GitHub
commit 61cbcfd597
18 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.editorconfig
View File

@ -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

2
osu.Desktop.VisualTests/Benchmark.cs
View File

@ -13,7 +13,7 @@ namespace osu.Desktop.VisualTests
private double timePerTest = 200;
[BackgroundDependencyLoader]
private void load(Framework.Game game)
private void load()
{
Host.MaximumDrawHz = int.MaxValue;
Host.MaximumUpdateHz = int.MaxValue;

2
osu.Desktop/Overlays/VersionManager.cs
View File

@ -37,7 +37,7 @@ namespace osu.Desktop.Overlays
[BackgroundDependencyLoader]
private void load(NotificationManager notification, OsuColour colours, TextureStore textures)
{
this.notificationManager = notification;
notificationManager = notification;
AutoSizeAxes = Axes.Both;
Anchor = Anchor.BottomCentre;

2
osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Beatmaps.Drawables
}
[BackgroundDependencyLoader]
private void load(OsuGameBase game)
private void load()
{
if (working.Background != null)
Texture = working.Background;

12
osu.Game/Database/BeatmapDatabase.cs
View File

@ -57,6 +57,18 @@ namespace osu.Game.Database
try
{
storage.Delete(b.Path);
GetChildren(b, true);
foreach (var i in b.Beatmaps)
{
if (i.Metadata != null) connection.Delete(i.Metadata);
if (i.BaseDifficulty != null) connection.Delete(i.BaseDifficulty);
connection.Delete(i);
}
if (b.Metadata != null) connection.Delete(b.Metadata);
connection.Delete(b);
}
catch (Exception e)

2
osu.Game/Graphics/Cursor/OsuCursorContainer.cs
View File

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

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

@ -14,8 +14,6 @@ namespace osu.Game.Graphics.UserInterface
{
private readonly Container<Star> stars;
private double transformStartTime;
/// <summary>
/// Maximum amount of stars displayed.
/// </summary>

2
osu.Game/OsuGame.cs
View File

@ -214,7 +214,7 @@ namespace osu.Game
}
}
return base.OnKeyDown(state, args);
return false;
}
public event Action<Screen> ModeChanged;

4
osu.Game/Overlays/ChatOverlay.cs
View File

@ -29,8 +29,6 @@ namespace osu.Game.Overlays
{
const float textbox_height = 40;
private DrawableChannel channelDisplay;
private ScheduledDelegate messageRequest;
private Container content;
@ -126,7 +124,7 @@ namespace osu.Game.Overlays
private void addChannel(Channel channel)
{
Add(channelDisplay = new DrawableChannel(channel));
Add(new DrawableChannel(channel));
careChannels.Add(channel);
}

3
osu.Game/Overlays/MusicController.cs
View File

@ -75,8 +75,7 @@ namespace osu.Game.Overlays
}
[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;

2
osu.Game/Overlays/NotificationManager.cs
View File

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

2
osu.Game/Overlays/Notifications/Notification.cs
View File

@ -256,7 +256,7 @@ namespace osu.Game.Overlays.Notifications
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
private void load()
{
Size = new Vector2(6, 15);

2
osu.Game/Overlays/Options/OptionDropDown.cs
View File

@ -101,7 +101,7 @@ namespace osu.Game.Overlays.Options
{
Margin = new MarginPadding { Top = 5 },
RelativeSizeAxes = Axes.X,
Items = this.Items,
Items = Items,
}
};
dropdown.ValueChanged += dropdown_ValueChanged;

2
osu.Game/Overlays/Options/OptionTextBox.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Options
bindable = value;
if (bindable != null)
{
base.Text = bindable.Value;
Text = bindable.Value;
bindable.ValueChanged += bindableValueChanged;
}

2
osu.Game/Overlays/Options/Sections/GameplaySection.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Options.Sections
public GameplaySection()
{
base.Children = new Drawable[]
Children = new Drawable[]
{
new GeneralOptions(),
new SongSelectOptions(),

2
osu.Game/Overlays/Pause/QuitButton.cs
View File

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

2
osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
View File

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

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

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