sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 14:17:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake

Browse Source 
# Conflicts:
#	osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
This commit is contained in:
Dean Herbert
2018-08-24 15:26:36 +09:00
parent 7bfd82a417 5ec1a5a774
commit ffcad6e0f1
442 changed files with 5870 additions and 3492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
View File

@ -5,10 +5,10 @@ using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
using OpenTK;
using osu.Framework.Configuration;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.States;
using osu.Game.Audio;
using osu.Game.Input.Bindings;
using osu.Game.Overlays;
@ -22,13 +22,16 @@ namespace osu.Game.Graphics.Containers
protected virtual bool PlaySamplesOnStateChange => true;
protected override bool BlockPassThroughKeyboard => true;
private PreviewTrackManager previewTrackManager;
protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
dependencies.CacheAs<IPreviewTrackOwner>(this);
return dependencies;
}
@ -69,10 +72,13 @@ namespace osu.Game.Graphics.Containers
public virtual bool OnPressed(GlobalAction action)
{
if (action == GlobalAction.Back)
switch (action)
{
State = Visibility.Hidden;
return true;
case GlobalAction.Back:
State = Visibility.Hidden;
return true;
case GlobalAction.Select:
return true;
}
return false;

2
osu.Game/Graphics/Containers/OsuHoverContainer.cs
View File

@ -6,7 +6,7 @@ using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Framework.Input;
using osu.Framework.Input.States;
namespace osu.Game.Graphics.Containers
{

3
osu.Game/Graphics/Containers/OsuScrollContainer.cs
View File

@ -2,7 +2,8 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
using osu.Framework.Input.EventArgs;
using osu.Framework.Input.States;
using OpenTK.Input;
namespace osu.Game.Graphics.Containers