h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 13:22:55 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ppy/master' into moarOptions

Browse Source
This commit is contained in:
Jorolf 2017-03-01 16:06:12 +01:00
commit 08e96c2460
24 changed files with 80 additions and 26 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-framework

@ -1 +1 @@
Subproject commit b0613241512e46eed9dc16ae08ed4064d2db4101
Subproject commit 4c0762eec20d2a3063df908a49432326570bea9f

3
osu.Desktop.Tests/osu.Desktop.Tests.csproj
View File

@ -54,9 +54,6 @@
<Reference Include="SQLite.Net.Platform.Generic">
<HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
</Reference>
<Reference Include="OpenTK">
<HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="BenchmarkTest.cs" />

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;

1
osu.Game.Modes.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs
View File

@ -14,6 +14,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
public TrianglesPiece()
{
TriangleScale = 1.2f;
HideAlphaDiscrepancies = false;
}
protected override void Update()

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;

5
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -27,11 +27,14 @@ namespace osu.Game.Configuration
Set(OsuConfig.DimLevel, 30, 0, 100);
Set(OsuConfig.MouseDisableButtons, false);
Set(OsuConfig.MouseDisableWheel, false);
Set(OsuConfig.SnakingInSliders, true);
Set(OsuConfig.SnakingOutSliders, false);
Set(OsuConfig.MenuParallax, true);
Set(OsuConfig.KeyOverlay, false);
//todo: implement all settings below this line (remove the Disabled set when doing so).
Set(OsuConfig.MouseSpeed, 1.0).Disabled = true;
@ -79,7 +82,6 @@ namespace osu.Game.Configuration
Set(OsuConfig.IgnoreBeatmapSamples, false).Disabled = true;
Set(OsuConfig.IgnoreBeatmapSkins, false).Disabled = true;
Set(OsuConfig.IgnoreList, string.Empty).Disabled = true;
Set(OsuConfig.KeyOverlay, false).Disabled = true;
Set(OsuConfig.Language, @"unknown").Disabled = true;
Set(OsuConfig.AllowNowPlayingHighlights, false).Disabled = true;
Set(OsuConfig.LastVersion, string.Empty).Disabled = true;
@ -99,7 +101,6 @@ namespace osu.Game.Configuration
Set(OsuConfig.UsePerBeatmapManiaSpeed, true).Disabled = true;
Set(OsuConfig.ManiaSpeedBPMScale, true).Disabled = true;
Set(OsuConfig.MenuTip, 0).Disabled = true;
Set(OsuConfig.MouseDisableWheel, false).Disabled = true;
Set(OsuConfig.MouseSpeed, 1, 0.4, 6).Disabled = true;
Set(OsuConfig.Offset, 0, -300, 300).Disabled = true;
Set(OsuConfig.ScoreMeterScale, 1, 0.5, 2).Disabled = true;

14
osu.Game/Graphics/Backgrounds/Triangles.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.MathUtils;
using OpenTK;
using OpenTK.Graphics;
using System;
using osu.Framework.Graphics.Colour;
namespace osu.Game.Graphics.Backgrounds
{
@ -37,6 +38,13 @@ namespace osu.Game.Graphics.Backgrounds
private float triangleScale = 1;
/// <summary>
/// Whether we should drop-off alpha values of triangles more quickly to improve
/// the visual appearance of fading. This defaults to on as it is generally more
/// aesthetically pleasing, but should be turned off in <see cref="BufferedContainer{T}"/>s.
/// </summary>
public bool HideAlphaDiscrepancies = true;
public float TriangleScale
{
get { return triangleScale; }
@ -63,8 +71,14 @@ namespace osu.Game.Graphics.Backgrounds
{
base.Update();
float adjustedAlpha = HideAlphaDiscrepancies ?
// Cubically scale alpha to make it drop off more sharply.
(float)Math.Pow(DrawInfo.Colour.AverageColour.Linear.A, 3) :
1;
foreach (var t in Children)
{
t.Alpha = adjustedAlpha;
t.Position -= new Vector2(0, (float)(t.Scale.X * (50 / DrawHeight) * (Time.Elapsed / 950)) / triangleScale);
if (ExpireOffScreenTriangles && t.DrawPosition.Y + t.DrawSize.Y * t.Scale.Y < 0)
t.Expire();

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>

21
osu.Game/Modes/UI/ScoreOverlay.cs
View File

@ -9,6 +9,9 @@ using osu.Game.Modes.Objects;
using OpenTK;
using osu.Framework.Graphics.Primitives;
using osu.Game.Screens.Play;
using osu.Framework.Allocation;
using osu.Game.Configuration;
using osu.Framework.Configuration;
namespace osu.Game.Modes.UI
{
@ -21,6 +24,8 @@ namespace osu.Game.Modes.UI
public HealthDisplay HealthDisplay;
public Score Score { get; set; }
private Bindable<bool> showKeyCounter;
protected abstract KeyCounterCollection CreateKeyCounter();
protected abstract ComboCounter CreateComboCounter();
protected abstract PercentageCounter CreateAccuracyCounter();
@ -58,6 +63,22 @@ namespace osu.Game.Modes.UI
};
}
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
showKeyCounter = config.GetBindable<bool>(OsuConfig.KeyOverlay);
showKeyCounter.ValueChanged += visibilityChanged;
showKeyCounter.TriggerChange();
}
private void visibilityChanged(object sender, EventArgs e)
{
if (showKeyCounter)
KeyCounter.Show();
else
KeyCounter.Hide();
}
public void BindProcessor(ScoreProcessor processor)
{
//bind processor bindables to combocounter, score display etc.

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

7
osu.Game/Screens/Play/Player.cs
View File

@ -24,6 +24,7 @@ using OpenTK.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Logging;
using osu.Framework.Input;
namespace osu.Game.Screens.Play
{
@ -72,6 +73,8 @@ namespace osu.Game.Screens.Play
private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuGameBase game, OsuConfigManager config)
{
dimLevel = config.GetBindable<int>(OsuConfig.DimLevel);
mouseWheelDisabled = config.GetBindable<bool>(OsuConfig.MouseDisableWheel);
try
{
if (Beatmap == null)
@ -325,5 +328,9 @@ namespace osu.Game.Screens.Play
{
Background?.FadeTo((100f - dimLevel) / 100, 800);
}
private Bindable<bool> mouseWheelDisabled;
protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !isPaused;
}
}