1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 15:42:54 +08:00
Commit Graph

13 Commits

Author SHA1 Message Date
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dean Herbert
56922b66be
Refactor sliders to have more central position/progress calculations. 2017-03-06 11:11:29 +09:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Dean Herbert
564608fe52
Fix incorrect slider assert logic (and improve flow). 2017-02-24 18:31:05 +09:00
Dean Herbert
396c8121d3 Better slider defaults. 2017-02-15 01:23:19 +09:00
Dean Herbert
e88d02d3c4 Ensure SliderCurve is assigned Calculated before used. 2017-02-15 01:23:19 +09:00
Damnae
07c0057fab Update GetPathToProgress's xml-doc. 2017-02-09 08:57:28 +01:00
Damnae
a79fde897b Add StackedPosition/StackedEndPosition and offset slider curves by StackOffset. 2017-02-09 08:29:21 +01:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Thomas Müller
f13303c86c Do not lengthen slider curves according to the length prescribed in the .osu file for now.
This fixes some issues with the map http://osu.ppy.sh/s/484689 . There is still one problem with an almost stationary slider in this map at around the 2/3 mark, but the rest seems to work fine now.
2016-12-17 08:44:58 +01:00
Thomas Müller
38968ad6d2 Add circular arc approximator for "perfect" sliders. 2016-12-09 18:04:02 +01:00
Dean Herbert
40ea6e0d72 Fix incorrect folder name. 2016-12-08 21:36:34 +09:00