1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 17:57:29 +08:00
Commit Graph

17070 Commits

Author SHA1 Message Date
Dan Balasescu
255e01564f
Merge branch 'master' into rankings-refactor 2020-02-19 10:28:13 +09:00
Andrei Zavatski
e9003346d4 Add missing blank line 2020-02-18 21:28:38 +03:00
Andrei Zavatski
5347119a85 Various RankingsOverlay fixes 2020-02-18 21:26:25 +03:00
Andrei Zavatski
b6423dd92e Small textbox adjustments 2020-02-18 17:40:12 +03:00
Andrei Zavatski
7228900361 Implement BeatmapListingSearchSection component 2020-02-18 17:25:12 +03:00
Dan Balasescu
a195886e1b
Merge branch 'master' into fix-playlist-selected-state 2020-02-18 21:17:03 +09:00
Andrei Zavatski
c7d64d0015 Update BindableList usage in DrawableComment 2020-02-18 13:37:59 +03:00
Andrei Zavatski
3bf3becdd6 Merge remote-tracking branch 'refs/remotes/ppy/master' into subcomments-alter-new 2020-02-18 13:27:08 +03:00
Dean Herbert
035ddb9284
Merge branch 'master' into fix-async-playlist-enumeration 2020-02-18 19:26:32 +09:00
Dean Herbert
2f4c252fc0 Fix playlist items potentially not updating to the correct selected state 2020-02-18 19:19:04 +09:00
Dean Herbert
a1bfb18ce0 Fix accessing incorrect items list in event 2020-02-18 19:00:02 +09:00
Dean Herbert
b7849dd91a Update framework 2020-02-18 18:47:21 +09:00
Dean Herbert
b18f9e195e Merge branch 'master' into bindable-list-events 2020-02-18 18:47:06 +09:00
Dan Balasescu
9e816e3479
Merge branch 'master' into italic-rankings-stuff 2020-02-18 16:05:18 +09:00
Dean Herbert
181774e569
Merge pull request #7889 from smoogipoo/fix-ogg-samples
Fix ogg beatmap/skin samples not loading
2020-02-18 14:07:12 +09:00
Dean Herbert
c49637dfb7
Merge pull request #7879 from peppy/catch-skin-test-updates
Update osu!catch test scenes to show skinnable versions
2020-02-18 13:31:11 +09:00
smoogipoo
ee13632375 Fix ogg beatmap/skin samples not loading 2020-02-18 13:21:55 +09:00
Dan Balasescu
5e5a6acca8
Merge branch 'master' into show-skinnable-sizes 2020-02-18 11:03:22 +09:00
Dan Balasescu
b07799ce2f
Merge pull request #7870 from peppy/move-skinnable-test
Move SkinnableTestScene to main project for consumption by other rulesets
2020-02-18 11:03:12 +09:00
Dan Balasescu
292520c03a
Merge branch 'master' into move-skinnable-test 2020-02-18 10:20:10 +09:00
Dan Balasescu
75e0668b4e
Merge branch 'master' into new-direct-sort 2020-02-18 10:17:26 +09:00
Andrei Zavatski
316c6b2a94 Simplify RulesetInfo string presentation 2020-02-18 01:17:12 +03:00
Andrei Zavatski
410686c8b9 Use dropdown in BeatmapSearchFilterRow 2020-02-18 01:04:25 +03:00
Andrei Zavatski
ae942388a2 Move OsuTabDropdown to it's own file 2020-02-17 23:56:35 +03:00
Andrei Zavatski
ea99b613c9 Use GridContainer for layout 2020-02-17 23:41:07 +03:00
Andrei Zavatski
c69818925b Merge remote-tracking branch 'refs/remotes/ppy/master' into new-betmap-search-filter 2020-02-17 23:35:12 +03:00
Andrei Zavatski
bce9e7a356 Remove too much nesting for OverlaySortTabControl class 2020-02-17 22:32:58 +03:00
Andrei Zavatski
519548c99f Remove not necessary icon margin changes 2020-02-17 22:06:46 +03:00
Andrei Zavatski
20dc1a7dcd Merge remote-tracking branch 'refs/remotes/ppy/master' into new-direct-sort 2020-02-17 21:57:19 +03:00
Dean Herbert
cf973f7730
Merge pull request #7876 from smoogipoo/fix-playlist-id
Fix playlist items added with the wrong IDs
2020-02-17 17:58:26 +09:00
Dean Herbert
0c1822bafe
Merge pull request #7872 from EVAST9919/spotlights-fix
Fix possible error in SpotlightsLayout after it's disposal
2020-02-17 17:54:42 +09:00
Dean Herbert
28c8a9f479 Expose created drawables in SkinnableTestScene 2020-02-17 17:19:46 +09:00
dependabot-preview[bot]
6ce25b3937
Bump Sentry from 2.0.2 to 2.0.3
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.0.2...2.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-17 08:10:20 +00:00
smoogipoo
f9145ce5b4 Fix playlist items added with the wrong IDs 2020-02-17 17:02:19 +09:00
smoogipoo
5ca93758dc Fix music playlist being enumerated asynchronously 2020-02-17 16:59:35 +09:00
Dean Herbert
bdd6f3af99 Show skinnable test skin names and autosized component sizes 2020-02-17 16:09:31 +09:00
Andrei Zavatski
c78534d14e Fix possible error in SpotlightsLayout 2020-02-17 10:07:32 +03:00
smoogipoo
958c891d15 Update with framework-side bindable list changes 2020-02-17 15:06:14 +09:00
Dean Herbert
06fcb48d65 Move SkinnableTestScene to main project for consumption by other rulesets 2020-02-17 14:19:39 +09:00
Andrei Zavatski
480e5677ed Use OverlayColourProvider for CounterPill in profile overlay 2020-02-17 04:29:41 +03:00
Andrei Zavatski
fe7923b7e8 Add SortDirection Bindable and refactor to make everything work 2020-02-17 03:38:14 +03:00
Andrei Zavatski
2ba0bd872b Implement basic BeatmapListingSortTabControl 2020-02-17 02:35:46 +03:00
Andrei Zavatski
a9f366fda3 Implement OverlaySortTabControl component 2020-02-17 02:20:53 +03:00
Andrei Zavatski
ea285fd005 Refactor with including headers 2020-02-17 00:44:55 +03:00
Andrei Zavatski
7207548e47 Merge remote-tracking branch 'refs/remotes/ppy/master' into new-betmap-search-filter 2020-02-17 00:25:08 +03:00
Andrei Zavatski
c85a8a14cc Use property instead of function to set text size 2020-02-17 00:08:28 +03:00
TheWildTree
64a9b9c6fb Remove redundant using directives 2020-02-16 21:52:08 +01:00
TheWildTree
4d180a685a Adjust font sizes and spacing in BeatmapSetOverlay 2020-02-16 21:43:33 +01:00
TheWildTree
8fcd5e93dd Adjust table layout to match osu-web 2020-02-16 21:43:11 +01:00
TheWildTree
dd5e713c0c Adjust colours 2020-02-16 21:42:05 +01:00
Andrei Zavatski
e62fec58c1 Add ability to override text size 2020-02-16 16:38:05 +03:00
Andrei Zavatski
54a3705bdb Remove font weight changes on selection 2020-02-16 16:26:18 +03:00
Dean Herbert
3303678362 Update framework 2020-02-16 22:03:43 +09:00
Andrei Zavatski
a71e410e5d Make the filter autosized 2020-02-16 15:04:21 +03:00
Andrei Zavatski
3888911eee Implement BeatmapSearchFilter component 2020-02-16 14:19:49 +03:00
Dean Herbert
80462014d9
Merge pull request #7848 from smoogipoo/fix-match-subscreen-crashes
Replace hashcode override with local equality comparer
2020-02-16 17:01:22 +09:00
Dan Balasescu
66bdb59209
Merge branch 'master' into fix-video-error 2020-02-16 16:26:44 +09:00
smoogipoo
c8b81bcf3c Use equality comparison rather than hash set 2020-02-16 16:23:46 +09:00
Dean Herbert
006c52bbe5 Fix visible error being thrown when playing a no-video beatmap 2020-02-16 15:08:37 +09:00
Bartłomiej Dach
5a5e3b9410 Merge branch 'master' into align-score-right-content 2020-02-16 06:20:41 +01:00
Bartłomiej Dach
e5a66bdef3 Refactor drawable profile score to match web 2020-02-16 06:16:02 +01:00
voidedWarranties
8c81f1e684 Move CarouselBeatmap access to private, test using indices 2020-02-15 17:51:55 -08:00
Dan Balasescu
268f3333bd
Merge pull request #7841 from peppy/update-inspectcode
Update inspectcode version and fix new issues
2020-02-16 00:53:04 +09:00
smoogipoo
17e3470441 Replace hashcode override with local equality comparer 2020-02-16 00:23:52 +09:00
Dean Herbert
a51fdfb95e
Merge pull request #7839 from smoogipoo/match-subscreen-redesign
Redesign match subscreen to add playlist support
2020-02-15 21:11:39 +09:00
Dean Herbert
a8be437103 Fix failing tests 2020-02-15 20:29:38 +09:00
recapitalverb
03b5e78f61
Merge branch 'master' into align-score-right-content 2020-02-15 18:13:08 +07:00
Dean Herbert
d0122b935e Transfer metadata to ensure present on creating a new match 2020-02-15 19:40:59 +09:00
recapitalverb
ac46b36600 Change right content origin 2020-02-15 16:53:44 +07:00
recapitalverb
2778c6617c
Merge branch 'master' into remove-duplicated-load 2020-02-15 15:13:35 +07:00
Dean Herbert
2e24ceb223 Move duration higher in match settings display 2020-02-15 16:58:35 +09:00
Dean Herbert
7c29327167 Fix download button being visible for already downloaded playlist items 2020-02-15 16:56:11 +09:00
Dean Herbert
e8f1335b47 Allow for easier selection by disabling clickability of contained elements until selected 2020-02-15 16:54:37 +09:00
Dean Herbert
120dab18cf Fix DownloadTrackingComposite incorrectly receiving cancelled state 2020-02-15 16:20:44 +09:00
Dean Herbert
e2e157b455 Add minimum size rules to fix overlap at non-wide resolutions 2020-02-15 15:52:27 +09:00
Dean Herbert
19d61c1255 Merge branch 'master' into match-subscreen-redesign 2020-02-15 15:29:33 +09:00
Dean Herbert
f54844d8a5 Schedule selection update handling in MatchSubScreen to avoid firing when not the current screen 2020-02-15 15:07:10 +09:00
Dean Herbert
637c1dc840 In the case of only one playlist item, update with current selection on select 2020-02-15 14:41:16 +09:00
recapitalverb
7c9569c9a3
Merge branch 'master' into remove-duplicated-load 2020-02-15 12:10:34 +07:00
Dean Herbert
da68ae5461 Merge branch 'master' into match-songselect-playlist-logic 2020-02-15 12:27:51 +09:00
Dean Herbert
bb541f5ae4 Update inspectcode version and fix new issues 2020-02-15 11:54:29 +09:00
Dean Herbert
a4215106ff Merge branch 'master' into match-detail-area 2020-02-15 11:46:29 +09:00
Dean Herbert
4379466b1e
Merge pull request #7831 from peppy/improve-relax-key-down-up
Add a key up delay for relax mod presses
2020-02-15 11:42:53 +09:00
Dean Herbert
af8eda2d24
Merge pull request #7829 from smoogipoo/match-playlist
Implement a rearrangeable beatmap playlist control
2020-02-15 11:42:26 +09:00
Dean Herbert
0b90e732a9
Merge branch 'master' into match-playlist 2020-02-15 11:09:17 +09:00
Dean Herbert
5e8df45c00
Merge branch 'master' into improve-relax-key-down-up 2020-02-15 11:07:19 +09:00
voidedWarranties
8e1ecddb1d Add testing 2020-02-14 17:23:24 -08:00
Andrei Zavatski
7cb11be810 Merge remote-tracking branch 'refs/remotes/ppy/master' into subcomments-alter-new 2020-02-14 20:55:51 +03:00
Andrei Zavatski
f64eabc38b Make countries name non-italic 2020-02-14 20:49:37 +03:00
Andrei Zavatski
3b79c8ce6c Merge remote-tracking branch 'refs/remotes/ppy/master' into italic-rankings-stuff 2020-02-14 20:47:29 +03:00
recapitalverb
7866c26f95 Make OsuConfigManager instances readonly 2020-02-14 22:18:56 +07:00
recapitalverb
ee14a275a2 Make IAPIProvider instances nullable 2020-02-14 22:02:44 +07:00
recapitalverb
7de7748607 Remove unnecessary nullability 2020-02-14 22:02:10 +07:00
recapitalverb
2bd2cd1d3f Use OsuConfigManager from ctor instead 2020-02-14 21:59:33 +07:00
smoogipoo
3b2e4ecb2d Merge branch 'match-playlist' into match-subscreen-redesign 2020-02-14 23:40:04 +09:00
smoogipoo
61d539dc67 Fix first playlist item not getting selected 2020-02-14 23:39:39 +09:00
recapitalverb
c46d828716 Preserve permitNulls 2020-02-14 20:59:51 +07:00
recapitalverb
10798aeab3 Fix code formatting 2020-02-14 20:30:27 +07:00
recapitalverb
a7c2fd078f Fix remaining cases 2020-02-14 20:27:21 +07:00
recapitalverb
c753cb46c5 Use [Resolved] wherever possible 2020-02-14 20:14:00 +07:00
smoogipoo
9eaf372587 Immediately update selected state 2020-02-14 21:17:07 +09:00
smoogipoo
b92f1ad68d Implement match subscreen re-design 2020-02-14 20:48:09 +09:00
smoogipoo
2ea8c47c83 Fix incorrect footer button size 2020-02-14 20:44:41 +09:00
smoogipoo
b762e5e8a5 Implement overlined components 2020-02-14 20:42:14 +09:00
recapitalverb
6d87d22a84 Remove duplicated dependency on AudioManager 2020-02-14 18:40:58 +07:00
Dan Balasescu
851e353093
Merge branch 'master' into fix-player-loader-focused-overlay-interaction 2020-02-14 20:36:38 +09:00
smoogipoo
929eb4f035 Add match footer 2020-02-14 20:35:52 +09:00
smoogipoo
d0b7b7f53a Re-layout match settings overlay 2020-02-14 20:34:15 +09:00
smoogipoo
d5496321e2 Implement leaderboard chat display 2020-02-14 20:31:55 +09:00
smoogipoo
c75a774297 Extract participants list from the room inspector 2020-02-14 20:27:37 +09:00
smoogipoo
80fd9485a9 Refactor ready button to support selected playlist item 2020-02-14 20:18:53 +09:00
smoogipoo
c0dba63278 Remove match info 2020-02-14 20:14:25 +09:00
smoogipoo
b0793b06ed Re-implement the match header 2020-02-14 20:10:36 +09:00
smoogipoo
b5f048ce96 Merge branch 'match-songselect-playlist-logic' into match-subscreen-redesign 2020-02-14 19:59:15 +09:00
smoogipoo
f31220c1ee Fix exception when adding duplicate items 2020-02-14 19:56:43 +09:00
Dean Herbert
2fa7143cda
Merge pull request #7835 from peppy/player-loader-code-quality
Improve PlayerLoader code quality
2020-02-14 19:55:31 +09:00
Dean Herbert
14f632b532 Merge branch 'master' into match-detail-area 2020-02-14 19:54:17 +09:00
Dean Herbert
e1a1403701
Merge pull request #7832 from smoogipoo/custom-detail-area
Make beatmap detail area abstract
2020-02-14 19:38:19 +09:00
Dan Balasescu
45734f8e8d
Merge branch 'master' into player-loader-code-quality 2020-02-14 19:35:40 +09:00
Dean Herbert
4d4ec3515d Fix player loading sequence continuing even when a priority overlay is visible 2020-02-14 19:16:08 +09:00
Dean Herbert
a6de5853e4
Merge branch 'master' into player-loader-code-quality 2020-02-14 18:29:54 +09:00
Dean Herbert
2808f8167d Use more regions 2020-02-14 18:28:58 +09:00
Dean Herbert
b69d1ad678 Reorder and clean up PlayerLoader 2020-02-14 18:22:57 +09:00
Dean Herbert
be30ef3cca Move BeatmapMetadataDisplay to its own class 2020-02-14 18:13:52 +09:00
Dan Balasescu
745de8ad7f
Merge branch 'master' into fix-cursor-cs-scaling 2020-02-14 18:11:18 +09:00
smoogipoo
f0f739707f Add playlist support to match song select 2020-02-14 17:51:42 +09:00
Dean Herbert
66910f1ee3 Remove unnecessary bindable setter 2020-02-14 17:50:53 +09:00
Dean Herbert
48dcb91118 Merge branch 'master' into custom-detail-area 2020-02-14 17:40:12 +09:00
smoogipoo
5ec9f454d5 Implement the match beatmap detail area 2020-02-14 17:20:38 +09:00
Dean Herbert
61a7f04efb Add a sane key up delay to relax mod 2020-02-14 17:13:50 +09:00
smoogipoo
25e399f11b Merge branch 'match-playlist' into match-detail-area 2020-02-14 17:04:22 +09:00
Dan Balasescu
6aab9b7a08
Merge branch 'master' into fix-timeline-seek-while-playing 2020-02-14 17:02:34 +09:00
smoogipoo
aceba8791c Clean up selection handling 2020-02-14 16:56:44 +09:00
smoogipoo
afd3e4604b Fix race condition causing selection to be reset incorrectly 2020-02-14 16:48:23 +09:00
smoogipoo
1909ea2bd3 Add a way to hide the drag handle 2020-02-14 16:09:19 +09:00
Dean Herbert
a75715607b Move drawable load to asynchronous context 2020-02-14 15:41:46 +09:00
Dean Herbert
720ceca78a Final tidy-up pass 2020-02-14 15:38:47 +09:00
smoogipoo
5e871f9838 Make room playlist use the common rearrangeable design 2020-02-14 15:36:47 +09:00
smoogipoo
eb75d26c8f Extract common rearrangeable list design 2020-02-14 15:36:16 +09:00
Dean Herbert
edf9cfc863 API can't be null on load 2020-02-14 15:36:06 +09:00
Dean Herbert
6f1cecd86f Move LoadComplete up in method 2020-02-14 15:35:39 +09:00
Dean Herbert
7e6c194d4a Add missing xmldoc 2020-02-14 15:34:46 +09:00
Dean Herbert
4d5abab2ee Remove unnecessary content private storage 2020-02-14 15:29:50 +09:00
Dean Herbert
76cfe1f42c Merge branch 'master' into online-container 2020-02-14 15:18:27 +09:00
smoogipoo
eb14dbcd77 Initial implementation of rearrangeable playlist 2020-02-14 15:01:45 +09:00
smoogipoo
3a0b2508d4 Fix possible nullrefs 2020-02-14 15:01:34 +09:00
Dean Herbert
0e439e3a70 Fix missing dependency in ZoomableScrollContainer test 2020-02-14 14:41:55 +09:00
Dean Herbert
884a5fbad4 Fix osu! gameplay cursor not adjusting to mod/convert circle size changes 2020-02-14 14:30:15 +09:00
Dan Balasescu
60d796ae3f
Merge branch 'master' into fix-timeline-seek-while-playing 2020-02-14 13:04:38 +09:00
Dan Balasescu
f64f934204
Merge branch 'master' into span_fromHex 2020-02-14 12:09:34 +09:00