|
|
545c375199
|
Update design of EditorMenuBar to match flyte's design more closely
|
2017-09-27 22:01:03 +09:00 |
|
|
|
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 |
|
|
|
990ef3ca56
|
Make import tests more resilient to race condition failures
Also centralises wait-or-assert logic.
|
2017-09-27 14:51:01 +08:00 |
|
|
|
415b0b299c
|
Merge pull request #1314 from peppy/fix-invisible-marker
Editor timeline fixes
|
2017-09-27 15:09:33 +09:00 |
|
|
|
5dceee2e36
|
Merge branch 'master' into fix-invisible-marker
|
2017-09-27 14:53:58 +09:00 |
|
|
|
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 |
|
|
|
9c14d3b696
|
Merge branch 'master' into api-state-fixes
|
2017-09-27 14:41:25 +09:00 |
|
|
|
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 |
|
|
|
e81d9cb5fc
|
Merge branch 'master' into fix-login-overlay
|
2017-09-27 13:17:46 +08:00 |
|
|
|
43d56bc9d7
|
Merge branch 'master' into fix-invisible-marker
|
2017-09-27 14:17:42 +09:00 |
|
|
|
a17cc04cde
|
Make APIAccess's state only privately settable
|
2017-09-27 13:16:17 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
67481a1e6a
|
Merge branch 'master' into api-state-fixes
|
2017-09-27 14:02:19 +09:00 |
|
|
|
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 |
|
|
|
4881d01b7e
|
Merge branch 'master' into close-beatmap-overlay
|
2017-09-27 13:51:13 +09:00 |
|
|
|
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 |
|
|
|
e64860ad45
|
Fix test case not working as expected
|
2017-09-27 12:46:34 +08:00 |
|
|
|
faad3fc7d3
|
Arbitrarily move colour assignment
|
2017-09-27 12:40:32 +08:00 |
|
|
|
b0c5f90645
|
Merge branch 'master' into fix-concurrent-tests
|
2017-09-27 13:39:08 +09:00 |
|
|
|
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 |
|
|
|
ec50834e98
|
Load osu!direct overlay to "newest maps" tab by default
|
2017-09-27 12:23:48 +08:00 |
|
|
|
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 |
|
|
|
bbc990a6fd
|
Assign a name to individual import tests to avoid file contention
|
2017-09-27 11:26:56 +08:00 |
|
|
|
3018d32b13
|
Close BeatmapSetOverlay when clicking outside of it
|
2017-09-27 11:22:47 +08:00 |
|
|
|
d5ed218488
|
Fix timeline sizes being updated potentially before the track has a length
|
2017-09-27 11:07:43 +08:00 |
|
|
|
7ad21d9a6d
|
Simplify marker part construction
|
2017-09-27 11:07:23 +08:00 |
|
|
|
eae29820c0
|
Fix marker being cleared each beatmap change
|
2017-09-27 11:07:17 +08:00 |
|
|
|
4e8944de04
|
fix maps ending early
|
2017-09-26 22:54:33 -04:00 |
|
|
|
708632bca8
|
Remove second unnecessary colour set
|
2017-09-27 10:06:36 +08:00 |
|
|
|
c696f74578
|
Fix broken testcase and apply suggested changes
|
2017-09-27 01:10:48 +03:00 |
|
|
|
3cd6319ffa
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
|
2017-09-27 00:32:38 +03:00 |
|
|
|
801fa39145
|
remove old SliderBouncer
|
2017-09-26 12:23:13 -04:00 |
|
|
|
b5ad6ae735
|
appveyor fixes
|
2017-09-26 12:21:39 -04:00 |
|
|
|
adebe166d4
|
slider bouncers
|
2017-09-26 12:13:34 -04:00 |
|
|
|
243ed43777
|
Merge remote-tracking branch 'refs/remotes/ppy/master'
|
2017-09-26 12:04:52 -04:00 |
|
|
|
3fd4a97a19
|
Merge pull request #1278 from Damnae/storyboard_integration
Storyboard integration
|
2017-09-26 20:47:07 +08:00 |
|
|
|
7c70d3d2cb
|
Merge branch 'master' into storyboard_integration
|
2017-09-26 20:19:26 +08:00 |
|
|
|
9892572db4
|
Merge pull request #1312 from Xinnoh/patch-1
changed description for hidden
|
2017-09-26 20:12:46 +08:00 |
|
|
|
00067d0d18
|
Merge branch 'master' into patch-1
|
2017-09-26 19:28:03 +08:00 |
|
|
|
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 |
|
|
|
10dbd68c1e
|
Simplify null check
|
2017-09-26 20:11:45 +09:00 |
|
|
|
355a7b6649
|
Merge branch 'master' of git://github.com/ppy/osu into direct-previews
|
2017-09-26 12:22:11 +02:00 |
|
|
|
1f2a82b7ab
|
make PreviewPlaying readonly instead of abstract
|
2017-09-26 12:21:00 +02:00 |
|
|
|
c578509a20
|
Bind to the screen Beatmap instead of the game-wide Beatmap
|
2017-09-26 17:58:40 +09:00 |
|
|
|
3b9c2d1d5f
|
changed description for hidden
ctb doesn't have approach circles
|
2017-09-26 16:50:12 +08:00 |
|
|
|
3937ebdc3d
|
Add missing license headers
|
2017-09-26 15:58:30 +09:00 |
|
|
|
b8b54e95a5
|
Merge branch 'master' into editor-timing-timeline
|
2017-09-26 15:54:01 +09:00 |
|
|
|
10e5fe40b2
|
A bit of cleanup
|
2017-09-26 15:51:45 +09:00 |
|
|
|
5953c1084e
|
Re-namespace SummaryTimeline
|
2017-09-26 15:45:27 +09:00 |
|
