smoogipoo 4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ...

# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs

2018-06-06 18:26:51 +09:00

..

BeatmapSet

Merge branch 'master' into source-link-colour

2018-06-06 08:27:28 +09:00

Chat

Update framework and ensure the add channel button is not switchable

2018-04-24 20:46:44 +09:30

Dialog

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Direct

Avoid using update for fading logic

2018-06-01 22:19:11 +09:00

KeyBinding

Update framework

2018-06-03 03:05:53 +09:00

MedalSplash

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Mods

Tidy up some unnecessary lines

2018-05-31 12:44:59 +09:00

Music

Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

2018-05-28 18:01:15 +09:00

Notifications

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Profile

Update existing drawables to use UpdateableBeatmapSetCover.

2018-05-28 19:31:20 -03:00

SearchableList

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Settings

Move setting to new "mods" section

2018-06-06 12:32:59 +09:00

Social

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Toolbar

Rewrite code for clarity

2018-05-21 14:49:26 +09:00

Volume

Normalize all the line endings

2018-04-13 18:26:38 +09:00

BeatmapSetOverlay.cs

Don't return overlay to null until it has been completely hidden

2018-04-20 12:47:23 +09:00

ChatOverlay.cs

Use bindable transforms

2018-05-02 18:26:23 +09:00

DialogOverlay.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00

DirectOverlay.cs

Merge remote-tracking branch 'origin/master' into fix-rank-status

2018-04-18 14:16:58 +09:00

HoldToConfirmOverlay.cs

Fix class name

2018-05-22 16:04:36 +09:00

KeyBindingOverlay.cs

Allow help text to wrap

2018-05-14 19:56:03 +09:00

LoginOverlay.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00

MainSettings.cs

Add back action support to settings back button

2018-05-18 13:40:35 +09:00

MedalOverlay.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00

MusicController.cs

Privatise the OsuGame beatmap, add local beatmap to OsuTestCase

2018-05-23 17:38:02 +09:00

NotificationOverlay.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00

OnScreenDisplay.cs

Display "no key bound" when no shortcut

2018-05-14 19:20:53 +09:00

SettingsOverlay.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00

SocialOverlay.cs

Merge remote-tracking branch 'upstream/master' into wave-container

2018-04-15 21:03:18 +09:00

UserProfileOverlay.cs

Revert "Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed"

2018-05-02 16:39:00 +09:00

VolumeOverlay.cs

Fix crash on startup when adjusting volume before volume control loaded

2018-05-11 22:57:36 +09:00

WaveOverlayContainer.cs

Merge remote-tracking branch 'upstream/master' into wave-container

2018-04-15 21:03:18 +09:00