1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 18:32:54 +08:00
Commit Graph

4706 Commits

Author SHA1 Message Date
smoogipoo
2aa3d0bb39 Implement base class for beat snapping grids 2019-10-11 18:24:33 +09:00
Dan Balasescu
d4282473c6
Merge branch 'master' into fix-background-disposal 2019-10-11 17:15:30 +09:00
Dan Balasescu
356c0fdca0
Merge branch 'master' into cleanup-intros 2019-10-10 21:58:54 +09:00
Dan Balasescu
5497d210b6
Merge branch 'master' into fix-editor-slider-display 2019-10-10 16:22:30 +09:00
Dean Herbert
51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +09:00
Dean Herbert
0681bb9a2b Fix potential nullref 2019-10-09 16:49:10 +09:00
Dean Herbert
2d8e5615e4 Extract timeline and layout logic from ComposeScreen 2019-10-09 16:05:55 +09:00
Dean Herbert
3dd2b18ff0 Make EditorScreen abstract 2019-10-09 16:04:58 +09:00
Dan Balasescu
69b9e359bf
Merge branch 'master' into fix-ss-track-playback 2019-10-09 12:26:07 +09:00
Dean Herbert
4e026b163c Don't resume playback when user has paused and track hasn't changed 2019-10-08 15:04:38 +09:00
Dean Herbert
3e904b4838 Fix naming of file 2019-10-08 14:37:56 +09:00
Dean Herbert
63bf8ff832 Better signify under construction screens in editor 2019-10-08 14:32:48 +09:00
Dan Balasescu
73e3dac64b
Merge branch 'master' into fix-editor-skinning 2019-10-08 13:28:10 +09:00
Dean Herbert
24269c0384 Fix skins not being displayed correctly in the editor 2019-10-08 12:52:34 +09:00
Dean Herbert
5472029ffe Fix editor defaulting to 0.5x playback speed 2019-10-08 12:27:51 +09:00
Dean Herbert
52770f803d Fix incorrect beatmap usage 2019-10-08 12:15:32 +09:00
Dean Herbert
cbb120cd38 Switch beatmap to private 2019-10-08 12:09:42 +09:00
Dean Herbert
c280bee894 Protect configuration bindables 2019-10-08 12:08:47 +09:00
Dean Herbert
b8b2ff2674 Move welcome to local usages 2019-10-08 12:07:59 +09:00
Dean Herbert
4ba2dccde3 Reorder file contents 2019-10-08 12:05:52 +09:00
Dean Herbert
a0bb193342 Remove unnecessary beatmap storage 2019-10-08 12:04:13 +09:00
Dean Herbert
449e53ee6d Centralise track handling 2019-10-08 12:03:42 +09:00
Dean Herbert
c3d56088d8 Make constant private 2019-10-08 11:54:39 +09:00
Dean Herbert
3c0b1be7f4 Add xmldoc where applicable 2019-10-08 11:52:16 +09:00
Dean Herbert
393683f8f1
Merge branch 'master' into cleanup-intros 2019-10-08 11:29:13 +09:00
Dean Herbert
e7fc5e556c Fix song select not correctly playing tracks in some cases 2019-10-08 11:06:07 +09:00
Dean Herbert
bb161222ef
Merge branch 'master' into fix-tab-controls-overflowing 2019-10-08 10:12:03 +09:00
Joehu
9fdbe58326 Fix dropdown header padding when selected mod filter is hidden 2019-10-07 16:17:58 -07:00
Joehu
8e6e90eaec Use fixed numbers for padding instead 2019-10-07 16:11:40 -07:00
Dean Herbert
f15953d65c Fix carousel including filtered difficulties in sort comparisons 2019-10-07 15:17:03 +09:00
Joehu
11d937beab Fix beatmap detail area tab dropdown being blocked by content 2019-10-06 10:24:33 -07:00
Joehu
38c1cee5fd Fix tab controls overflowing 2019-10-06 10:22:55 -07:00
Dean Herbert
2e20380d07
Merge branch 'master' into placement-blueprint-movement 2019-10-06 13:52:22 +08:00
Joehu
e257f4ca04 Resume music to same position when exiting gameplay 2019-10-05 10:31:44 -07:00
Joehu
a71db11ea5 Remove depth parameter description 2019-10-04 18:38:44 -07:00
Joehu
5d460eaf6b Remove depth specification and button order regression 2019-10-04 17:14:19 -07:00
Joehu
e7ba6ef5c4 Fix keybinding order of beatmap options 2019-10-04 14:32:43 -07:00
Dean Herbert
6fce646369
Merge branch 'master' into placement-blueprint-movement 2019-10-04 19:05:56 +08:00
Dean Herbert
9eab56e2fc
Merge branch 'master' into editor-beatmap-changed-event 2019-10-04 17:58:58 +08:00
Dean Herbert
49fdb4b731
Fix Alt-F4 being blocked during gameplay (#6369)
Fix Alt-F4 being blocked during gameplay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-04 13:33:00 +08:00
Dean Herbert
47c1f36f9d Add ValidForResume check 2019-10-04 11:41:53 +08:00
Dean Herbert
71985c7ef1 Update fail logic to match 2019-10-04 11:23:42 +08:00
Dean Herbert
d2c9a29c0d Remove unnecessary local assign 2019-10-04 10:45:18 +08:00
smoogipoo
a5e1cb8feb Merge remote-tracking branch 'Game4all/master' into truncate-metadata-on-wedge 2019-10-04 11:21:33 +09:00
Joseph Madamba
d87f6d270b
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays 2019-10-03 08:43:31 -07:00
smoogipoo
636913a4a6 Refactor PlayerLoader changes 2019-10-03 19:22:41 +09:00
smoogipoo
652acac87f Move placement movement event to BlueprintContainer 2019-10-03 16:14:42 +09:00
smoogipoo
3fb0b0b668 Rename to StartTimeChanged and add xmldocs 2019-10-03 14:37:16 +09:00
smoogipoo
897b3233af Add start time tracking to EditorBeatmap 2019-10-03 14:23:48 +09:00
Joehu
8017788521 Revert "Fix alt-f4 being blocked in interface"
This reverts commit 752dd26a4f.
2019-10-02 16:08:24 -07:00