sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into netstandard

Browse Source
This commit is contained in:
smoogipoo
2018-03-24 14:49:46 +09:00
parent d99f686ed6 c9276ce2b8
commit c29f7a4333
465 changed files with 12513 additions and 4969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,9 +207,9 @@ namespace osu.Game.Overlays.Settings.Sections.General
{
username = new OsuTextBox
{
PlaceholderText = "Username",
PlaceholderText = "Email address",
RelativeSizeAxes = Axes.X,
Text = api?.Username ?? string.Empty,
Text = api?.ProvidedUsername ?? string.Empty,
TabbableContentContainer = this
},
password = new OsuPasswordTextBox
@ -221,12 +221,12 @@ namespace osu.Game.Overlays.Settings.Sections.General
},
new SettingsCheckbox
{
LabelText = "Remember username",
LabelText = "Remember email address",
Bindable = config.GetBindable<bool>(OsuSetting.SaveUsername),
},
new SettingsCheckbox
{
LabelText = "Stay logged in",
LabelText = "Stay signed in",
Bindable = config.GetBindable<bool>(OsuSetting.SavePassword),
},
new SettingsButton
@ -236,7 +236,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
},
new SettingsButton
{
Text = "Register new account",
Text = "Register",
//Action = registerLink
}
};