sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into hide_menu_cursor

Browse Source
This commit is contained in:
UselessToucan
2018-04-09 21:41:54 +03:00
committed by GitHub
parent 458594d24d 81981acc68
commit 9225c06872
204 changed files with 2654 additions and 4040 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
View File

@ -18,14 +18,19 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
{
new SettingsCheckbox
{
LabelText = "Bypass caching",
Bindable = config.GetBindable<bool>(DebugSetting.BypassCaching)
LabelText = "Show log overlay",
Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowLogOverlay)
},
new SettingsCheckbox
{
LabelText = "Debug logs",
Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowLogOverlay)
}
LabelText = "Performance logging",
Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.PerformanceLogging)
},
new SettingsCheckbox
{
LabelText = "Bypass caching (slow)",
Bindable = config.GetBindable<bool>(DebugSetting.BypassCaching)
},
};
}
}

3
osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
View File

@ -5,7 +5,6 @@ using System;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Configuration;
using osu.Game.Graphics.Sprites;
@ -18,7 +17,7 @@ using System.ComponentModel;
using osu.Game.Graphics;
using OpenTK.Graphics;
using osu.Framework.Extensions.Color4Extensions;
using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
using Container = osu.Framework.Graphics.Containers.Container;
namespace osu.Game.Overlays.Settings.Sections.General

2
osu.Game/Overlays/Settings/SidebarButton.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Settings
private readonly SpriteText headerText;
private readonly Box selectionIndicator;
private readonly Container text;
public Action<SettingsSection> Action;
public new Action<SettingsSection> Action;
private SettingsSection section;
public SettingsSection Section