1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-19 01:32:54 +08:00
osu-lazer/osu.Game/Overlays
Dean Herbert 482a01e7ba Merge branch 'master' into tournament-tools
# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-02-02 19:09:48 +09:00
..
AccountCreation Merge branch 'master' into reg-screen-focus-fix 2019-01-31 21:08:12 +09:00
BeatmapSet Shake in all cases 2019-01-31 19:15:04 +09:00
Chat Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
Dialog Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Direct Update licence headers 2019-01-31 19:17:42 +09:00
KeyBinding Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
MedalSplash Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Mods Fix logical regression 2019-01-25 15:03:32 +09:00
Music Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
Notifications Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Profile Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
SearchableList Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
Settings Merge branch 'master' into tournament-tools 2019-02-02 19:09:48 +09:00
Social Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Toolbar Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Volume Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
AccountCreationOverlay.cs Merge remote-tracking branch 'origin/master' into iscreen 2019-01-29 21:21:36 +09:00
BeatmapSetOverlay.cs Merge remote-tracking branch 'upstream/master' into download-tracking-component 2019-01-31 18:45:09 +09:00
ChatOverlay.cs Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
DialogOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
DirectOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
HoldToConfirmOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
KeyBindingOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
LoginOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
MainSettings.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
MedalOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
MusicController.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
NotificationOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
OnScreenDisplay.cs Merge branch 'master' into fix-tracked-config-disposal 2019-01-25 12:14:58 +09:00
OverlayActivation.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
SettingsOverlay.cs Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
SocialOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
UserProfileOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
VolumeOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
WaveOverlayContainer.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00