1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:17:23 +08:00
osu-lazer/osu.Game/Overlays
smoogipoo d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
..
AccountCreation Apply newline additions 2019-04-01 12:16:32 +09:00
BeatmapSet Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Chat Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Dialog Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Direct Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
KeyBinding Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
MedalSplash Apply more missed cases 2019-04-01 12:44:46 +09:00
Mods Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Music Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Notifications Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Profile Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
SearchableList Update font awesome usage 2019-04-02 19:55:24 +09:00
Settings Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Social Merge remote-tracking branch 'Joehuu/master' into drawnode-composability 2019-04-08 23:01:12 +09:00
Toolbar Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Volume Update font awesome usage 2019-04-02 19:55:24 +09:00
AccountCreationOverlay.cs Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
BeatmapSetOverlay.cs Adjust namespaces 2019-04-02 14:51:28 +09:00
ChatOverlay.cs Apply newline additions 2019-04-01 12:16:32 +09:00
DialogOverlay.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
DirectOverlay.cs Apply newline additions 2019-04-01 12:16:32 +09:00
HoldToConfirmOverlay.cs Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
KeyBindingOverlay.cs Update font awesome usage 2019-04-02 19:55:24 +09:00
LoginOverlay.cs Remove unnecessary newline 2019-03-27 22:21:28 -07:00
MainSettings.cs Apply more missed cases 2019-04-01 12:44:46 +09:00
MedalOverlay.cs Adjust namespaces 2019-04-02 14:51:28 +09:00
MusicController.cs Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
NotificationOverlay.cs Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
OnScreenDisplay.cs Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +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 Apply newline additions 2019-04-01 12:16:32 +09:00
UserProfileOverlay.cs Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
VolumeOverlay.cs Apply more missed cases 2019-04-01 12:44:46 +09:00
WaveOverlayContainer.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00