1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:27:29 +08:00
osu-lazer/osu.Game
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
..
Audio Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
Beatmaps Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Configuration Apply newline additions 2019-04-01 12:16:32 +09:00
Database Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Graphics Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Input Apply more missed cases 2019-04-01 12:44:46 +09:00
IO Apply newline additions 2019-04-01 12:16:32 +09:00
IPC Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Migrations Address styling issues on CodeFactor 2019-03-14 16:05:54 -07:00
Online Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Overlays Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Properties Merge branch 'master' into correct-preview-loop 2019-01-31 10:53:09 +01:00
Replays Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Rulesets Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Scoring Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Screens Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Skinning Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Storyboards Apply newline additions 2019-04-01 12:16:32 +09:00
Tests Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
Users SupporterLevel -> SupportLevel 2019-04-28 20:11:36 +09:00
Utils Fix stuck r# inspection 2019-03-08 12:16:12 +09:00
osu!.res And then everything became one 2017-09-19 16:06:58 +09:00
osu.Game.csproj Update framework 2019-05-02 12:53:59 +09:00
OsuGame.cs Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
OsuGameBase.cs Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00