Dean Herbert 253bcebf51 Merge remote-tracking branch 'upstream/master' into leaderboards ...

# Conflicts:
#	osu.Game/osu.Game.csproj

2017-03-15 12:23:34 +09:00

..

Leaderboards

Proper icons

2017-03-14 12:58:22 -03:00

Options

Fix typo and warnings.

2017-03-14 21:20:38 +08:00

BeatmapDeleteDialog.cs

Fix most warnings.

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

BeatmapInfoWedge.cs

Make BeatmapInfoWedge:OverlayContainer and unify transforms.

2017-03-14 16:29:20 +08:00

CarouselContainer.cs

Fix beatmap panel removal.

2017-03-14 04:35:43 +08:00

EditSongSelect.cs

Control footer by virtual property.

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

FilterControl.cs

Reduce error count.

2017-03-09 14:24:16 +09:00

Footer.cs

Fix CI issues.

2017-03-14 22:27:24 +08:00

FooterButton.cs

Make Footer handles hotkey.

2017-03-14 18:16:04 +08:00

MatchSongSelect.cs

Control footer by virtual property.

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

PlaySongSelect.cs

Control footer by virtual property.

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

SearchTextBox.cs

SearchTextBox should not handle shift-delete.

2017-02-24 11:44:40 +09:00

SongSelect.cs

Control footer by virtual property.

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

WedgeBackground.cs

Remove unnecessary usings

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