Dean Herbert 7fe2f6639d

Merge remote-tracking branch 'upstream/master' into results-screen ...

# Conflicts:
#	osu.Game/Users/User.cs

2017-04-19 20:51:05 +09:00

..

Filter

Fixed license headers

2017-03-14 20:30:42 -07:00

Leaderboards

Merge remote-tracking branch 'upstream/master' into results-screen

2017-04-19 20:51:05 +09:00

Options

Update references.

2017-03-28 21:26:20 +09:00

BeatmapCarousel.cs

Fix song select.

2017-04-18 10:04:32 +09:00

BeatmapDeleteDialog.cs

Fix most warnings.

2017-03-07 13:05:57 +09:00

BeatmapDetailArea.cs

condensed some commits because they were small or already reversed

2017-04-11 22:48:53 +02:00

BeatmapDetailAreaTabControl.cs

Update UI control access in line with framework changes.

2017-04-10 14:54:23 +09:00

BeatmapDetails.cs

Metric -> Metrics.

2017-04-12 21:09:39 +09:00

BeatmapInfoWedge.cs

Merge branch 'master' into general-fixes

2017-04-18 16:19:52 +09:00

EditSongSelect.cs

Control footer by virtual property.

2017-03-15 10:10:59 +08:00

FilterControl.cs

Make a RulesetDatabase.

2017-04-17 17:43:48 +09:00

FilterCriteria.cs

Add fallback to allow FilterCriteria to run without a ruleset being set.

2017-04-18 10:55:45 +09:00

Footer.cs

Update references.

2017-03-28 21:26:20 +09:00

FooterButton.cs

Update references.

2017-03-28 21:26:20 +09:00

MatchSongSelect.cs

Control footer by virtual property.

2017-03-15 10:10:59 +08:00

PlaySongSelect.cs

Make leaderboard scores clickable.

2017-04-18 22:22:14 +09:00

SearchTextBox.cs

Hard-code text size in cases it wasn't set.

2017-03-20 13:48:06 +09:00

SongSelect.cs

Make a RulesetDatabase.

2017-04-17 17:43:48 +09:00

WedgeBackground.cs

Remove unnecessary usings

2017-03-04 19:43:59 +01:00