Dean Herbert cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection ... # Conflicts: # osu-framework # osu.Game/GameModes/OsuGameMode.cs # osu.Game/GameModes/Play/Player.cs # osu.Game/OsuGame.cs # osu.Game/Overlays/MusicController.cs # osu.Game/Overlays/Options/EditorSection.cs # osu.Game/Overlays/Options/Input/MouseOptions.cs # osu.Game/Overlays/Options/Online/InGameChatOptions.cs # osu.Game/Overlays/Options/SkinSection.cs		2016-11-12 20:18:26 +09:00
..
Volume	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
KeyCounter.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
KeyCounterCollection.cs	Fix one remaining FlowContainer.	2016-10-22 19:37:27 +09:00
KeyCounterKeyboard.cs	Fix typo and missnaming.	2016-09-24 19:46:10 +08:00
KeyCounterMouse.cs	Rename counter classes to avoid confusing.	2016-09-24 19:46:10 +08:00
LoadingAnimation.cs	Rework how references are passed about	2016-11-03 22:43:00 -04:00
OsuButton.cs	Add OsuButton with sane defaults	2016-11-03 19:06:22 -04:00
PercentageCounter.cs	Update transforms to not accept clock.	2016-10-28 17:42:00 +09:00
RollingCounter.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
ScoreCounter.cs	Make use of new timing system in Drawables and Transforms.	2016-11-06 08:25:21 +01:00
StarCounter.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00