sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects 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
parent f6f547a91b 04c1e0a2f3
commit 4952fb3716
2 changed files with 2 additions and 4 deletions
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 class BackButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
{ {
private AspectContainer aspect; 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; 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 RemoveWhenNotAlive => false;
public override bool RemoveCompletedTransforms => false; public override bool RemoveCompletedTransforms => false;
protected override bool RequiresChildrenUpdate => true; protected override bool RequiresChildrenUpdate => true;