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

Merge remote-tracking branch 'Joehuu/master' into drawnode-composability

Browse Source 
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
This commit is contained in:
smoogipoo
2019-04-08 23:01:12 +09:00
parent a56e29347f f2f60f6d03
commit 772bef91fa
143 changed files with 1654 additions and 1127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Settings/Sections/AudioSection.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Settings.Sections
public class AudioSection : SettingsSection
{
public override string Header => "Audio";
public override IconUsage Icon => FontAwesome.VolumeUp;
public override IconUsage Icon => FontAwesome.Solid.VolumeUp;
public AudioSection()
{

2
osu.Game/Overlays/Settings/Sections/DebugSection.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Settings.Sections
public class DebugSection : SettingsSection
{
public override string Header => "Debug";
public override IconUsage Icon => FontAwesome.Bug;
public override IconUsage Icon => FontAwesome.Solid.Bug;
public DebugSection()
{

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

@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections
public class GameplaySection : SettingsSection
{
public override string Header => "Gameplay";
public override IconUsage Icon => FontAwesome.CircleOutline;
public override IconUsage Icon => FontAwesome.Regular.Circle;
public GameplaySection()
{

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

@ -364,7 +364,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Icon = FontAwesome.CircleOutline,
Icon = FontAwesome.Regular.Circle,
Size = new Vector2(14),
});

2
osu.Game/Overlays/Settings/Sections/GeneralSection.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Settings.Sections
public class GeneralSection : SettingsSection
{
public override string Header => "General";
public override IconUsage Icon => FontAwesome.Gear;
public override IconUsage Icon => FontAwesome.Solid.Cog;
public GeneralSection()
{

2
osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Settings.Sections
public class GraphicsSection : SettingsSection
{
public override string Header => "Graphics";
public override IconUsage Icon => FontAwesome.Laptop;
public override IconUsage Icon => FontAwesome.Solid.Laptop;
public GraphicsSection()
{

2
osu.Game/Overlays/Settings/Sections/InputSection.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Settings.Sections
public class InputSection : SettingsSection
{
public override string Header => "Input";
public override IconUsage Icon => FontAwesome.KeyboardOutline;
public override IconUsage Icon => FontAwesome.Regular.Keyboard;
public InputSection(KeyBindingOverlay keyConfig)
{

2
osu.Game/Overlays/Settings/Sections/Maintenance/DeleteAllBeatmapsDialog.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
{
BodyText = "Everything?";
Icon = FontAwesome.TrashOutline;
Icon = FontAwesome.Regular.TrashAlt;
HeaderText = @"Confirm deletion of";
Buttons = new PopupDialogButton[]
{

2
osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
View File

@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Settings.Sections
public class MaintenanceSection : SettingsSection
{
public override string Header => "Maintenance";
public override IconUsage Icon => FontAwesome.Wrench;
public override IconUsage Icon => FontAwesome.Solid.Wrench;
public MaintenanceSection()
{

2
osu.Game/Overlays/Settings/Sections/OnlineSection.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Settings.Sections
public class OnlineSection : SettingsSection
{
public override string Header => "Online";
public override IconUsage Icon => FontAwesome.Globe;
public override IconUsage Icon => FontAwesome.Solid.GlobeAsia;
public OnlineSection()
{

2
osu.Game/Overlays/Settings/Sections/SkinSection.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections
public override string Header => "Skin";
public override IconUsage Icon => FontAwesome.PaintBrush;
public override IconUsage Icon => FontAwesome.Solid.PaintBrush;
private readonly Bindable<SkinInfo> dropdownBindable = new Bindable<SkinInfo> { Default = SkinInfo.Default };
private readonly Bindable<int> configBindable = new Bindable<int>();