smoogipoo 4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs		2018-06-06 18:26:51 +09:00
..
Beatmaps	Move ruleset-specific hitwindows to post-converted hitobjects	2018-05-17 13:35:15 +09:00
Difficulty	Actually cast to int	2018-05-26 09:25:16 +09:00
Edit	Fix resharper warnings	2018-05-07 11:38:41 +09:00
Judgements	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Mods	Fix regressions	2018-06-06 13:51:51 +09:00
Objects	Move ruleset-specific hitwindows to post-converted hitobjects	2018-05-17 13:35:15 +09:00
Properties	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Replays	Use IBeatmap wherever possible	2018-04-19 20:44:38 +09:00
Resources/Testing/Beatmaps	Merge branch 'master' into fix-perfectcurve	2018-03-02 21:49:33 +09:00
Scoring	Fix incorrect namespace of OsuPerformanceCalculator	2018-05-17 16:58:22 +09:00
UI	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
osu.Game.Rulesets.Osu.csproj	Tidy up csproj further	2018-03-28 15:19:56 +09:00
OsuInputManager.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
OsuRuleset.cs	Fix incorrect namespace of OsuPerformanceCalculator	2018-05-17 16:58:22 +09:00