Commit Graph

10 Commits

Author SHA1 Message Date
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
Drew DeVault ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
Dean Herbert b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Dean Herbert 13b5fb0578 Update transforms to not accept clock. 2016-10-28 17:42:00 +09:00
Huo Yaoyuan 80d5fa7243 Specify HitObjectConvertException. 2016-10-13 20:53:42 +08:00
Dean Herbert 2566d6bfe0 Fix regressions with HitRenderers, while also cleaning them up. 2016-10-13 10:10:15 +09:00
Dean Herbert f0284ce57c Use the old naming style for now. 2016-09-26 15:07:29 +09:00
Dean Herbert e0c06a4f19 Merge branch 'refs/heads/general-fixes' into beatmap_framework
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/FieldTest.cs
#	osu.Game/GameModes/FontTest.cs
#	osu.Game/GameModes/Menu/ButtonSystem.cs
#	osu.Game/Graphics/UserInterface/TextBox.cs
#	osu.Game/OsuGame.cs
#	osu.Game/osu.Game.csproj
2016-09-20 16:36:42 +09:00
Dean Herbert c75d74c84c Taiko notes should have scale, not bool Big. 2016-09-06 21:41:16 +09:00
Dean Herbert 7cee44ab1d HitObject -> HitBase. Also add BaseHits for each game mode. 2016-09-06 21:41:16 +09:00