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
..
Filter	Fixed license headers	2017-03-14 20:30:42 -07:00
Leaderboards	Get rid of raw AddDelay calls within osu.Game	2017-07-17 16:51:21 +03:00
Options	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
BeatmapCarousel.cs	Update framework	2017-07-12 11:06:13 +09:00
BeatmapDeleteDialog.cs	CI fixes.	2017-05-06 16:06:38 +08:00
BeatmapDetailArea.cs	Update framework	2017-07-12 11:06:13 +09:00
BeatmapDetailAreaTabControl.cs	Shapes namespace	2017-06-20 15:54:23 +10:00
BeatmapDetails.cs	Remove all unnecessary parenthesis where object initialisers are used	2017-07-13 15:11:33 +09:00
BeatmapInfoWedge.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
EditSongSelect.cs	Control footer by virtual property.	2017-03-15 10:10:59 +08:00
FilterControl.cs	Remove all unnecessary parenthesis where object initialisers are used	2017-07-13 15:11:33 +09:00
FilterCriteria.cs	Make playlist filtering work.	2017-05-02 10:45:55 +09:00
Footer.cs	Use ReceiveMouseInputAt whenever possible	2017-06-30 09:54:03 +03:00
FooterButton.cs	Add OsuClickableContainer with generic sounds	2017-06-27 21:05:49 +09:00
MatchSongSelect.cs	Control footer by virtual property.	2017-03-15 10:10:59 +08:00
PlaySongSelect.cs	Applied suggested changes	2017-06-05 12:24:28 +03:00
SongSelect.cs	Merge branch 'master' into songselect-preview-fix	2017-07-18 13:05:03 +09:00
WedgeBackground.cs	Shapes namespace	2017-06-20 15:54:23 +10:00