Dean Herbert a5b0d51205 Merge remote-tracking branch 'upstream/master' into url-parsing-support ...

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

2018-01-27 14:06:58 +09:00

..

BeatmapSet

use ternary expression

2018-01-18 15:53:53 +01:00

Chat

remove unnecessary empty lines

2018-01-12 19:30:34 +01:00

Dialog

Update licence headers

2018-01-05 20:21:19 +09:00

Direct

Merge branch 'master' into fix-user-download-cancel

2018-01-22 16:27:26 +09:00

KeyBinding

add skip cutscene as "in game" keybinding

2018-01-08 18:22:43 +01:00

MedalSplash

remove unnecessary empty lines

2018-01-12 19:30:34 +01:00

Mods

Update licence headers

2018-01-05 20:21:19 +09:00

Music

remove unnecessary empty lines

2018-01-12 19:30:34 +01:00

Notifications

remove unnecessary empty lines

2018-01-12 19:30:34 +01:00

Profile

Update with upstream changes

2018-01-17 16:51:47 +09:00

SearchableList

Update licence headers

2018-01-05 20:21:19 +09:00

Settings

Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision

2018-01-12 18:54:36 +09:00

Social

enable query

2018-01-10 16:46:55 +01:00

Toolbar

fix settings not getting injected

2018-01-23 19:42:21 +01:00

BeatmapSetOverlay.cs

Update licence headers

2018-01-05 20:21:19 +09:00

ChatOverlay.cs

Merge branch 'master' into url-parsing-support

2018-01-09 14:28:20 +09:00

DialogOverlay.cs

Update licence headers

2018-01-05 20:21:19 +09:00

DirectOverlay.cs

we need to go back

2018-01-22 08:04:14 +01:00

KeyBindingOverlay.cs

Update licence headers

2018-01-05 20:21:19 +09:00

LoginOverlay.cs

Update licence headers

2018-01-05 20:21:19 +09:00

MainSettings.cs

Update licence headers

2018-01-05 20:21:19 +09:00

MedalOverlay.cs

Update licence headers

2018-01-05 20:21:19 +09:00

MusicController.cs

Make MusicController draggable again

2018-01-25 00:38:22 +03:00

NotificationOverlay.cs

Update licence headers

2018-01-05 20:21:19 +09:00

OnScreenDisplay.cs

Register/Unregister -> BeginTracking/StopTracking and add exceptions

2018-01-18 18:45:48 +09:00

SettingsOverlay.cs

Update licence headers

2018-01-05 20:21:19 +09:00

SocialOverlay.cs

Fix incorrect online conditional check in social browser logic

2018-01-12 18:20:46 +09:00

UserProfileOverlay.cs

Update licence headers

2018-01-05 20:21:19 +09:00

WaveOverlayContainer.cs

Update licence headers

2018-01-05 20:21:19 +09:00