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

Merge branch 'master' into remove-unnecessary-blocking

Browse Source
This commit is contained in:
Dean Herbert 2017-12-22 00:18:02 +09:00 committed by GitHub
commit 2526ebbbdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -31,6 +31,8 @@ namespace osu.Game.Overlays.Mods
protected readonly OsuSpriteText MultiplierLabel;
private readonly FillFlowContainer footerContainer;
protected override bool BlockPassThroughKeyboard => false;
protected readonly FillFlowContainer<ModSection> ModSectionsContainer;
public readonly Bindable<IEnumerable<Mod>> SelectedMods = new Bindable<IEnumerable<Mod>>();

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

@ -28,6 +28,8 @@ namespace osu.Game.Overlays
private readonly Container contentContainer;
protected override bool BlockPassThroughKeyboard => true;
protected override Container<Drawable> Content => contentContainer;
protected Color4 FirstWaveColour