Dean Herbert ffcad6e0f1 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake ... # Conflicts: # osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs # osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs		2018-08-24 15:26:36 +09:00
..
BeatSyncedContainer.cs	Rename GameBeatmap -> BindableBeatmap	2018-06-06 20:16:20 +09:00
ConstrainedIconContainer.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
HoldToConfirmContainer.cs	Fix class name	2018-05-22 16:04:36 +09:00
LinkFlowContainer.cs	Update framework	2018-06-19 20:19:52 +09:00
OsuClickableContainer.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
OsuFocusedOverlayContainer.cs	Update framework	2018-07-21 16:21:53 +09:00
OsuHoverContainer.cs	Update framework	2018-07-21 16:21:53 +09:00
OsuScrollContainer.cs	Update framework	2018-07-21 16:21:53 +09:00
OsuTextFlowContainer.cs	Add word wrap support	2018-06-28 13:04:39 +09:00
ParallaxContainer.cs	Add documentation for negative values of ParallaxAmount	2018-06-21 12:49:07 +09:00
ReverseChildIDFillFlowContainer.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
SectionsContainer.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
ShakeContainer.cs	Limit shake duration to ensure it doesn't overlap miss window	2018-07-06 17:24:30 +09:00
WaveContainer.cs	Merge remote-tracking branch 'upstream/master' into wave-container	2018-04-15 21:03:18 +09:00