h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 14:07:25 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into notifications-manager

Browse Source
This commit is contained in:
Dean Herbert 2017-02-10 16:54:56 +09:00
commit 2da5628184
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
12 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 21fd81a84860cf6854026458ac82905b6248f41d
Subproject commit 7df72f8d0cb887437a2816d3f413bf37ca2d6641

2
osu.Game.Modes.Osu/UI/OsuComboCounter.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Modes.Osu.UI
protected virtual float PopOutSmallScale => 1.1f;
protected virtual bool CanPopOutWhileRolling => false;
public Vector2 PopOutScale = new Vector2(1.6f);
public new Vector2 PopOutScale = new Vector2(1.6f);
protected override void LoadComplete()
{

4
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -105,8 +105,8 @@ namespace osu.Game.Beatmaps
public WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, BeatmapDatabase database)
{
this.BeatmapInfo = beatmapInfo;
this.BeatmapSetInfo = beatmapSetInfo;
BeatmapInfo = beatmapInfo;
BeatmapSetInfo = beatmapSetInfo;
this.database = database;
}

5
osu.Game/Graphics/Cursor/OsuCursorContainer.cs
View File

@ -67,6 +67,11 @@ namespace osu.Game.Graphics.Cursor
Masking = true,
BorderThickness = Size.X / 6,
BorderColour = Color4.White,
EdgeEffect = new EdgeEffect {
Type = EdgeEffectType.Shadow,
Colour = Color4.Pink.Opacity(0.5f),
Radius = 5,
},
Children = new Drawable[]
{
new Box

2
osu.Game/Online/API/Requests/GetMessagesRequest.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Online.API.Requests
public GetMessagesRequest(List<Channel> channels, long? sinceId)
{
this.channels = channels;
this.since = sinceId;
since = sinceId;
}
protected override WebRequest CreateWebRequest()

2
osu.Game/Online/Chat/Drawables/ChatLine.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Online.Chat.Drawables
public ChatLine(Message message)
{
this.Message = message;
Message = message;
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;

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

@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Options.Sections
{
base.Children = new Drawable[]
{
new Gameplay.GeneralOptions(),
new GeneralOptions(),
new SongSelectOptions(),
};
}

7
osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
View File

@ -91,9 +91,6 @@ namespace osu.Game.Overlays.Options.Sections.General
private TextBox password;
private APIAccess api;
private OsuCheckbox saveUsername;
private OsuCheckbox savePassword;
private void performLogin()
{
if (!string.IsNullOrEmpty(username.Text) && !string.IsNullOrEmpty(password.Text))
@ -121,12 +118,12 @@ namespace osu.Game.Overlays.Options.Sections.General
PlaceholderText = "Password",
RelativeSizeAxes = Axes.X
},
saveUsername = new OsuCheckbox
new OsuCheckbox
{
LabelText = "Remember username",
Bindable = config.GetBindable<bool>(OsuConfig.SaveUsername),
},
savePassword = new OsuCheckbox
new OsuCheckbox
{
LabelText = "Stay logged in",
Bindable = config.GetBindable<bool>(OsuConfig.SavePassword),

6
osu.Game/Overlays/Options/Sections/Online/InGameChatOptions.cs
View File

@ -10,8 +10,6 @@ namespace osu.Game.Overlays.Options.Sections.Online
{
public class InGameChatOptions : OptionsSubsection
{
private OptionTextBox chatIgnoreList;
private OptionTextBox chatHighlightWords;
protected override string Header => "Chat";
[BackgroundDependencyLoader]
@ -40,12 +38,12 @@ namespace osu.Game.Overlays.Options.Sections.Online
Bindable = config.GetBindable<bool>(OsuConfig.BlockNonFriendPM)
},
new OptionLabel { Text = "Chat ignore list (space-seperated list)" },
chatIgnoreList = new OptionTextBox {
new OptionTextBox {
RelativeSizeAxes = Axes.X,
Bindable = config.GetBindable<string>(OsuConfig.IgnoreList)
},
new OptionLabel { Text = "Chat highlight words (space-seperated list)" },
chatHighlightWords = new OptionTextBox {
new OptionTextBox {
RelativeSizeAxes = Axes.X,
Bindable = config.GetBindable<string>(OsuConfig.HighlightWords)
},

5
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Screens.Menu
/// <summary>
/// osu! logo and its attachments (pulsing, visualiser etc.)
/// </summary>
public partial class OsuLogo : Container
public class OsuLogo : Container
{
public Color4 OsuPink = OsuColour.FromHex(@"e967a1");
@ -32,7 +32,6 @@ namespace osu.Game.Screens.Menu
private CircularContainer logoContainer;
private Container logoBounceContainer;
private Container logoHoverContainer;
private MenuVisualisation vis;
private AudioSample sampleClick;
@ -154,7 +153,7 @@ namespace osu.Game.Screens.Menu
}
}
},
vis = new MenuVisualisation
new MenuVisualisation
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,

4
osu.Game/Screens/Play/KeyCounterKeyboard.cs
View File

@ -17,13 +17,13 @@ namespace osu.Game.Screens.Play
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
if (args.Key == this.Key) IsLit = true;
if (args.Key == Key) IsLit = true;
return base.OnKeyDown(state, args);
}
protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
{
if (args.Key == this.Key) IsLit = false;
if (args.Key == Key) IsLit = false;
return base.OnKeyUp(state, args);
}
}

4
osu.Game/Screens/Play/KeyCounterMouse.cs
View File

@ -20,13 +20,13 @@ namespace osu.Game.Screens.Play
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{
if (args.Button == this.Button) IsLit = true;
if (args.Button == Button) IsLit = true;
return base.OnMouseDown(state, args);
}
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{
if (args.Button == this.Button) IsLit = false;
if (args.Button == Button) IsLit = false;
return base.OnMouseUp(state, args);
}
}