1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 21:27:24 +08:00
Commit Graph

44593 Commits

Author SHA1 Message Date
Dan Balasescu
754c56d7ae
Merge branch 'master' into move-startup-concurrency-check 2021-09-29 17:20:20 +09:00
Dan Balasescu
6019839d66
Merge pull request #14825 from peppy/enable-ipc-test
Re-enable IPC import test
2021-09-29 17:17:22 +09:00
Dan Balasescu
ce3cf72a77
Merge pull request #14888 from peppy/rename-json-key-resolver
Rename JSON key resolver to better expose what it's doing
2021-09-29 16:58:42 +09:00
Dan Balasescu
f96effb2ea
Merge branch 'master' into enable-ipc-test 2021-09-29 16:32:53 +09:00
Dan Balasescu
d60cba97da
Merge pull request #14889 from peppy/update-framework
Update framework
2021-09-29 14:40:11 +09:00
Dean Herbert
dcf87e97c2 Update framework 2021-09-29 14:03:41 +09:00
Dean Herbert
117d47bf7f Rename JSON key resolver to better expose what it's doing 2021-09-29 11:26:37 +09:00
Dan Balasescu
625711e6d2
Merge pull request #14776 from peppy/fix-pause-with-audio-offset
Avoid accounting for the pause pitch adjust effect when "fixing" hardware offset adjustments
2021-09-28 18:44:22 +09:00
Dean Herbert
1567faa7b2
Merge pull request #14865 from bdach/fix-legacy-repeat-arrow-fallback
Fix repeat arrow texture not falling back to default legacy skin
2021-09-28 11:07:18 +09:00
Dean Herbert
4958771fbf
Merge pull request #14864 from bdach/fix-range-selection-crash-after-keyboard-selection
Fix timeline range selection crashing after non-mouse selection
2021-09-28 07:05:00 +09:00
Bartłomiej Dach
5bd09a4a30
Rename inner lambda parameter 2021-09-27 22:21:14 +02:00
Bartłomiej Dach
7a0499ad07
Fix repeat arrow texture not falling back to default legacy skin 2021-09-27 21:45:26 +02:00
Bartłomiej Dach
ca6cbca04a
Fix range selection crashing after non-mouse selection 2021-09-27 20:54:29 +02:00
Bartłomiej Dach
1a1fc00b44
Add failing test case 2021-09-27 20:54:29 +02:00
Dean Herbert
dc24fd7e5b
Merge pull request #14859 from peppy/local-database-strings
Move database connection string operations local
2021-09-27 21:46:52 +09:00
Dean Herbert
bcdbffbca0 Update framework 2021-09-27 20:56:54 +09:00
Dean Herbert
d4310f5d9a Move database connection string operations local
In line with framework changes in
https://github.com/ppy/osu-framework/pull/4793.
2021-09-27 17:32:41 +09:00
Dan Balasescu
7f45bd27f2
Merge pull request #14851 from bdach/blueprint-container-sorting
Rewrite blueprint sorting logic to be more robust
2021-09-27 15:13:16 +09:00
Dean Herbert
df85092426 Resolve inner items early in process and rename variable 2021-09-27 14:24:17 +09:00
Dean Herbert
41fb3371e5
Merge branch 'master' into blueprint-container-sorting 2021-09-27 14:12:09 +09:00
Dean Herbert
91c5328fc6
Merge pull request #14853 from bdach/timeline-shift-click-selection
Add support for range selection to editor timeline
2021-09-27 14:11:44 +09:00
Dean Herbert
5466fb08fd
Merge branch 'master' into timeline-shift-click-selection 2021-09-27 13:40:39 +09:00
Dan Balasescu
6d7403df5b
Merge pull request #14852 from bdach/timeline-selection-test-coverage
Add test coverage for timeline selection logic
2021-09-27 13:19:08 +09:00
Bartłomiej Dach
d3203f83dd
Add implementation of range selection 2021-09-26 20:12:26 +02:00
Bartłomiej Dach
81d160c85a
Add test covering expected UX of range selection 2021-09-26 19:27:47 +02:00
Bartłomiej Dach
0de7db5840
Add test coverage for timeline selection logic 2021-09-26 19:20:55 +02:00
Bartłomiej Dach
a401e184d0
Merge pull request #14812 from peppy/diffcalc-optimisations
Reduce allocations during beatmap conversion process
2021-09-26 19:13:31 +02:00
Bartłomiej Dach
7caa0a81ec
Rename TestScene{Editor -> Composer}Selection
In line with an upcoming split in functionality between the composer
blueprint container and the timeline blueprint container.
2021-09-26 17:22:58 +02:00
Bartłomiej Dach
6dc3e66c93
Include combo information when determining ordering if available 2021-09-26 15:52:25 +02:00
Bartłomiej Dach
a86b9893ac
Always re-sort blueprints before adding/removing one 2021-09-26 15:48:56 +02:00
Bartłomiej Dach
ce70d1082d
Add failing test for "ghost timeline blueprint" 2021-09-26 15:29:00 +02:00
Bartłomiej Dach
0057400bb7
Rename test scene to reflect its new purpose 2021-09-26 15:09:30 +02:00
Bartłomiej Dach
4aadff3fd7
Add failing test for incorrect composer selection 2021-09-26 15:08:43 +02:00
Bartłomiej Dach
a66d48dbad
Merge branch 'master' into diffcalc-optimisations 2021-09-26 14:46:50 +02:00
Bartłomiej Dach
671fe77213
Merge pull request #14848 from Joehuu/fix-dropdown-text-overflow
Fix text overflowing on dropdown headers
2021-09-25 15:37:12 +02:00
Joseph Madamba
9b9c30c8a1 Fix text overflowing on dropdown headers 2021-09-24 22:04:45 -07:00
Dan Balasescu
7f350fe5c5
Merge pull request #14841 from peppy/update-framework
Update framework
2021-09-25 03:30:20 +09:00
Dean Herbert
ad6c4e3878 Update framework 2021-09-24 12:46:46 +09:00
Bartłomiej Dach
af9cc9560f
Merge pull request #14836 from peppy/fix-dialog-overlay-disposal
Fix `DialogOverlay` potentially not expiring dialogs as soon as it should
2021-09-23 23:03:59 +02:00
Dean Herbert
6b698047ab Fix DialogOverlay potentially not expiring dialogs as soon as it should 2021-09-23 19:19:03 +09:00
Dean Herbert
dcadf3b81d Add failing test coverage of some dialogs being held on to 2021-09-23 19:18:51 +09:00
Dan Balasescu
512af8809e
Merge pull request #14617 from apollo-dw/speedpp
Remove speed caps in osu! difficulty calculation
2021-09-22 12:10:16 +09:00
Dean Herbert
29d69b2b83 Remove extra $ 2021-09-22 01:29:56 +09:00
Dean Herbert
d22fcc14fc Also grab correct repository path 2021-09-22 01:28:17 +09:00
Dean Herbert
77660d9048 Update diffcalc action to checkout the correct upstream branch 2021-09-22 01:13:47 +09:00
Dean Herbert
60c9e9f704
Merge pull request #14805 from bdach/rectangular-snap-grid
Add rectangular snap grid to osu! editor composer
2021-09-22 00:12:03 +09:00
Dean Herbert
4cdce69f7e Update test to match test beamap data 2021-09-21 23:45:03 +09:00
Dean Herbert
59d6a718d6 Fix value not being loaded from beatmap in case of most dense grid setting 2021-09-21 20:09:34 +09:00
Dean Herbert
5c7fe5dde0 Retarget master repos in diffcalc CI runs 2021-09-21 18:47:09 +09:00
smoogipoo
e3b6c15a73 Merge branch 'master' into speedpp 2021-09-21 18:41:27 +09:00