Shane Woolcock 32ffcb9865 Merge branch 'master' into samah-ios ... # Conflicts: # osu.Game/osu.Game.csproj		2018-12-29 20:09:00 +10:30
..
Beatmaps	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Difficulty	numtotalhits -> totalHits	2018-12-23 22:23:43 -07:00
Edit	Fix drag breaking if scrolling while dragging	2018-11-26 16:08:56 +09:00
Judgements
Mods	Fix extra hard-rock flipping for sliders	2018-12-21 16:08:08 -08:00
Objects	Major code refactors	2018-12-07 21:11:35 +09:00
Properties	Add ruleset visual tests	2018-12-29 20:05:37 +10:30
Replays	Remove User from Replay	2018-11-30 18:25:14 +09:00
Resources/Testing/Beatmaps
Scoring	Fix missing hitwindows	2018-12-28 00:14:00 +09:00
UI	Re-namespace replay-related classes	2018-11-28 17:20:37 +09:00
osu.Game.Rulesets.Osu.csproj
OsuInputManager.cs	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
OsuRuleset.cs	Change osu! default keys back to Z/X	2018-12-22 09:49:09 +09:00