Dean Herbert 9e1383fa48 Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Game.Modes.Catch/CatchRuleset.cs # osu.Game.Modes.Mania/ManiaRuleset.cs # osu.Game.Modes.Taiko/TaikoRuleset.cs # osu.Game/Screens/Play/Player.cs		2017-03-04 13:17:01 +09:00
..
Objects	Update framework	2017-02-26 11:22:58 +09:00
Properties	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
UI	Update framework	2017-02-26 11:22:58 +09:00
OpenTK.dll.config	Add/update license headers.	2017-02-14 18:17:35 +09:00
osu.Game.Modes.Taiko.csproj	Working on better way to handle mods	2017-03-01 20:57:33 -04:00
packages.config	Update nuget packages.	2017-02-27 20:38:30 +09:00
TaikoDifficultyCalculator.cs	Fix and refactor star difficulty calculation boilerplate	2017-02-24 19:36:17 +01:00
TaikoMod.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
TaikoRuleset.cs	Merge remote-tracking branch 'upstream/master' into replay	2017-03-04 13:17:01 +09:00