Dean Herbert 12d2102a88 Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj		2017-04-07 09:22:18 +09:00
..
Judgements	Make combo be changed by the base ScoreProcessor.	2017-04-06 14:37:21 +09:00
Mods	Refactor ReplayInputHandler creation for more flexibility.	2017-03-31 15:59:53 +09:00
Objects	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Replays	Refactor ReplayInputHandler creation for more flexibility.	2017-03-31 15:59:53 +09:00
Scoring	Make combo be changed by the base ScoreProcessor.	2017-04-06 14:37:21 +09:00
UI	Merge remote-tracking branch 'upstream/master' into song-progress-graph	2017-04-07 09:22:18 +09:00
PlayMode.cs	Added Descriptions to Rulesets + PlayModes list	2017-03-09 21:37:03 +01:00
Ruleset.cs	Move ScoreProcessor and Score to Scoring/.	2017-03-24 09:51:52 +09:00