Commit Graph

7873 Commits

Author SHA1 Message Date
8216bc311a Restructure HitWindows to allow outside setting 2018-05-11 15:30:26 +09:00
fd9796d08c Remove some unnecessary changes 2018-05-11 14:13:52 +09:00
816ad5c426 Pass down ruleset to the buffered wedge 2018-05-11 14:10:53 +09:00
2bab08c437 Fix post-merge errors 2018-05-11 14:08:17 +09:00
73465c35fa Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
2018-05-11 14:05:40 +09:00
a241ff1c05 Cleanup. 2018-05-10 22:50:03 -03:00
ec53927d8e Add selection to DrawableRoom. 2018-05-10 22:48:07 -03:00
d87ac5a1cb Create the drawable hierarchy for DrawableRoom in load. 2018-05-10 22:12:25 -03:00
b9adeeb063 Add ScreenBreadcrumbControl. 2018-05-10 21:35:26 -03:00
a86843ccc9 Remove unused usings caused by multiplayer folder restructuring. 2018-05-10 20:49:42 -03:00
bc9ac8f72a Move multiplayer screens to osu.Game/Screens/Multi/Screens 2018-05-10 20:47:25 -03:00
2d206d258a Move multiplayer screen components to osu.Game/Screens/Multi/Components 2018-05-10 20:44:24 -03:00
c35760fdef Rename osu.Game/Screens/Multiplayer to Multi. 2018-05-10 20:39:05 -03:00
ecb8de29a2 Adjust BreadcrumbControl to better match the designs. 2018-05-10 20:30:03 -03:00
86430da6d6 Update CircularProgress.FillTo calls 2018-05-10 21:08:02 +03:00
8a6ef0dabb Merge branch 'master' into beatmap-conversion-rework 2018-05-10 19:10:07 +08:00
9e26bcd571 Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap 2018-05-10 19:51:52 +09:00
40c1b24b3d Move IBeatmap to its own file 2018-05-10 19:51:40 +09:00
4b3c2466a4 Merge remote-tracking branch 'upstream/master' into disable-mouse-buttons 2018-05-10 19:16:52 +09:00
df604c40cc Keep shortcut padding even when there is no shortut 2018-05-10 18:49:33 +09:00
c03ab9014f Improve TestCaseOnScreenDisplay
Now doesn't rely on framesync.
2018-05-10 18:48:48 +09:00
fadb1a5e0b Add tests and expand functionality to ensure single fire 2018-05-10 17:31:16 +09:00
5df9f126d1 Implement a hold-to-confirm screen when exiting game using escape key 2018-05-10 17:07:19 +09:00
853680ca51 Merge remote-tracking branch 'origin/master' into disable-mouse-buttons 2018-05-10 14:31:52 +09:00
2e9c91c32f Merge branch 'master' into use-bindable-transforms 2018-05-10 11:45:29 +08:00
fff34be814 Merge branch 'master' into fix-editor-beatmap-change 2018-05-10 11:37:36 +08:00
785cf306ec Merge branch 'master' into exit_replay_button 2018-05-09 16:31:18 +03:00
38d54f2a6c Merge branch 'master' into back_mouse_button_support 2018-05-08 10:35:11 +03:00
44bbb8700e Handle mouse back button using OnMouseDown override instead of using GlobalAction 2018-05-08 00:22:11 +03:00
674e45d49b Fix beatmap/ruleset being changeable while in the editor 2018-05-07 16:32:15 +09:00
fbd7ccc03f Make BeatmapInfoWedge display properly for converts 2018-05-07 15:51:08 +09:00
5489976c20 Implement ruleset-specific beatmap statistics 2018-05-07 15:51:08 +09:00
9f1efeb19d Move keybind to last in enum 2018-05-07 15:41:14 +09:00
30a3f4f29f Fix not being able to convert beatmaps with 0 hitobjects 2018-05-07 15:27:45 +09:00
1be1b10059 Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen 2018-05-07 13:32:19 +08:00
68441f1ef0 Output ruleset instantiation info 2018-05-07 14:28:30 +09:00
6867886f4c Give conversion-tested beatmaps a ruleset 2018-05-07 14:04:37 +09:00
ad2c2a5fe6 Restore star difficulty calculation 2018-05-07 12:25:21 +09:00
794418432f Fix incorrect method name 2018-05-07 11:22:25 +09:00
db3e48c194 Rename GetBeatmap() to GetPlayableBeatmap() 2018-05-07 10:40:30 +09:00
9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
7e83c75888 Add xmldoc 2018-05-07 10:23:32 +09:00
b68ee39136 Reword beatmap conversion error 2018-05-07 10:18:47 +09:00
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
f3aa9269ff Fix mania-specific beatmap conversion 2018-05-07 09:17:12 +09:00
b08b24b6da Introduce OsuScreen.AllowBackButton property 2018-05-04 21:18:48 +03:00
39db1e8cbb Rename HoldToQuit to QuitButton 2018-05-03 23:50:30 +03:00
f8630115d6 Do not expose HoldToQuit.HoldToQuitButton 2018-05-03 23:29:58 +03:00