h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:52:53 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-toolbar-bar

Browse Source
This commit is contained in:
Dean Herbert 2019-06-27 19:58:13 +09:00 committed by GitHub
commit 4952fb3716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,8 @@ namespace osu.Game.Overlays
});
}
protected override bool DimMainContent => false; // dimming is handled by main overlay
private class BackButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
{
private AspectContainer aspect;

4
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -77,10 +77,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
private bool judgementOccurred;
public bool Interactive = true;
public override bool HandleNonPositionalInput => Interactive;
public override bool HandlePositionalInput => Interactive;
public override bool RemoveWhenNotAlive => false;
public override bool RemoveCompletedTransforms => false;
protected override bool RequiresChildrenUpdate => true;