Thomas Müller d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor ... # Conflicts: # osu-framework # osu.Game/Beatmaps/Drawables/BeatmapGroup.cs		2017-03-01 18:05:58 +01:00
..
Connections	Update framework	2017-02-26 11:22:58 +09:00
Pieces	Fix regression in TrianglesPiece.	2017-03-01 11:56:14 +09:00
DrawableHitCircle.cs	Update framework	2017-02-26 11:22:58 +09:00
DrawableOsuHitObject.cs	Add MaxScore to correctly account for the maximum attainable score of DrawableHitObjects.	2017-02-16 17:33:13 +09:00
DrawableSlider.cs	Fix sliders playing hitsound twice at end.	2017-02-22 13:51:40 +09:00
DrawableSliderTick.cs	Update framework	2017-02-26 11:22:58 +09:00
DrawableSpinner.cs	Update framework	2017-02-26 11:22:58 +09:00
HitExplosion.cs	Update References to FlowStrategies	2017-02-27 16:55:55 +01:00