1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 07:42:52 +08:00
Commit Graph

7675 Commits

Author SHA1 Message Date
smoogipoo
8688d63a9e Update framework 2017-09-28 00:48:21 +09:00
smoogipoo
95364d0173 No more box background 2017-09-27 22:15:11 +09:00
smoogipoo
ba8bf6cbd5 Add ScreenSelectionTabControl to EditorMenuBar 2017-09-27 22:01:53 +09:00
smoogipoo
545c375199 Update design of EditorMenuBar to match flyte's design more closely 2017-09-27 22:01:03 +09:00
Dan Balasescu
ec156fe9ca Merge pull request #1321 from peppy/import-test-resiliency
Make import tests more resilient to race condition failures
2017-09-27 16:07:41 +09:00
Dean Herbert
990ef3ca56 Make import tests more resilient to race condition failures
Also centralises wait-or-assert logic.
2017-09-27 14:51:01 +08:00
Dan Balasescu
415b0b299c Merge pull request #1314 from peppy/fix-invisible-marker
Editor timeline fixes
2017-09-27 15:09:33 +09:00
Dan Balasescu
5dceee2e36 Merge branch 'master' into fix-invisible-marker 2017-09-27 14:53:58 +09:00
Dan Balasescu
5a3abadfe1 Merge pull request #1320 from peppy/api-state-fixes
Make APIAccess's state only privately settable
2017-09-27 14:53:16 +09:00
Dan Balasescu
9c14d3b696 Merge branch 'master' into api-state-fixes 2017-09-27 14:41:25 +09:00
Dan Balasescu
6e83449731 Merge pull request #1319 from peppy/fix-login-overlay
Fix yellow line in login overlay not following size correctly
2017-09-27 14:41:13 +09:00
Dean Herbert
e81d9cb5fc Merge branch 'master' into fix-login-overlay 2017-09-27 13:17:46 +08:00
Dan Balasescu
43d56bc9d7 Merge branch 'master' into fix-invisible-marker 2017-09-27 14:17:42 +09:00
Dean Herbert
a17cc04cde Make APIAccess's state only privately settable 2017-09-27 13:16:17 +08:00
Dan Balasescu
23d688bb35 Merge pull request #1317 from peppy/api-state-fixes
Move all APIAccess State changes to the local thread
2017-09-27 14:11:50 +09:00
Dean Herbert
4a95d64239 Fix yellow line in login overlay not following size correctly
Also allows right click context menu to correctly extrude beyond the local masking.
2017-09-27 13:06:57 +08:00
Dan Balasescu
67481a1e6a Merge branch 'master' into api-state-fixes 2017-09-27 14:02:19 +09:00
Dan Balasescu
9be595a234 Merge pull request #1315 from peppy/close-beatmap-overlay
Close BeatmapSetOverlay when clicking outside of it
2017-09-27 14:02:08 +09:00
Dan Balasescu
4881d01b7e Merge branch 'master' into close-beatmap-overlay 2017-09-27 13:51:13 +09:00
Dan Balasescu
529b98ba35 Merge pull request #1316 from peppy/fix-concurrent-tests
Assign a name to individual import tests to avoid file contention
2017-09-27 13:51:07 +09:00
Dean Herbert
e64860ad45 Fix test case not working as expected 2017-09-27 12:46:34 +08:00
Dean Herbert
faad3fc7d3 Arbitrarily move colour assignment 2017-09-27 12:40:32 +08:00
Dan Balasescu
b0c5f90645 Merge branch 'master' into fix-concurrent-tests 2017-09-27 13:39:08 +09:00
Dan Balasescu
f0cfd5271c Merge pull request #1318 from peppy/osu-direct-default-mode
Load osu!direct overlay to "newest maps" tab by default
2017-09-27 13:38:10 +09:00
Dean Herbert
ec50834e98 Load osu!direct overlay to "newest maps" tab by default 2017-09-27 12:23:48 +08:00
Dean Herbert
05c6829deb Move all APIAccess State changes to the local thread
Previously changes to the state were triggering events like Logout, which could get things into a bad state.
2017-09-27 12:18:24 +08:00
Dean Herbert
bbc990a6fd Assign a name to individual import tests to avoid file contention 2017-09-27 11:26:56 +08:00
Dean Herbert
3018d32b13 Close BeatmapSetOverlay when clicking outside of it 2017-09-27 11:22:47 +08:00
Dean Herbert
d5ed218488 Fix timeline sizes being updated potentially before the track has a length 2017-09-27 11:07:43 +08:00
Dean Herbert
7ad21d9a6d Simplify marker part construction 2017-09-27 11:07:23 +08:00
Dean Herbert
eae29820c0 Fix marker being cleared each beatmap change 2017-09-27 11:07:17 +08:00
Dean Herbert
708632bca8 Remove second unnecessary colour set 2017-09-27 10:06:36 +08:00
EVAST9919
c696f74578 Fix broken testcase and apply suggested changes 2017-09-27 01:10:48 +03:00
EVAST9919
3cd6319ffa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-27 00:32:38 +03:00
Dean Herbert
3fd4a97a19 Merge pull request #1278 from Damnae/storyboard_integration
Storyboard integration
2017-09-26 20:47:07 +08:00
Dean Herbert
7c70d3d2cb Merge branch 'master' into storyboard_integration 2017-09-26 20:19:26 +08:00
Dean Herbert
9892572db4 Merge pull request #1312 from Xinnoh/patch-1
changed description for hidden
2017-09-26 20:12:46 +08:00
Dean Herbert
00067d0d18 Merge branch 'master' into patch-1 2017-09-26 19:28:03 +08:00
Dean Herbert
76cba2b311 Merge pull request #1299 from smoogipoo/editor-timing-timeline
Initial implementation of the editor summary timeline
2017-09-26 19:27:34 +08:00
smoogipoo
10dbd68c1e Simplify null check 2017-09-26 20:11:45 +09:00
smoogipoo
c578509a20 Bind to the screen Beatmap instead of the game-wide Beatmap 2017-09-26 17:58:40 +09:00
Sinnoh
3b9c2d1d5f changed description for hidden
ctb doesn't have approach circles
2017-09-26 16:50:12 +08:00
smoogipoo
3937ebdc3d Add missing license headers 2017-09-26 15:58:30 +09:00
Dan Balasescu
b8b54e95a5 Merge branch 'master' into editor-timing-timeline 2017-09-26 15:54:01 +09:00
smoogipoo
10e5fe40b2 A bit of cleanup 2017-09-26 15:51:45 +09:00
smoogipoo
5953c1084e Re-namespace SummaryTimeline 2017-09-26 15:45:27 +09:00
smoogipoo
85cb541fef Implement MarkerPart for the marker 2017-09-26 15:45:08 +09:00
smoogipoo
a1f88a17b1 Re-namespace and split out timeline parts from the SummaryTimeline 2017-09-26 15:44:40 +09:00
Dean Herbert
797e77e651 Merge pull request #1253 from DrabWeb/online-beatmap-set-overlay
Online beatmap set overlay
2017-09-26 09:17:49 +08:00
Dean Herbert
40f597f762 Add download button to grid view panels 2017-09-26 00:18:35 +08:00