Dean Herbert
|
7bbfad4695
|
Merge branch 'master' into editor-screen-selection
|
2017-10-01 20:05:49 +08:00 |
|
Dean Herbert
|
fffeac638f
|
Merge branch 'master' into direct-previews
|
2017-10-01 19:37:22 +08:00 |
|
Dan Balasescu
|
75156ada73
|
Merge pull request #1331 from Francesco149/master
Only convert chords into strong hits for mania -> taiko
|
2017-10-01 19:08:45 +09:00 |
|
Franc[e]sco
|
5e751ea0ec
|
Only convert chords into strong hits for mania -> taiko
|
2017-10-01 00:15:23 +02:00 |
|
Huo Yaoyuan
|
3de42ee405
|
Smooth spm values into a time range.
|
2017-09-30 15:23:10 +08:00 |
|
EVAST9919
|
92c3d722b4
|
Show mapper's profile when clicking on avatar in BeatmapSetOverlay
|
2017-09-30 05:41:32 +03:00 |
|
Jorolf
|
59247bcf1e
|
another unused using
|
2017-09-29 23:31:42 +02:00 |
|
Jorolf
|
2457df8e18
|
remove unused usings and reset the track to the start when playing again
|
2017-09-29 23:26:16 +02:00 |
|
Jorolf
|
26e7a3f157
|
add license header
|
2017-09-29 23:12:12 +02:00 |
|
Jorolf
|
259d49e6b9
|
Merge branch 'master' of git://github.com/ppy/osu into direct-previews
|
2017-09-29 23:09:33 +02:00 |
|
Jorolf
|
647304c14b
|
move logic to DirectPanel and reuse stuff for the PreviewButton
|
2017-09-29 23:08:30 +02:00 |
|
Huo Yaoyuan
|
e2e26c91af
|
Show SPM value basically.
|
2017-09-29 22:30:41 +08:00 |
|
Huo Yaoyuan
|
40a27c810a
|
Calculate SPM in spinner disc.
|
2017-09-29 19:24:14 +08:00 |
|
smoogipoo
|
21c6a63fa1
|
Use using for Description
|
2017-09-29 20:03:09 +09:00 |
|
smoogipoo
|
7b4348254c
|
Don't use new
|
2017-09-29 20:02:55 +09:00 |
|
Dean Herbert
|
eed358a2c1
|
Merge branch 'master' into editor-screen-selection
|
2017-09-29 18:24:46 +08:00 |
|
smoogipoo
|
775e8bada5
|
Make the background bottom corners look nice with the new hover functionality
|
2017-09-29 15:13:38 +09:00 |
|
smoogipoo
|
b2eab1f435
|
Set the hover background colour as dictated by flyte
|
2017-09-29 15:09:56 +09:00 |
|
smoogipoo
|
6bb5210c7c
|
Remove the parentSizedBox
|
2017-09-29 15:09:28 +09:00 |
|
Dan Balasescu
|
04f3802cc0
|
Merge pull request #1327 from EVAST9919/context_menu_test_fix
Fix TestCaseContextMenu not being updated inline with previous changes
|
2017-09-28 23:14:53 +09:00 |
|
Dan Balasescu
|
61bf19bbab
|
Merge branch 'master' into context_menu_test_fix
|
2017-09-28 22:58:15 +09:00 |
|
Dan Balasescu
|
4258e7cdb5
|
Merge pull request #1326 from EVAST9919/wave_cleanup
Clean up Wave in WaveOverlayContainer
|
2017-09-28 22:56:09 +09:00 |
|
EVAST9919
|
e7632b6e6f
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
|
2017-09-28 14:44:31 +03:00 |
|
EVAST9919
|
ca1f96208a
|
Fix TestCaseContextMenu not being updated inline with previous changes
|
2017-09-28 14:31:02 +03:00 |
|
EVAST9919
|
75cd6eeb1c
|
Clean up Wave in WaveOverlayContainer
|
2017-09-28 14:20:19 +03:00 |
|
Dan Balasescu
|
de840a5c9e
|
Merge pull request #1325 from peppy/no-more-dynamic
Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll
|
2017-09-28 01:21:24 +09:00 |
|
Dean Herbert
|
4eaf6b4b94
|
Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll
|
2017-09-28 00:14:04 +08:00 |
|
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 |
|