RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #382 from peppy/general-fixes 

General fixes
This commit is contained in:
Thomas Müller 2017-02-22 19:21:40 +01:00 committed by GitHub
parent 74ea5e7343 ac0b2b5aa5
commit bcb5b86392
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -120,12 +120,15 @@ protected override void UpdatePreemptState()
{
base.UpdatePreemptState();
FadeIn(200);
circleContainer.ScaleTo(1, 400, EasingTypes.OutElastic);
background.Delay(TIME_PREEMPT - 100);
background.Delay(TIME_PREEMPT - 500);
background.ScaleTo(scaleToCircle * 1.2f, 400, EasingTypes.OutQuint);
background.FadeIn(200);
background.ScaleTo(1, 200, EasingTypes.OutQuint);
background.Delay(400);
background.ScaleTo(1, 250, EasingTypes.OutQuint);
disc.Delay(TIME_PREEMPT - 50);
disc.FadeIn(200);

2
osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
View File

@ -173,7 +173,7 @@ protected override bool OnMouseMove(InputState state)
private int completeTick;
private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 720));
private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 360));
protected override void Update()
{

2
osu.Game/Beatmaps/Drawables/Panel.cs
View File

@ -38,6 +38,8 @@ protected Panel()
CornerRadius = 10,
BorderColour = new Color4(221, 255, 255, 255),
});
Alpha = 0;
}
public void SetMultiplicativeAlpha(float alpha)

16
osu.Game/Screens/Play/SkipButton.cs
View File

@ -4,8 +4,10 @@
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Graphics;
using osu.Framework.Input;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using OpenTK.Input;
namespace osu.Game.Screens.Play
{
@ -28,5 +30,19 @@ private void load(AudioManager audio, OsuColour colours)
Colour = colours.Yellow;
HoverColour = colours.YellowDark;
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
if (args.Repeat) return false;
switch (args.Key)
{
case Key.Space:
TriggerClick();
return true;
}
return base.OnKeyDown(state, args);
}
}
}