Commit Graph

680 Commits

Author SHA1 Message Date
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
9b1e010dcc Fix filename mismatch. 2017-04-06 16:05:41 +08:00
7c63c8394b Remove unnecessary depth setting. 2017-04-06 15:36:03 +09:00
a18367454d InGameOverlay -> MenuOverlay. 2017-04-06 15:34:52 +09:00
856696b17e Fix incorrect verbatim strings. 2017-04-06 15:31:21 +09:00
6285f3eea8 Merge branch 'master' into pause_buttons_refactor 2017-04-06 15:00:48 +09:00
0946e42363 removed useless stuff 2017-04-05 22:51:43 +03:00
6a510097df InGameOverlay fixes 2017-04-05 22:36:03 +03:00
4aafc172ca Allow playfield to specify whether it has a cursor or not. 2017-04-05 17:38:57 +09:00
4b1588a21d Fix correct mode filter not being applied when first entering song select. 2017-04-05 17:33:19 +09:00
8173d01d78 Fix crash on changing play mode too early. 2017-04-05 17:26:45 +09:00
f2a9ec0f24 Converted constructor to protected 2017-04-04 19:02:36 +03:00
7b95f2d46a InGameOverlay now is abstract 2017-04-04 18:53:13 +03:00
62655b70c9 Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor 2017-04-04 18:41:37 +03:00
7c74951454 Update bindables.
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
f6303d55ec Upodate some tab usages. 2017-04-04 11:13:09 +09:00
d0ebbad0fa Fix avatar display. 2017-04-04 10:33:41 +09:00
27132958c8 Merge remote-tracking branch 'origin/master' into taiko-drawable-generation
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-04-03 14:19:31 +09:00
263374a357 Remove unnecessary using. 2017-04-02 17:11:31 +09:00
bfa2e68bfb Container->Wrapper. 2017-04-02 16:17:13 +09:00
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
1ecff1b32c Fix naming and testcase 2017-04-01 21:50:25 +03:00
f70de7439b Moved title and description to each class 2017-04-01 21:42:12 +03:00
bd123fa906 Better inheritance 2017-04-01 21:29:17 +03:00
e3a8a14281 Removed unnecessary using 2017-04-01 21:19:49 +03:00
ebc814f06a Typos fix 2017-04-01 21:17:24 +03:00
3574dac780 Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor 2017-04-01 21:03:19 +03:00
24d06fa92d CheckBox -> Checkbox. 2017-03-31 17:38:33 +09:00
fa7c72a099 Refactor ReplayInputHandler creation for more flexibility. 2017-03-31 15:59:53 +09:00
76d0beb64f Fix custom transform. 2017-03-30 22:28:51 +09:00
6afa6f30cc Keep selected beatmap in centre of screen post-filter. 2017-03-29 20:01:46 +09:00
fa7fd6efe3 Fix mode selector not invoking a re-filter. 2017-03-29 19:48:13 +09:00
b96a153e0e Resize ranks better. 2017-03-29 12:24:04 +09:00
eed50784ba Make player work with TaikoHitRenderer. 2017-03-29 11:35:57 +09:00
d7674e2367 Merge branch 'master' into dynamic-recompile 2017-03-29 10:12:48 +09:00
ab97967237 Update references and framework. 2017-03-29 09:54:00 +09:00
bca18ce209 Merge branch 'master' into move-easingtypes 2017-03-29 08:14:13 +09:00
e53a5a3521 Merge branch 'master' into avatars-and-login 2017-03-29 07:52:43 +09:00
f7dc7e9bb9 Update references. 2017-03-28 21:26:20 +09:00
91e18cc63e Fix usings 2017-03-28 12:12:35 +03:00
cf3db49631 Inherit Pause/Fail overlay from InGameOverlay 2017-03-28 12:09:26 +03:00
687f71e410 Fixes 2017-03-28 11:45:48 +03:00
60be69d3b0 Fixes 2017-03-28 11:41:08 +03:00
85c2184170 Fixes 2017-03-28 11:33:56 +03:00
62693a6a59 Again separate classes 2017-03-28 10:49:58 +03:00
4042b94e01 Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
f690e1d0c4 Move async logic to framework. 2017-03-28 14:24:34 +09:00
9774f826ab Pause and fail overlays -> StopOverlay 2017-03-28 06:08:31 +03:00
c4500fa270 fixes 2017-03-28 05:19:32 +03:00
110d43bc25 fixes 2017-03-28 05:12:04 +03:00