smoogipooo 58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework		2017-09-11 15:02:12 +09:00
..
Beatmaps	Don't crash on spinners	2017-08-09 08:54:19 +09:00
Judgements	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Mods	Daycore mod	2017-05-30 12:49:06 -04:00
Objects	Make pulp size private	2017-08-09 10:16:31 +09:00
Properties	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Scoring	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00
UI	Update in line with framework changes.	2017-09-07 22:46:21 +09:00
CatchDifficultyCalculator.cs	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
CatchInputManager.cs	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
CatchRuleset.cs	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
OpenTK.dll.config	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
osu.Game.Rulesets.Catch.csproj	Target .NET 4.6.1	2017-09-11 12:39:00 +09:00
packages.config	Update nuget packages	2017-06-13 11:50:46 +09:00