h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 16:52:55 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into editor-hitobject-overlays

Browse Source
This commit is contained in:
Dean Herbert 2018-02-23 12:37:30 +09:00
commit 72fcbfe12b
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 458ebc2d4626c74bb8059cd28b44eb7adba74fbb Subproject commit 16a4bef775a49166f38faa6e952d83d8823fe3e0

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

@ -477,7 +477,7 @@ namespace osu.Game.Overlays
if (!api.IsLoggedIn) if (!api.IsLoggedIn)
{ {
target.AddNewMessages(new ErrorMessage("Please login to participate in chat!")); target.AddNewMessages(new ErrorMessage("Please sign in to participate in chat!"));
return; return;
} }

4
osu.Game/Overlays/Direct/PlayButton.cs
View File

@ -22,6 +22,7 @@ namespace osu.Game.Overlays.Direct
public Track Preview { get; private set; } public Track Preview { get; private set; }
private BeatmapSetInfo beatmapSet; private BeatmapSetInfo beatmapSet;
public BeatmapSetInfo BeatmapSet public BeatmapSetInfo BeatmapSet
{ {
get { return beatmapSet; } get { return beatmapSet; }
@ -199,8 +200,7 @@ namespace osu.Game.Overlays.Direct
// add back the user's music volume setting (since we are no longer in the global TrackManager's hierarchy). // add back the user's music volume setting (since we are no longer in the global TrackManager's hierarchy).
config.BindWith(FrameworkSetting.VolumeMusic, trackManager.Volume); config.BindWith(FrameworkSetting.VolumeMusic, trackManager.Volume);
if (!string.IsNullOrEmpty(preview)) Preview = trackManager.Get(preview);
Preview = trackManager.Get(preview);
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)

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

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

2
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -133,7 +133,7 @@ namespace osu.Game.Screens.Select.Leaderboards
replacePlaceholder(new MessagePlaceholder(@"No records yet!")); replacePlaceholder(new MessagePlaceholder(@"No records yet!"));
break; break;
case PlaceholderState.NotLoggedIn: case PlaceholderState.NotLoggedIn:
replacePlaceholder(new MessagePlaceholder(@"Please login to view online leaderboards!")); replacePlaceholder(new MessagePlaceholder(@"Please sign in to view online leaderboards!"));
break; break;
case PlaceholderState.NotSupporter: case PlaceholderState.NotSupporter:
replacePlaceholder(new MessagePlaceholder(@"Please invest in a supporter tag to view this leaderboard!")); replacePlaceholder(new MessagePlaceholder(@"Please invest in a supporter tag to view this leaderboard!"));

2
osu.Game/Tests/Visual/TestCasePerformancePoints.cs
View File

@ -230,7 +230,7 @@ namespace osu.Game.Tests.Visual
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Text = "Please login to see online scores", Text = "Please sign in to see online scores",
}; };
} }