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

Merge branch 'master' into note-placement

Browse Source
This commit is contained in:
Dean Herbert 2018-11-29 13:06:11 +09:00 committed by GitHub
commit 86a0f8d2a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
View File

@ -16,8 +16,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{ {
public class DrawableOsuHitObject : DrawableHitObject<OsuHitObject> public class DrawableOsuHitObject : DrawableHitObject<OsuHitObject>
{ {
public override bool IsPresent => base.IsPresent || State.Value == ArmedState.Idle && Clock?.CurrentTime >= HitObject.StartTime - HitObject.TimePreempt;
private readonly ShakeContainer shakeContainer; private readonly ShakeContainer shakeContainer;
protected DrawableOsuHitObject(OsuHitObject hitObject) protected DrawableOsuHitObject(OsuHitObject hitObject)

3
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -217,6 +217,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
switch (state) switch (state)
{ {
case ArmedState.Idle:
Expire(true);
break;
case ArmedState.Hit: case ArmedState.Hit:
sequence.ScaleTo(Scale * 1.2f, 320, Easing.Out); sequence.ScaleTo(Scale * 1.2f, 320, Easing.Out);
break; break;

1
osu.Game/Online/API/OAuth.cs
View File

@ -178,6 +178,7 @@ namespace osu.Game.Online.API
AddParameter("grant_type", GrantType); AddParameter("grant_type", GrantType);
AddParameter("client_id", ClientId); AddParameter("client_id", ClientId);
AddParameter("client_secret", ClientSecret); AddParameter("client_secret", ClientSecret);
AddParameter("scope", "*");
base.PrePerform(); base.PrePerform();
} }

6
osu.Game/Overlays/Volume/VolumeMeter.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Volume
private CircularProgress volumeCircle; private CircularProgress volumeCircle;
private CircularProgress volumeCircleGlow; private CircularProgress volumeCircleGlow;
public BindableDouble Bindable { get; } = new BindableDouble { MinValue = 0, MaxValue = 1 }; public BindableDouble Bindable { get; } = new BindableDouble { MinValue = 0, MaxValue = 1, Precision = 0.01 };
private readonly float circleSize; private readonly float circleSize;
private readonly Color4 meterColour; private readonly Color4 meterColour;
private readonly string name; private readonly string name;
@ -222,7 +222,7 @@ namespace osu.Game.Overlays.Volume
private set => Bindable.Value = value; private set => Bindable.Value = value;
} }
private const float adjust_step = 0.05f; private const double adjust_step = 0.05;
public void Increase(double amount = 1, bool isPrecise = false) => adjust(amount, isPrecise); public void Increase(double amount = 1, bool isPrecise = false) => adjust(amount, isPrecise);
public void Decrease(double amount = 1, bool isPrecise = false) => adjust(-amount, isPrecise); public void Decrease(double amount = 1, bool isPrecise = false) => adjust(-amount, isPrecise);
@ -236,7 +236,7 @@ namespace osu.Game.Overlays.Volume
var precision = Bindable.Precision; var precision = Bindable.Precision;
while (Math.Abs(scrollAccumulation) > precision) while (Precision.AlmostBigger(Math.Abs(scrollAccumulation), precision))
{ {
Volume += Math.Sign(scrollAccumulation) * precision; Volume += Math.Sign(scrollAccumulation) * precision;
scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision); scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision);

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

@ -84,6 +84,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
public override bool RemoveCompletedTransforms => false; public override bool RemoveCompletedTransforms => false;
protected override bool RequiresChildrenUpdate => true; protected override bool RequiresChildrenUpdate => true;
public override bool IsPresent => base.IsPresent || State.Value == ArmedState.Idle && Clock?.CurrentTime >= LifetimeStart;
public readonly Bindable<ArmedState> State = new Bindable<ArmedState>(); public readonly Bindable<ArmedState> State = new Bindable<ArmedState>();
protected DrawableHitObject(HitObject hitObject) protected DrawableHitObject(HitObject hitObject)