1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-16 12:53:07 +08:00
osu-lazer/osu.Game.Modes.Catch
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
..
Beatmaps Add license headers. 2017-03-14 13:02:42 +09:00
Mods Initial attempt at making mods apply better. 2017-03-12 22:13:43 +09:00
Objects Fix up warnings, convert back to float position. 2017-03-14 13:11:07 +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 'master' into beatmap_parsing 2017-03-14 13:39:19 +09:00
OpenTK.dll.config Add/update license headers. 2017-02-14 18:17:35 +09:00
osu.Game.Modes.Catch.csproj Merge branch 'master' into mod_application 2017-03-13 23:00:11 +09:00
packages.config Add license headers. 2017-03-14 13:02:42 +09:00