Dean Herbert 471b9daa93 Merge branch 'master' into mod-overlay ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/osu.Game.csproj		2017-03-02 20:27:04 +09:00
..
Objects	Fix some license headers.	2017-03-02 18:45:20 +09:00
Properties	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
UI	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
app.config	Update nuget packages.	2017-02-27 20:38:30 +09:00
OpenTK.dll.config	Add/update license headers.	2017-02-14 18:17:35 +09:00
osu.Game.Modes.Osu.csproj	Working on better way to handle mods	2017-03-01 20:57:33 -04:00
OsuDifficultyCalculator.cs	Fix and refactor star difficulty calculation boilerplate	2017-02-24 19:36:17 +01:00
OsuMod.cs	CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection	2017-03-02 01:07:28 -04:00
OsuRuleset.cs	Remove AvailableMods	2017-03-02 02:04:26 -04:00
OsuScore.cs	Fix some license headers.	2017-03-02 18:45:20 +09:00
OsuScoreProcessor.cs	Add MaxScore to correctly account for the maximum attainable score of DrawableHitObjects.	2017-02-16 17:33:13 +09:00
packages.config	Update nuget packages.	2017-02-27 20:38:30 +09:00