Commit Graph

3490 Commits

Author SHA1 Message Date
72fb34f82c Fix overriding control points incorrectly 2020-04-21 14:19:05 +09:00
3b0099c687 Refactor tests 2020-04-21 12:26:43 +09:00
5a2129da7c Merge branch 'master' into allow-cancelling-completion 2020-04-21 11:22:37 +09:00
cf41b90193 Merge branch 'master' into dashboard-overlay-new 2020-04-20 18:25:47 +09:00
477d519df3 Merge branch 'master' into beatmap-listing-expanded 2020-04-20 17:18:18 +09:00
dd7c6a83bd Merge branch 'master' into fix-song-select-desync 2020-04-20 15:23:19 +09:00
f26c080512 Merge branch 'master' into dashboard-overlay-new 2020-04-20 15:19:03 +09:00
ddc5489fc9 Merge pull request #8801 from peppy/add-np-command
Add /np (now playing) command support in chat
2020-04-20 14:07:39 +09:00
f56b85ce27 Merge branch 'master' into fix-song-select-desync 2020-04-20 12:54:32 +09:00
2c012b9af1 Use AddUntilStep whenever possible
Avoid redundant usage
2020-04-20 06:43:18 +03:00
e12e3391fb Base wait steps duration on the delay used for results display
With `* 2` for safety of not potentially going to the next step and the delegate not executed yet.
2020-04-20 06:42:33 +03:00
2444dd42d0 Remove not-implemented-exception 2020-04-20 09:57:46 +09:00
f3fee73441 Fix DatabasedKeyBindingContainer not using defaults for non-databased ruleset 2020-04-20 09:35:00 +09:00
e4d4040afb Rename test to match other classes 2020-04-19 16:57:47 +09:00
1dd471dfcc Add /np (now playing) command support in chat 2020-04-19 15:13:25 +09:00
65a8860a65 Add test cases to ensure no regression in "cancelling completion" 2020-04-19 06:01:09 +03:00
90fa58b3b6 More testing 2020-04-17 19:57:39 +03:00
5833a7ac91 Fix presenting new ruleset and beatmap at once causing wedge display desync 2020-04-17 18:56:17 +09:00
4e22e569f5 Merge branch 'master' into timing-equivalence 2020-04-17 17:12:38 +09:00
894598eb22 Replace SocialOverlay with DashboardOverlay 2020-04-16 12:05:51 +03:00
29bea4e11c Implement OverlayView component 2020-04-16 11:42:21 +03:00
ef0da9e3e8 Basic overlay layout implementation 2020-04-16 11:01:36 +03:00
86e8aaa2f4 Merge branch 'master' into beatmap-listing-expanded 2020-04-16 16:15:40 +09:00
5ec8d49241 Merge pull request #8764 from smoogipoo/disable-undo-redo
Disable undo/redo menu items when they can't be performed
2020-04-16 13:47:23 +09:00
9e2be6f2f4 Remove bindable to promote one-way access 2020-04-16 13:25:08 +09:00
4eefe47ce3 Merge branch 'master' into fix-0-customsampleset 2020-04-16 11:20:31 +09:00
06e25091f6 Fix typo 2020-04-16 10:44:08 +09:00
da9bd74e2e Very basic testing 2020-04-15 20:19:17 +03:00
e8c955ed9b Add CanUndo/CanRedo bindables 2020-04-15 16:17:17 +09:00
102c1d9095 Add disabled state to menu items 2020-04-15 16:17:17 +09:00
72707a9973 Fix OS-dependent substring 2020-04-15 13:54:23 +09:00
c0a1aae63a Merge branch 'master' into beatmap-listing-expanded 2020-04-15 13:26:16 +09:00
10486a0ad2 Fix potential dependency-related issues 2020-04-14 23:10:14 +09:00
64d44dedcd Make testscene headless 2020-04-14 22:39:51 +09:00
00d564d29c Add tests 2020-04-14 21:18:28 +09:00
ecd40072c4 Merge pull request #8312 from Game4all/low-hp-red-layer
Fade playfield to red when player health is low
2020-04-14 18:33:51 +09:00
59728ffebd Fix up/improve test scene 2020-04-14 15:24:34 +09:00
3c5fb79823 Mark dummy api test scene as headless 2020-04-14 14:51:09 +09:00
ac8a3efc46 Merge branch 'master' into low-hp-red-layer 2020-04-14 14:47:01 +09:00
33f7e429a8 Merge pull request #8444 from LittleEndu/select-recommended
Make beatmap carousel select recommended difficulties
2020-04-14 14:25:17 +09:00
eb968d2bdb Merge branch 'master' into timing-equivalence 2020-04-14 14:02:02 +09:00
948e225e12 Merge branch 'master' into select-recommended 2020-04-14 13:59:03 +09:00
d965baa4bd Merge branch 'master' into dummy-api-request-support 2020-04-14 13:42:42 +09:00
68c25c38a7 Merge branch 'master' into no-video-option 2020-04-14 11:36:31 +09:00
06407a1081 Merge branch 'master' into fix-classic-scoring 2020-04-14 02:13:45 +02:00
3e48c26bc2 Add failing tests 2020-04-14 01:09:58 +02:00
d9c91fb943 Merge branch 'master' of https://github.com/ppy/osu into no-video-option
 Conflicts:
	osu.Game/Overlays/Direct/PanelDownloadButton.cs
2020-04-13 17:40:28 +03:00
89d8063588 Add support for Perform/PerformAsync 2020-04-13 21:35:35 +09:00
2388799acf Limit upper number of editor beatmap states saved to 50 2020-04-13 20:37:46 +09:00
ef5e88dd82 Merge pull request #8696 from smoogipoo/editor-undo-redo
Add undo/redo support to the Editor
2020-04-13 19:12:47 +09:00