1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 19:27:31 +08:00
osu-lazer/osu.Game/Rulesets/Difficulty
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
..
Preprocessing XMLDoc DifficultyHitObject 2019-02-19 14:30:59 +09:00
Skills Merge remote-tracking branch 'origin/master' into new-diffcalc-mania 2019-02-19 16:30:05 +09:00
Utils History -> LimitedCapacityStack + re-xmldoc 2019-02-19 13:51:19 +09:00
DifficultyAttributes.cs Remove mods from constructor 2019-02-19 13:40:39 +09:00
DifficultyCalculator.cs Merge remote-tracking branch 'origin/master' into fix-new-inspections 2019-05-07 13:20:17 +09:00
PerformanceCalculator.cs Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00