1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-14 01:42:59 +08:00
osu-lazer/osu.Game/Beatmaps
smoogipooo 854212a7aa Merge branch 'master' into beatmap_parsing
Conflicts:
	osu.Desktop.VisualTests/app.config
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Mania/app.config
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Osu/app.config
	osu.Game.Modes.Taiko/TaikoRuleset.cs
	osu.Game/Modes/Ruleset.cs
	osu.Game/app.config
	osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
..
Drawables Fix most warnings. 2017-03-07 13:05:57 +09:00
Events Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Formats Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use. 2017-03-13 19:15:25 +09:00
IO Revert "Merge pull request #441 from tacchinotacchi/archive-reader" 2017-03-14 11:46:34 +09:00
Samples Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Timing Fix most warnings. 2017-03-07 13:05:57 +09:00
Beatmap.cs Remove PlayMode enum requirement. Clean things up a lot. 2017-03-12 14:32:50 +09:00
DifficultyCalculator.cs I don't like this renaming. 2017-03-14 12:54:09 +09:00
IBeatmapCoverter.cs I don't like this renaming. 2017-03-14 12:54:09 +09:00
WorkingBeatmap.cs Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00