1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 13:22:55 +08:00
osu-lazer/osu.Game.Rulesets.Mania
smoogipoo a4caaf56ef Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2018-11-05 16:38:28 +09:00
..
Beatmaps Merge remote-tracking branch 'origin/master' into fix-slider-samples 2018-11-05 16:38:28 +09:00
Configuration Adjust default mania speed to match stable 2018-10-01 18:30:52 +09:00
Difficulty Make sure that 0 SR is returned when there are no hitobjects 2018-06-21 12:04:14 +09:00
Edit Merge branch 'master' into editor-mask-placement 2018-10-31 06:46:48 +09:00
Judgements Make Rulesets.Mania use the new judgement result structure 2018-08-02 20:36:54 +09:00
MathUtils Add rng components to mania conversion tests 2018-06-15 20:48:48 +09:00
Mods Add type parameter to IApplicableToBeatmap 2018-10-30 00:13:33 -04:00
Objects Synchronise animation; reduce flashiness 2018-09-07 17:17:03 +09:00
Properties Normalize all the line endings 2018-04-13 18:26:38 +09:00
Replays Update framework 2018-07-21 16:21:53 +09:00
Resources/Testing/Beatmaps Update testcase 2018-06-19 13:52:24 +09:00
Scoring Rename judgement-related methods/events + commenting 2018-08-06 10:55:25 +09:00
UI Merge remote-tracking branch 'origin/master' into editor-mask-placement 2018-10-16 17:28:16 +09:00
ManiaInputManager.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00
ManiaRuleset.cs Merge branch 'master' into mania-mask-container 2018-08-06 04:22:21 +09:00
ManiaSettingsSubsection.cs Fix DI regression 2018-07-11 17:54:01 +09:00
osu.Game.Rulesets.Mania.csproj Remove unnecessary csproj edit 2018-06-07 15:57:21 +09:00