Commit Graph

20 Commits

Author SHA1 Message Date
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
ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
68476eafb9 Use DrawSize instead of Size whereever Size was previously read due to framework changes.
Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)
2016-10-18 18:53:31 +02:00
4052a665bf Remove all non-load Game access. 2016-10-12 15:47:08 +09:00
ac16bffe49 Bring framework and resources up-to-date. 2016-10-01 19:05:26 +09:00
25fecfca06 Relative size and position for text layer. 2016-09-26 16:56:39 +08:00
bb13da2b32 Add ResetCount method for Counter. 2016-09-26 14:23:22 +08:00
b4bb3d6317 Update private methods implementation. 2016-09-26 14:21:40 +08:00
756e7a6a67 Add missing lincense header, remove unnecessary comment and field. 2016-09-26 14:21:25 +08:00
63535df6dc Fix typo and missnaming. 2016-09-24 19:46:10 +08:00
ec2bc4720d Comma seperator in numbers. 2016-09-24 19:46:10 +08:00
ed4fae53cb Add FadeTime and allow setting custom styles directly from container. 2016-09-24 19:46:10 +08:00
f4ac1f630d Adjust visual tree of counter. 2016-09-24 19:46:10 +08:00
0da0d4f35e Avoid accessing container in each counter. 2016-09-24 19:46:10 +08:00
c70bf53486 Rename counter classes to avoid confusing. 2016-09-24 19:46:10 +08:00
16f1dff849 Make counter public. 2016-09-24 19:46:10 +08:00
ba19fe1b97 Move IsCounting to KeyCounter. 2016-09-24 19:46:10 +08:00
81f269ee69 MouseCount and KeyBoardCount, input handling. 2016-09-24 19:46:10 +08:00
55a1a3827a Implement KeyCounter and base Count class. 2016-09-24 19:46:10 +08:00