1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 01:07:25 +08:00
osu-lazer/osu.Game/Overlays
smoogipoo ee1f9d4981 Merge remote-tracking branch 'origin/master' into profile-header-update
# Conflicts:
#	osu-resources
#	osu.Game/Overlays/Profile/Components/GradeBadge.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/Header/RankGraph.cs
#	osu.Game/Overlays/Profile/Header/SupporterIcon.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
2019-03-06 15:53:30 +09:00
..
AccountCreation Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
BeatmapSet Use local variables where appropriate 2019-02-28 19:58:48 +09:00
Chat Wrong line 2019-03-02 13:28:16 +09:00
Dialog Fix remaining issues 2019-02-28 13:31:40 +09:00
Direct Merge pull request #4374 from Joehuu/status-direct-list 2019-03-05 18:22:56 +09:00
KeyBinding Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
MedalSplash Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Mods Fix mod select overlay dimming itself 2019-03-02 14:48:05 +09:00
Music Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
Notifications Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Profile Merge remote-tracking branch 'origin/master' into profile-header-update 2019-03-06 15:53:30 +09:00
SearchableList Fix remaining issues 2019-02-28 13:31:40 +09:00
Settings Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
Social Fix remaining issues 2019-02-28 13:31:40 +09:00
Toolbar Fade out taskbar tooltip after clicking 2019-02-28 15:43:04 -08:00
Volume Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
AccountCreationOverlay.cs Fix account creation overlay not working 2019-02-15 17:01:51 +09:00
BeatmapSetOverlay.cs Use local variables where appropriate 2019-02-28 19:58:48 +09:00
ChatOverlay.cs Update variable names 2019-02-22 17:51:39 +09:00
DialogOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
DirectOverlay.cs Merge branch 'master' into toquantity-1 2019-02-28 15:57:51 +09:00
HoldToConfirmOverlay.cs Update variable names 2019-02-22 17:51:39 +09:00
KeyBindingOverlay.cs Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
LoginOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
MainSettings.cs Fix warnings 2019-02-03 17:09:04 +03:00
MedalOverlay.cs A few fixes 2019-02-28 14:45:59 +09:00
MusicController.cs Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
NotificationOverlay.cs Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
OnScreenDisplay.cs Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
OverlayActivation.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
SettingsOverlay.cs Update variable names 2019-02-22 17:51:39 +09:00
SocialOverlay.cs Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
UserProfileOverlay.cs Merge remote-tracking branch 'origin/master' into profile-header-update 2019-03-06 15:53:30 +09:00
VolumeOverlay.cs Update variable names 2019-02-22 17:51:39 +09:00
WaveOverlayContainer.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00