1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 12:02:57 +08:00
osu-lazer/osu.Game/Overlays
miterosan ba5861b527 Merge remote-tracking branch 'origin/master' into Private_Messages
# Conflicts:
#	osu.Game/Online/API/Requests/GetMessagesRequest.cs
#	osu.Game/Overlays/Chat/ChatTabControl.cs
2018-05-06 19:45:33 +02:00
..
BeatmapSet Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:42:09 +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 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:42:09 +09:00
KeyBinding Normalize all the line endings 2018-04-13 18:26:38 +09:00
MedalSplash Normalize all the line endings 2018-04-13 18:26:38 +09:00
Mods Merge remote-tracking branch 'upstream/master' into wave-container 2018-04-15 21:03:18 +09:00
Music Normalize all the line endings 2018-04-13 18:26:38 +09:00
Notifications Normalize all the line endings 2018-04-13 18:26:38 +09:00
Profile Fix BadgeContainer being unsable to handle null badges 2018-04-20 16:05:34 +09:00
SearchableList Normalize all the line endings 2018-04-13 18:26:38 +09:00
Settings Changes to naming and text 2018-04-18 19:47:13 +09:00
Social Normalize all the line endings 2018-04-13 18:26:38 +09:00
Toolbar Normalize all the line endings 2018-04-13 18:26:38 +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 Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh. 2018-04-18 20:46:42 +02: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
KeyBindingOverlay.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00
LoginOverlay.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00
MainSettings.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00
MedalOverlay.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00
MusicController.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00
NotificationOverlay.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00
OnScreenDisplay.cs Normalize all the line endings 2018-04-13 18:26:38 +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 Normalize all the line endings 2018-04-13 18:26:38 +09:00
WaveOverlayContainer.cs Merge remote-tracking branch 'upstream/master' into wave-container 2018-04-15 21:03:18 +09:00