Thomas Müller c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms ...

# Conflicts:
#	osu-framework

2017-07-19 19:15:51 +02:00

..

Chat

Merge branch 'master' of github.com:ppy/osu into better-transforms

2017-07-19 19:15:51 +02:00

Dialog

More unused usings

2017-06-29 12:20:05 -07:00

Direct

Update framework and fix compilation

2017-07-14 19:18:12 +03:00

MedalSplash

Try different formatting style

2017-07-16 18:28:20 +03:00

Mods

Try different formatting style

2017-07-16 18:28:20 +03:00

Music

Merge branch 'master' of github.com:ppy/osu into better-transforms

2017-07-19 19:15:51 +02:00

Notifications

Get rid of raw AddDelay calls within osu.Game

2017-07-17 16:51:21 +03:00

Profile

User property instead of weirdly named method

2017-07-17 13:39:29 +09:00

SearchableList

Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar

2017-07-14 06:23:07 +09:00

Settings

Merge branch 'master' of https://github.com/ppy/osu into better-transforms

2017-07-18 15:16:02 +03:00

Social

Make SearchableListHeader icon customisable

2017-06-07 20:06:02 +09:00

Toolbar

Update framework and fix compilation

2017-07-14 19:18:12 +03:00

ChatOverlay.cs

Merge branch 'master' of github.com:ppy/osu into better-transforms

2017-07-19 19:15:51 +02:00

DialogOverlay.cs

Get rid of raw AddDelay calls within osu.Game

2017-07-17 16:51:21 +03:00

DirectOverlay.cs

Improve formatting of panel creation code

2017-07-13 12:52:51 +09:00

LoginOverlay.cs

Merge branch 'master' of https://github.com/ppy/osu into better-transforms

2017-07-18 15:16:02 +03:00

MedalOverlay.cs

Try different formatting style

2017-07-16 18:28:20 +03:00

MusicController.cs

Merge branch 'master' of https://github.com/ppy/osu into better-transforms

2017-07-18 15:16:02 +03:00

NotificationManager.cs

Update framework and fix compilation

2017-07-14 19:18:12 +03:00

OnScreenDisplay.cs

Try different formatting style

2017-07-16 18:28:20 +03:00

SettingsOverlay.cs

Merge branch 'master' of https://github.com/ppy/osu into better-transforms

2017-07-18 15:16:02 +03:00

SocialOverlay.cs

Update framework with better children list

2017-06-24 12:56:35 +02:00

UserProfileOverlay.cs

Rename populate method

2017-07-17 13:56:50 +09:00

WaveOverlayContainer.cs

Update framework and fix compilation

2017-07-14 19:18:12 +03:00