Thomas Müller 4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms ... # Conflicts: # osu-framework # osu.Game/Graphics/Cursor/OsuTooltipContainer.cs # osu.Game/Overlays/DragBar.cs		2017-07-18 15:16:02 +03:00
..
Volume	Get rid of raw AddDelay calls within osu.Game	2017-07-17 16:51:21 +03:00
BackButton.cs	More unused usings	2017-06-29 12:20:05 -07:00
Bar.cs	Shapes namespace	2017-06-20 15:54:23 +10:00
BarGraph.cs	Update framework	2017-07-12 11:06:13 +09:00
BreadcrumbControl.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
DialogButton.cs	Get rid of raw AddDelay calls within osu.Game	2017-07-17 16:51:21 +03:00
FocusedTextBox.cs	Update in line with framework	2017-05-30 22:23:51 +09:00
IconButton.cs	Add OsuClickableContainer with generic sounds	2017-06-27 21:05:49 +09:00
LineGraph.cs	Formatting	2017-07-13 13:52:40 +09:00
LoadingAnimation.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
MenuItemType.cs	Move MenuItemType to correct namespace	2017-06-13 15:20:21 +09:00
Nub.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
OsuButton.cs	Update framework	2017-07-12 11:06:13 +09:00
OsuCheckbox.cs	Shuffle sound samples around and make more conformant	2017-06-28 10:19:04 -07:00
OsuContextMenu.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
OsuContextMenuItem.cs	Shuffle sound samples around and make more conformant	2017-06-28 10:19:04 -07:00
OsuDropdown.cs	Text -> Label	2017-05-31 02:03:13 -03:00
OsuEnumDropdown.cs	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08:00
OsuMenu.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
OsuPasswordTextBox.cs	Shapes namespace	2017-06-20 15:54:23 +10:00
OsuSliderBar.cs	Shuffle sound samples around and make more conformant	2017-06-28 10:19:04 -07:00
OsuTabControl.cs	Merge branch 'master' into profile.	2017-07-10 10:36:23 +08:00
OsuTabControlCheckbox.cs	Shapes namespace	2017-06-20 15:54:23 +10:00
OsuTextBox.cs	Update in line with framework	2017-05-30 22:23:51 +09:00
PageTabControl.cs	Fix namespaces	2017-06-21 17:03:47 +09:00
PercentageCounter.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
RollingCounter.cs	Update framework	2017-07-16 13:59:26 +03:00
ScoreCounter.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
SearchTextBox.cs	Update framework	2017-07-12 11:06:13 +09:00
SimpleComboCounter.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
StarCounter.cs	Replace several usages of BeginDelayedSequence with LINQ-style	2017-07-16 17:42:01 +03:00
TwoLayerButton.cs	Try different formatting style	2017-07-16 18:28:20 +03:00