1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 05:02:56 +08:00
Commit Graph

6554 Commits

Author SHA1 Message Date
Dean Herbert
0f8551e9ea Merge branch 'editor-ternary-states' into new-combo-toggle 2020-09-25 15:36:33 +09:00
Dean Herbert
a859fe78ee Expose update ternary state method and use better state determination function 2020-09-25 15:32:36 +09:00
Dean Herbert
50290f3cb4 Rework ternary states to fix context menus not updating after already displayed 2020-09-25 15:10:13 +09:00
Dean Herbert
a6adf8334e Use existing method to update combo state of selection 2020-09-25 14:19:35 +09:00
Dean Herbert
e009264f10 Add new combo toggle to main composer interface 2020-09-25 14:10:30 +09:00
Dan Balasescu
952e84396a
Merge branch 'master' into editor-object-object-snapping 2020-09-25 13:17:30 +09:00
Dean Herbert
44a6637c36 Use SingleOrDefault 2020-09-25 12:20:37 +09:00
Dean Herbert
b9196718b7 Merge branch 'master' into editor-object-object-snapping 2020-09-25 12:15:10 +09:00
Dean Herbert
158d307126 Avoid destroying editor screens when changing between modes 2020-09-24 17:03:54 +09:00
Dan Balasescu
ad30c20b8c
Merge pull request #10227 from peppy/editor-negative-current-time
Fix editor not showing sign when time goes negative
2020-09-24 16:27:05 +09:00
Dean Herbert
44be0ab762 Add basic osu! object to object snapping 2020-09-24 16:24:35 +09:00
Dan Balasescu
f84b5087bd
Merge pull request #10226 from peppy/results-fix-relayout-misalignment
Fix score panel being incorrectly vertically aligned on screen resize
2020-09-24 15:50:31 +09:00
Dan Balasescu
02d8355321
Merge pull request #10224 from peppy/results-statistics-replay-button
Add more descriptive description and download button when statistics not available
2020-09-24 14:31:38 +09:00
Dean Herbert
9c074e0ffb Fix editor not showing sign when time goes negative 2020-09-24 13:10:54 +09:00
Dean Herbert
5612357574 Fix score panel being incorrectly vertically aligned on screen resize 2020-09-24 12:49:32 +09:00
Dean Herbert
fda6e88dd3 Fix braces style 2020-09-24 12:39:08 +09:00
Dean Herbert
cb903ec9e2 Fix extended statistics not being vertically centered 2020-09-24 12:21:46 +09:00
Dean Herbert
f4d2c2684d Add more descriptive description and download button when statistics not available 2020-09-24 12:21:08 +09:00
Dan Balasescu
37af9e767f
Merge branch 'master' into fix-taiko-change-handling 2020-09-23 19:47:29 +09:00
Dan Balasescu
d1e41e41f7
Merge pull request #10214 from peppy/new-combo-editor-toggle
Add the ability to toggle new combo state from composer context menu
2020-09-23 19:46:55 +09:00
Dean Herbert
ccb3ef5020 Merge branch 'new-combo-editor-toggle' into fix-taiko-change-handling 2020-09-23 17:08:27 +09:00
Dean Herbert
02201d0ec6 Fix incorrect cast logic 2020-09-23 17:08:25 +09:00
Dean Herbert
487fc2a2c6 Add missing change handler scopings to taiko context menu operations 2020-09-23 16:58:22 +09:00
Dean Herbert
2d67faeb72 Add xmldoc 2020-09-23 16:40:56 +09:00
Dean Herbert
a1ec167982 Add the ability to toggle new combo state from composer context menu 2020-09-23 16:38:16 +09:00
Joehu
c5b684bd2e Fix typo in log when beatmap fails to load 2020-09-23 00:30:20 -07:00
Dean Herbert
c38cd50723 Fix editor not using beatmap combo colours initially on load 2020-09-23 13:16:50 +09:00
Dean Herbert
80fb8f074c Merge branch 'master' into add-editor-keybindings 2020-09-23 12:32:04 +09:00
Dean Herbert
3062fe4411 Add editor key bindings to switch between screens 2020-09-22 15:55:25 +09:00
Dean Herbert
3276b9ae9c Fix fail animation breaking on post-fail judgements 2020-09-22 15:08:53 +09:00
Dean Herbert
1fcf443314 Ensure BeatmapProcessor.PostProcess is run before firing HitObjectUpdated events 2020-09-18 19:33:03 +09:00
Joehu
c6386ea605 Remember leaderboard mods filter selection in song select 2020-09-15 21:53:35 -07:00
Dean Herbert
3c70b3127c Fix potential nullref in FilterControl during asynchronous load 2020-09-15 23:19:31 +09:00
Dan Balasescu
16ae83c499
Merge branch 'master' into editor-clipboard 2020-09-15 16:05:43 +09:00
Dan Balasescu
6cbff98295
Merge branch 'master' into add-collections-to-beatmap-options 2020-09-15 15:23:33 +09:00
Dean Herbert
2c7492d717 Add null check in SongSelect disposal for safety 2020-09-15 14:34:58 +09:00
Joehu
43daabc982 Remove unused using and move dialog to BDL 2020-09-14 12:10:00 -07:00
Joehu
c833f5fcc4 Reorder buttons to match stable 2020-09-14 11:23:41 -07:00
Joehu
57610ddad5 Fix beatmap options absorbing input from toolbar ruleset selector 2020-09-14 11:22:16 -07:00
Joehu
c30174cea3 Add manage collections button to beatmap options 2020-09-14 11:21:23 -07:00
Joehu
1a8a7ae7f8 Remove hardcoded key param from AddButton 2020-09-14 11:19:18 -07:00
Joehu
368aca015a Move override methods to bottom 2020-09-14 11:18:00 -07:00
Bartłomiej Dach
a377cccb4d Unsubscribe from track changed event on disposal 2020-09-14 17:10:35 +02:00
Bartłomiej Dach
6ed4c7caef Merge branch 'master' into flaky-song-select-tests-v2 2020-09-14 16:42:40 +02:00
Dean Herbert
daf54c7eb9 Revert EditorBeatmap.Remove API 2020-09-14 17:55:41 +09:00
Dan Balasescu
3118f635f6
Merge branch 'master' into editor-fix-multiple-selection 2020-09-14 16:45:30 +09:00
Dean Herbert
62c55165d4 Merge branch 'editor-fix-multiple-selection' into editor-clipboard 2020-09-14 15:47:20 +09:00
Dean Herbert
b7a06524fb Update comment to make more sense 2020-09-14 15:47:10 +09:00
Dean Herbert
75e4f224e5 Add back accidentally removed remove 2020-09-14 15:47:04 +09:00
Dean Herbert
692f2c8489 Simplify debounced update pathway 2020-09-14 14:58:00 +09:00