smoogipooo 58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework		2017-09-11 15:02:12 +09:00
..
Beatmaps	Revert "Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects."	2017-05-19 17:38:06 +09:00
Judgements	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Mods	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
Objects	Update in line with framework changes.	2017-09-07 22:46:21 +09:00
OsuDifficulty	Fix a false resharper positive	2017-09-11 11:41:29 +09:00
Properties	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Replays	Add missing licence header	2017-08-24 20:37:03 +09:00
Scoring	"Use" the hitobject	2017-09-05 21:41:20 +09:00
UI	Update autoplay and replay handling to result in actions, not keys	2017-08-24 15:36:42 +09:00
OpenTK.dll.config	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
osu.Game.Rulesets.Osu.csproj	Target .NET 4.6.1	2017-09-11 12:39:00 +09:00
OsuInputManager.cs	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
OsuRuleset.cs	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
packages.config	Update nuget packages	2017-06-13 11:50:46 +09:00