1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 16:47:24 +08:00
osu-lazer/osu.Game.Modes.Catch
smoogipooo 447cc17de8 Merge branch 'beatmap_conversion' into mod_application
Conflicts:
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Taiko/TaikoRuleset.cs
2017-03-12 22:20:52 +09:00
..
Beatmaps Better beatmap conversion model. 2017-03-12 00:34:21 +09:00
Mods Initial attempt at making mods apply better. 2017-03-12 22:13:43 +09:00
Objects Fix most warnings. 2017-03-07 13:05:57 +09:00
Properties Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
UI Instantiate HitRenderer with WorkingBeatmap. 2017-03-12 18:03:13 +09:00
CatchDifficultyCalculator.cs usings 2017-03-12 14:37:39 +09:00
CatchRuleset.cs Merge branch 'beatmap_conversion' into mod_application 2017-03-12 22:20:52 +09:00
OpenTK.dll.config Add/update license headers. 2017-02-14 18:17:35 +09:00
osu.Game.Modes.Catch.csproj Initial attempt at making mods apply better. 2017-03-12 22:13:43 +09:00
packages.config Update license headers. 2017-03-08 15:50:52 +09:00