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

Merge remote-tracking branch 'refs/remotes/upstream/master' into project-restructure 

# Conflicts:
#	osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs
This commit is contained in:
Dean Herbert 2016-11-14 22:08:30 +09:00
parent d3f810f72f 63f0a01888
commit 9a8003f6fa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 1cb936a4fe9e699ee37deb34eed0b04bc06167e3
Subproject commit 87a5cd4ce48d6370b8e392378289825f4b4a2039

4
osu.Game/Overlays/MusicController.cs
View File

@ -179,7 +179,9 @@ public MusicController()
protected override bool OnDrag(InputState state)
{
Vector2 change = (state.Mouse.Position - state.Mouse.PositionMouseDown.Value);
change.X = -change.X;
if ((Anchor & Anchor.x2) > 0)
change.X = -change.X;
change *= (float)Math.Pow(change.Length, 0.7f) / change.Length;