1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:47:24 +08:00
Commit Graph

24241 Commits

Author SHA1 Message Date
Dan Balasescu
9d8a26f373
Merge branch 'master' into diffcalc/refactor-strain-skill 2021-04-06 08:21:38 +09:00
Dean Herbert
beebdb0734 Clean up implementation 2021-04-05 22:30:51 +09:00
Dean Herbert
38e95a0e73 Merge branch 'master' into fix-overzealousmouse-button-blocking 2021-04-05 22:07:41 +09:00
Samuel Cattini-Schultz
5bdd15f746 Refactor Skill.Process() to not require calling base.Process() 2021-04-05 22:14:59 +10:00
Samuel Cattini-Schultz
57983ae61f Fix whitespace 2021-04-05 22:14:59 +10:00
smoogipoo
d0510222ae Fix legacy beatmap encoding 2021-04-05 19:59:54 +09:00
smoogipoo
4b29d0ebe2 Fix last control point starting new segment 2021-04-05 17:49:36 +09:00
Dean Herbert
6bcbef9f25
Merge pull request #12294 from smoogipoo/mania-scoring-adjustments
Adjust scoring values to better fit osu!mania expectations
2021-04-05 17:19:28 +09:00
Dan Balasescu
97820e0ea5
Merge branch 'master' into diffcalc/refactor-strain-skill 2021-04-05 15:09:52 +09:00
Dan Balasescu
5bf0889379
Merge branch 'master' into diffcalc/refactor-strain-logic 2021-04-05 14:16:34 +09:00
smoogipoo
3acc612a67 Adjust scoring values to better fit osu!mania 2021-04-05 13:28:46 +09:00
Bartłomiej Dach
0a1417bc67 Swap order of background/audio track changing methods
Mostly for quality of reviewing (restores previous order) and more
consistency overall.
2021-04-04 13:10:12 +02:00
Bartłomiej Dach
a0f0ae7979 Adjust spacings in resources section 2021-04-04 12:53:51 +02:00
Bartłomiej Dach
f2d4ca7676 Add background chooser text box 2021-04-04 12:50:50 +02:00
Bartłomiej Dach
9394af32f5 Move drag & drop support logic to chooser component 2021-04-04 12:34:52 +02:00
PercyDan54
d4724f4494
Fix crash 2021-04-04 09:44:45 +08:00
Bartłomiej Dach
294d911426 Move background chooser to header 2021-04-03 20:53:07 +02:00
Bartłomiej Dach
61f9eb51c4 Split background chooser to own component 2021-04-03 20:36:30 +02:00
Bartłomiej Dach
3572178bdc Add tab control to setup screen header 2021-04-03 20:13:20 +02:00
Bartłomiej Dach
95d7e6c74b Explicitly associate setup sections with titles 2021-04-03 19:58:49 +02:00
Bartłomiej Dach
bdd1072dce Adjust colours and spacing to be closer to design 2021-04-03 18:52:50 +02:00
Bartłomiej Dach
4df7ff21c7 Fix editor arrow seek snapping not updating after control point changes
The editor clock, which is responsible for performing the seek, was not
aware of changes in control points due to reading from the wrong
beatmap. `loadableBeatmap` is not actually changed by any of the editor
components; `playableBeatmap` and `editorBeatmap` are.

For now this is changed to use `playableBeatmap`. A better follow-up
would be to use `editorBeatmap`, but it would probably be best to move
the beat snap bindable into `EditorBeatmap` first.
2021-04-03 14:02:46 +02:00
Samuel Cattini-Schultz
85d2b1232a Refactor to abstract out strain logic into StrainSkill class
While it is the case for the existing official Skills, Skill implementations shouldn't be required to conform to a strain based approach.
There are other valid approaches to calculating skill difficulty that can be supported by abstracting the strain logic into its own StrainSkill class.
2021-04-03 20:52:39 +11:00
Samuel Cattini-Schultz
5b2dcea8a8 Refactor to encapsulate strain logic into Skill class
As strains are an implementation detail of the current Skill calculations, it makes sense that strain related logic should be encapsulated within the Skill class.
2021-04-03 20:47:43 +11:00
Samuel Cattini-Schultz
fe66b84bed Implement dynamic previous hitobject retention for Skill class
There is no reason we should be limiting skills to knowing only the previous 2 objects. This originally existed as an angle implementation detail of the original pp+ codebase which made its way here, but didn't get used in the same way.
2021-04-03 20:28:51 +11:00
Dean Herbert
eb1e850f99
Merge pull request #12254 from smoogipoo/spectator-refactor
Move frame-handling spectator logic into abstract base class
2021-04-03 17:23:33 +09:00
Dean Herbert
dc3163ccf2
Merge pull request #12271 from hbnrmx/filechooser-preselect-folder
Open editor file selector in the directory of the previous selection
2021-04-03 14:31:19 +09:00
Dean Herbert
f0e656fb12
Merge pull request #12276 from PercyDan54/beatmap-info-unicode
Make beatmap listing use unicode title & artist name
2021-04-03 14:30:27 +09:00
PercyDan54
dde255980b
Fix formatting 2021-04-03 12:45:42 +08:00
PercyDan54
bd7da9eb39
Make beatmap title use unicode 2021-04-03 12:43:17 +08:00
Dean Herbert
0dce4b8894 Update framework 2021-04-03 13:01:08 +09:00
Dean Herbert
67f0c0ceb9
Merge branch 'master' into spectator-refactor 2021-04-03 12:55:11 +09:00
hbnrmx
824fb9f398 reopen FileSelector in the directory of the previous selection 2021-04-02 18:01:26 +02:00
hbnrmx
438f3e6349 move fallback text to PlaceholderText 2021-04-02 17:57:21 +02:00
PercyDan54
a5a19319cc
Fix code style 2021-04-02 21:15:28 +08:00
smoogipoo
cd53074941 Schedule spectator callbacks 2021-04-02 21:27:20 +09:00
PercyDan54
1ff77754fd
Use OnlineViewContainer 2021-04-02 20:14:31 +08:00
Dan Balasescu
345779b19a
Merge branch 'master' into diffcalc/fix/clockrate-adjusted-decay 2021-04-02 20:58:29 +09:00
smoogipoo
d2950105fb Add comment explaining use of lock 2021-04-02 20:31:34 +09:00
Dan Balasescu
143b8c422c
Merge pull request #12259 from frenzibyte/fix-ruleset-file-loading
Guard against same ruleset file with filenames of loaded assembly location instead
2021-04-02 19:21:33 +09:00
Dean Herbert
45d16fb916 Rename event parameter for clarity 2021-04-02 16:56:47 +09:00
Dean Herbert
6d4d574a65 Fix exported replay filenames not having full metadata 2021-04-02 14:10:25 +09:00
smoogipoo
e1aa927827 Add dropdown option to export score 2021-04-02 13:20:15 +09:00
Salman Ahmed
5b1dc7d2b4 Remove unused using directive 2021-04-02 02:45:26 +03:00
Salman Ahmed
fcd56dba44 Guard against same ruleset file with loaded assembly filenames instead 2021-04-02 02:12:25 +03:00
Naxess
7e47922fb7
Merge branch 'master' into circular-arc-freeze 2021-04-01 17:09:45 +02:00
smoogipoo
9bc2a486e0 Make SoloSpectator use the new SpectatorScreen class 2021-04-01 22:10:17 +09:00
smoogipoo
9e95441aa6 Rename Spectator -> SoloSpectator 2021-04-01 22:08:52 +09:00
smoogipoo
af478fb2eb Add abstract spectator screen class 2021-04-01 22:02:32 +09:00
Naxess
7b684339ed Undo public -> internal for PathControlPoint.Changed
No longer used.
2021-03-31 20:32:49 +02:00
Dan Balasescu
f8c1dfe57f
Merge branch 'master' into editor-fix-speed-multiplier-precision 2021-03-31 17:17:25 +09:00
Dan Balasescu
ef1f133fb1
Merge pull request #12238 from peppy/fix-mass-drag-drop-imports
Group large drag drop imports into a single operation
2021-03-31 16:15:26 +09:00
Dean Herbert
30cae46cbd Group large drag drop imports into a single operation 2021-03-31 14:57:28 +09:00
Dean Herbert
0c53b4eb93 Fix wrong counting and add test 2021-03-31 14:09:39 +09:00
Dean Herbert
e0c61f4dc5 Fix retry count not updating correctly
Regressed with changes to player reference retention logic. Could add a
test but the logic is so local now it seems quite redundant.
2021-03-31 13:57:58 +09:00
Dean Herbert
fb0079fb9f Fix accuracy displaying incorrectly in online contexts
Closes #12221.
2021-03-30 22:42:32 +09:00
Dean Herbert
633e6130bf Update framework 2021-03-30 19:46:22 +09:00
Dean Herbert
de394f3d14 Merge branch 'master' into tablet-rotation-configuration 2021-03-30 19:46:19 +09:00
Dean Herbert
a2f50af424 Fix fall-through scroll redirection 2021-03-30 19:42:40 +09:00
Dean Herbert
05961e98d5 Ensure GlobalActions are handled before anything else game-wide 2021-03-30 19:03:15 +09:00
Dean Herbert
90c75a64cf Fix legacy control point precision having an adverse effect on the editor 2021-03-30 15:24:11 +09:00
Dan Balasescu
d2ef0ba644
Merge branch 'master' into add-editor-nudging-support 2021-03-30 14:34:43 +09:00
Dean Herbert
1dfd08eded Add tablet rotation configuration 2021-03-30 13:01:48 +09:00
Dean Herbert
8dfff999f9 Add rotation slider 2021-03-30 12:40:50 +09:00
Dean Herbert
8a0fcf20ed Move offset settings up for more logical ordering 2021-03-30 12:32:42 +09:00
Dean Herbert
d84c9251e6 Update nuget packages 2021-03-29 22:17:24 +09:00
Dean Herbert
36364a4492 Update framework 2021-03-29 22:17:17 +09:00
Dan Balasescu
1bb9f018a0
Merge branch 'master' into fix-timeline-depth-ordering 2021-03-29 20:47:47 +09:00
Dan Balasescu
3cf6a3f56d
Merge pull request #12076 from peppy/add-timeline-stacking-support
Implement editor timeline stacking support
2021-03-29 20:44:52 +09:00
Dan Balasescu
633a0f4a40
Merge pull request #12208 from peppy/fix-chat-scroll-stickiness
Fix chat scroll sticking visually when scrolling beyond bottom extent
2021-03-29 20:44:44 +09:00
Dean Herbert
690debe507
Merge pull request #12030 from LeNitrous/editor-platform-clipboard-copy 2021-03-29 19:31:16 +09:00
Dean Herbert
3909eda095 Avoid using a StringBuilder 2021-03-29 18:51:28 +09:00
Dean Herbert
90ab765cf5 Reorder methods and surround with region 2021-03-29 18:46:32 +09:00
Dan Balasescu
4a5fc82388
Merge branch 'master' into add-timeline-stacking-support 2021-03-29 18:42:59 +09:00
Nathan Alo
cdb779f764 move copy logic inside ComposeScreen 2021-03-29 17:30:23 +08:00
Nathan Alo
9a02f3868c return a string instead 2021-03-29 17:29:05 +08:00
Dean Herbert
699a317b44 Fix chat scroll sticking visually when scrolling beyond bottom extent 2021-03-29 18:07:47 +09:00
smoogipoo
ecb66ad2e2 Fix up xmldoc 2021-03-29 15:33:54 +09:00
Naxess
d58ef5310b Add verify tab
Currently empty, but works.
2021-03-28 17:36:22 +02:00
Bartłomiej Dach
ccd2d5d2a9
Merge branch 'master' into fix-accuracy-formatting 2021-03-27 14:42:13 +01:00
Dean Herbert
16e184e531
Merge pull request #12183 from frenzibyte/legacy-sprite-text-fonts
Improve code quality of constructing legacy sprite texts
2021-03-27 20:39:33 +09:00
Samuel Cattini-Schultz
068f00d8a0 Add EndTime to DifficultyHitObject for future convenience 2021-03-27 18:38:43 +11:00
Samuel Cattini-Schultz
010db8968f Adjust wording of xmldoc 2021-03-27 18:38:23 +11:00
Nathan Alo
21398e25b5 null check composer and ensure the correct start time from selected hit objects 2021-03-27 10:02:21 +08:00
Bartłomiej Dach
e9289853fc
Merge branch 'master' into fix-accuracy-formatting 2021-03-26 21:24:04 +01:00
Dan Balasescu
49d6bf066a
Merge pull request #12193 from peppy/fix-multiplayer-crash-on-enter-twice
Fix crash on attempting to join lobby using key press during a pending join
2021-03-26 19:27:17 +09:00
Nathan Alo
c96321206a fix appveyor complaints 2021-03-26 16:17:24 +08:00
Salman Ahmed
1b6e08b3eb Fix incorrect default font overlap for score and combo 2021-03-26 10:35:46 +03:00
Nathan Alo
71a0616861 remove extra semi colons 2021-03-26 15:34:45 +08:00
Nathan Alo
374f8c5e22 move to compose namespace and add license header 2021-03-26 15:33:28 +08:00
Dean Herbert
cb48e5f158 Fix timeline not visually ordering hitobjects in a stable way 2021-03-26 16:33:18 +09:00
Nathan Alo
b8b7eb4c4b refactor logic to its own component and handle hit object to string conversion to its ruleset-specific composers 2021-03-26 15:25:20 +08:00
Nathan Alo
2bea69456e remove implementations 2021-03-26 15:24:33 +08:00
Dean Herbert
77969bb223 Merge branch 'master' into add-timeline-stacking-support 2021-03-26 16:17:10 +09:00
Dean Herbert
6a4157d193 Remove unused using statement 2021-03-26 16:13:43 +09:00
Dean Herbert
7faca766e4 Fix crash on attempting to join lobby using key press during a pending join
Closes https://github.com/ppy/osu/issues/12040.
2021-03-26 14:49:05 +09:00
Dean Herbert
0a889fafc4 Don't send progress updates when not in a downloading state
This is mostly just a sanity/debounce check.
2021-03-26 14:04:40 +09:00
Dean Herbert
17a0b19ee7 Always set progress before updating download state
Without doing so, a state change may read from an old progress value.
2021-03-26 14:04:10 +09:00
Dean Herbert
4909eaf890 Add the ability to specify format provider (to make tests culture invariant) 2021-03-26 13:10:11 +09:00
Dean Herbert
6a7f926168 Change rounding to use a more general flooring approach 2021-03-26 13:10:11 +09:00
smoogipoo
8438fce764 Merge branch 'master' into diffcalc/fix/clockrate-adjusted-decay 2021-03-26 11:47:38 +09:00
Max Hübner
aa2c1ee85e Add new beatmap search filter row "General" 2021-03-25 23:20:10 +01:00
Salman Ahmed
6aa0c9d8fd Merge branch 'master' into legacy-sprite-text-fonts 2021-03-25 14:52:01 +03:00
Dean Herbert
f6647de769 Add support for nudging objects in the editor using ctrl+arrow keys
Closes #12042.
2021-03-25 19:56:28 +09:00
Dean Herbert
77888ae640 Remove unnecessary using 2021-03-25 17:51:20 +09:00
Dean Herbert
630faa3b56 Add TODO marking incorrect EF core data type
As mentioned in the comment, we probably don't need to be storing this
in the database in the first place (as it should be able to be
calculated from the other statistics we have available to us). Something
to consider when we refactor the database backend.
2021-03-25 17:50:21 +09:00
Dean Herbert
701342e036 Remove accuracy rounding at a ScoreProcessor level 2021-03-25 17:43:51 +09:00
Dean Herbert
cb4ae6e61a Fix very high accuracies feigning as "perfect" 100% plays when actually below 2021-03-25 17:34:29 +09:00
Dean Herbert
8d4ff867bf Fix barlines showing up in the osu!mania editor's timeline 2021-03-25 16:30:31 +09:00
Dean Herbert
9fdd23b134 Fix various issues with stacking 2021-03-25 16:28:30 +09:00
Dean Herbert
bdc783b55f Merge branch 'master' into add-timeline-stacking-support 2021-03-25 15:28:30 +09:00
Dean Herbert
7b3336783f
Stabilise ordering instead of simple reversing
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-25 15:24:59 +09:00
Dan Balasescu
41cf261286
Merge pull request #12177 from peppy/fix-comment-parsing-regression
Don't strip comments from metadata during parsing
2021-03-25 15:02:10 +09:00
Dean Herbert
e0b12abcc1
Merge pull request #12173 from frenzibyte/osk-ignore-case 2021-03-25 14:58:09 +09:00
Dean Herbert
0324bfa857 Change checks back to Contains 2021-03-25 14:14:38 +09:00
Dean Herbert
4269cb7124 Extract majority of token retrieval code out of LoadComponentAsync for legibility 2021-03-25 13:48:41 +09:00
Dean Herbert
ff139c2056 Merge branch 'master' into solo-score-submission 2021-03-25 13:46:29 +09:00
Dean Herbert
4f8edcd336 Don't strip comments from metadata during parsin 2021-03-25 13:35:54 +09:00
Dean Herbert
e22650293d Remove unnecessary second call to StripComments in skin parsing logic 2021-03-25 13:35:42 +09:00
Salman Ahmed
fc5719e445 Fix SkinManager not handling extensions casing comparsion properly 2021-03-24 21:31:53 +03:00
Dean Herbert
f95175983a Make code more concise and move method to a more appropriate place 2021-03-24 13:37:37 +09:00
Dean Herbert
d55324585d Change RoomSubmittingPlayer's request implementation to return null on RoomID missing, rather than silently succeeding 2021-03-24 13:23:23 +09:00
Dean Herbert
84b2f9a848 Make token private 2021-03-24 13:20:44 +09:00
Dean Herbert
a0c6c4da35 Rename and refactor token request process to be easier to understand 2021-03-24 13:17:29 +09:00
Dean Herbert
e372e355ef Reorder overrides in SoloPlayer to better follow chronological request order 2021-03-24 13:12:51 +09:00
Dean Herbert
8bed7748d6 Rename token request method to avoid double Request terminology 2021-03-24 13:02:37 +09:00
Dean Herbert
a1c35677ef Add more xmldoc 2021-03-24 13:02:17 +09:00
Naxess
4ae3eaaac6 Move path type correction
This is better because `PathControlPointVisualizer` is local to the editor, meaning there is no chance that this could affect gameplay.
2021-03-24 03:02:19 +01:00
Owen Young
c8542d2434
Merge branch 'master' into default-fullscreen 2021-03-23 19:44:22 -05:00
Owen Young
437dadc85f Changed comment on GetFrameworkConfigDefaults() to be more accurate 2021-03-23 19:37:55 -05:00
Owen Young
67a03ebc23 Fixed formatting issues to be in line with osu coding standards 2021-03-23 19:31:16 -05:00
Owen Young
fbb992fc7e Added a comment to new method 2021-03-23 19:18:32 -05:00
Dean Herbert
e649a330a4 Implement SoloPlayer's request construction 2021-03-23 18:23:25 +09:00
Dean Herbert
242b847516 Add flow for allowing gameplay to continue even when an error occurs with token retrieval 2021-03-23 18:23:25 +09:00
Dean Herbert
3cd8bf2d7f Move token request construction to LoadAsyncComplete to better allow DI usage 2021-03-23 18:20:55 +09:00
Dean Herbert
571124669d Remove all references to "score submission" from Player 2021-03-23 18:20:55 +09:00
Dean Herbert
194b2d05d3 Update SoloPlayer to derive SubmittingPlayer 2021-03-23 18:20:55 +09:00
Dean Herbert
12f050264a Further split out a player class which submits to "rooms" 2021-03-23 18:20:55 +09:00
Dean Herbert
7045fce555 Move score submission logic in general out to its own Player type 2021-03-23 18:20:55 +09:00
Dean Herbert
6cb14e91c9 Make Player abstract and introduce SoloPlayer 2021-03-23 18:18:49 +09:00
Dean Herbert
5267fb74c4 Add submission requests 2021-03-23 18:18:49 +09:00
Dean Herbert
aeff9bd853 Add return bool to HandleRequest to better trigger failures 2021-03-23 18:17:29 +09:00
Dean Herbert
ce452565f4 Avoid firing any kind of failures after success 2021-03-23 17:50:31 +09:00
Dean Herbert
f5ba746ae5 Fail all API requests sent to DummyAPIAccess
Until now, API requests sent to dummy API were just lost in the void. In most cases this somehow worked as expected, but any logic which is waiting on a request to finish will potentially never get a response.

Going forward, I'm not 100% sure that every `Wait` on a web response will have local timeout logic (I think there is a certain amount of assumption that this is being managed for us by `APIAccess`), so I've made this change to better handle such cases going forward. Now, rather than nothing happening, requests will trigger a failure via the existing exception logic rather than silently pretending the request never arrived.
2021-03-23 17:37:45 +09:00
Dan Balasescu
17a28f4f65
Merge pull request #12136 from peppy/remove-skin-sample-workarounds
Remove local workarounds to attempt to avoid crashes on skin change
2021-03-23 16:44:29 +09:00
Dan Balasescu
d758343a45
Merge pull request #12149 from peppy/fix-score-token-data-type
Fix APIScoreToken's data type not matching server side
2021-03-23 14:54:02 +09:00
Dean Herbert
1171214541 Update framework 2021-03-23 14:51:22 +09:00
Owen Young
254b0f5dc3 removed line (?) - tried doing testing to see if it launched in fullscreen (i.e., overriding the method ppy mentioned), but to no avail :( 2021-03-23 00:24:33 -05:00
Dean Herbert
9c690f9545 Fix second usage 2021-03-23 14:08:00 +09:00
Dean Herbert
58c60100b4 Fix APIScoreToken's data type not matching server side 2021-03-23 14:04:47 +09:00
Owen Young
d9e2c44a34 implemented GetFrameworkConfigDefaults for overriding framework default, removed previous code that added a new OsuSetting and modified settings layout. 2021-03-22 23:36:55 -05:00
Owen Young
9f788f5854 removed code from OsuGameBase for fullscreen.....OsuSetting still exists but cannot figure out a way to set it to a default and have it actually work 2021-03-22 22:52:16 -05:00
Joehu
16b3f22caf Fix incorrect trash icon being used on deleted comments counter 2021-03-22 19:32:17 -07:00
Owen Young
bdcb9451f7 added code to OsuGameBase to default to fullscreen, but that might not be a good place to put it. 2021-03-22 20:17:05 -05:00
Owen Young
8ea7271d5c moved windowmode code to LoadComplete (?) 2021-03-22 19:48:52 -05:00
Naxess
e922e67c98 Fix inverted return statement
Forgot to run tests, all passing now.
2021-03-22 19:48:21 +01:00
Naxess
3fa5852e00 Add method documentation 2021-03-22 19:42:27 +01:00
Naxess
b11fd7972a Separate condition logic from math logic 2021-03-22 19:41:48 +01:00
Naxess
92f713a30e Improve fallback conditions
It's possible to create a `PerfectCurve` type path with more than 3 points currently, so this accounts for that.
2021-03-22 19:10:56 +01:00
Naxess
80e7c3aba7 Invert if statement 2021-03-22 19:09:28 +01:00
Naxess
6911a1b415 Fix missing newline 2021-03-22 19:03:55 +01:00
Naxess
a7076c329c Fix null checks 2021-03-22 17:32:55 +01:00
Naxess
323b875cea Fix newlines/spaces 2021-03-22 17:32:40 +01:00
Naxess
c82218627f Add path type update logic
Only attempts to change points to bezier if points in the slider are modified.
2021-03-22 15:57:57 +01:00
Naxess
7a2cb526e4 Add PointsInSegment method 2021-03-22 15:55:30 +01:00
Naxess
bee2f55d00 Undo subpath limiting 2021-03-22 15:54:33 +01:00
Owen Young
fc632fd48a Added WindowSetting setting to OsuSetting enum so that it can be set by default at startup. Modified LayoutSettings.cs so that when it is changed in the settings, it is written to the local settings as well. 2021-03-22 01:30:20 -05:00
Dean Herbert
073dba5330 Remove local workarounds to attempt to avoid crashes on skin change 2021-03-22 14:05:37 +09:00
owen-young
f7bf23dbe9 first attempt at changing windowMode to be fullscreen on default 2021-03-21 21:50:19 -05:00
Joehu
9bc6cdf042 Fix singular format regression on forum post text 2021-03-21 11:19:07 -07:00
Joehu
e31d583a7f Add comments count to user profile overlay 2021-03-21 11:16:59 -07:00
Bartłomiej Dach
a16c0641b2 Revert EF Core to version 2.2
This reverts commit f3faad74d5, reversing
changes made to 712e7bc7bf.

Several issues arose after migrating to 5.0, including, but possibly not
limited to, performance regressions in song select, as well as failures
when attempting to save beatmaps after metadata changes in the editor.
2021-03-21 11:05:15 +01:00
Naxess
fcd1f4930f Fix freeze due to large circular arc radius
Seems to stem from the osu!framework's PathApproximator not catching a few edge cases wherein the radius approaches infinity.
2021-03-21 06:34:55 +01:00
Bartłomiej Dach
86b569f5f7 Fix typo in identifier 2021-03-20 12:37:51 +01:00
Bartłomiej Dach
d28bed6ed2 Schedule adding transforms on tablet changes
Fixes `InvalidThreadForMutationException`s that pop up when
disconnecting/reconnecting tablets during the game's operation. In those
cases the value change callback executes from  an OpenTabletDriver
thread.
2021-03-20 12:37:48 +01:00
Dean Herbert
b9b351311a
Merge pull request #11824 from peppy/fix-unsafe-skinnable-sample-play
Fix playing skinned samples being unsafe during skin changes
2021-03-20 11:29:34 +09:00
Dean Herbert
ca943a897a Fix back to front initialisation order 2021-03-20 10:51:58 +09:00
Bartłomiej Dach
dd48b68f8a Ensure selected blueprints are given selection priority 2021-03-19 22:44:33 +01:00
Dean Herbert
71a361337d
Add comment regarding usage of Reverse()
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-03-19 21:57:48 +09:00
Dan Balasescu
d54e9ab481
Merge pull request #12077 from peppy/tablet-configuration
Add tablet configuration section
2021-03-19 21:49:32 +09:00
Dan Balasescu
5a6ff53837
Merge pull request #12073 from peppy/fix-crash-toggle-overlay-before-loaded
Avoid potential crash if an overlay is toggled before it has been loaded
2021-03-19 21:38:47 +09:00
Dan Balasescu
e72205eea2
Merge pull request #12080 from peppy/add-25-playback-editor
Change editor speed adjust to adjust frequency (and restore 25% option)
2021-03-19 21:04:12 +09:00
Dean Herbert
68aaf90702 Fix disposal rather than performing some weird hack 2021-03-19 20:30:52 +09:00
Dean Herbert
f59327cc3e Merge branch 'master' into fix-unsafe-skinnable-sample-play 2021-03-19 20:29:44 +09:00
Dean Herbert
b2d8db3a92 Rename incorrect variable 2021-03-19 20:25:21 +09:00
Dean Herbert
63cbac3bd0 Ensure aspect ratio slider gets an initial value 2021-03-19 20:15:29 +09:00
Dean Herbert
6f32c302eb Add checkbox to optionally disable tablet handling 2021-03-19 20:13:51 +09:00
Dan Balasescu
4da9089b00
Merge branch 'master' into tablet-configuration 2021-03-19 20:09:25 +09:00
Dean Herbert
095b7f8668 Rewrite code to account for non-loaded edge case 2021-03-19 20:09:12 +09:00
Dean Herbert
4795170c60 Add back the default json converter locally to ensure it's actually used 2021-03-19 20:07:13 +09:00
Dean Herbert
86b229b1c9 Increase maximum usable aspect ratio to account for ultrawide monitors 2021-03-19 20:05:18 +09:00
Dean Herbert
8955071703 Change editor speed adjust to adjust frequency 2021-03-19 20:01:45 +09:00
Dean Herbert
9be7981e0d Adjust timeline ticks to be more visible 2021-03-19 19:45:00 +09:00
Dean Herbert
c0c8b3e46c Fix regression meaning SkinnableSound initialisation may never happen 2021-03-19 19:22:50 +09:00
Dean Herbert
bd1e2da1c2 Always hide other overlays, even if the new one is not loaded 2021-03-19 19:09:39 +09:00
Dan Balasescu
0736679016
Merge pull request #12072 from peppy/include-default-skin-in-random-rotation
Include the bundled skins when selecting a random skin
2021-03-19 19:08:42 +09:00
Dean Herbert
baf4e4e8f6
Merge branch 'master' into tablet-configuration 2021-03-19 19:06:58 +09:00
Dean Herbert
fefb007805 Remove no longer relevant comment 2021-03-19 19:01:32 +09:00
Dean Herbert
1e82033c84 Move bindings to LoadComplete to avoid cross-thread issues 2021-03-19 19:01:32 +09:00
Dean Herbert
b1c4ac9f42 Remove local implementation of Vector2Converter
This has been moved to framework in
https://github.com/ppy/osu-framework/pull/4285.
2021-03-19 19:01:32 +09:00
Dean Herbert
c624aa9397 Only update tablet values on commit 2021-03-19 19:01:32 +09:00
Dean Herbert
6285dcd1a1 Add arbitrary value to fix FP contains check failures 2021-03-19 19:01:32 +09:00
Dean Herbert
e8c20bdcb1 Add centre crosshair 2021-03-19 19:01:32 +09:00
Dean Herbert
fb7d095e4a Show aspect ratio for current usable area 2021-03-19 19:01:32 +09:00
Dean Herbert
196f95ae54 Update to use new bindables and centered area offset 2021-03-19 19:01:32 +09:00
Dean Herbert
9d0c8902a6 Fix margins and spacing between sub flowed items 2021-03-19 19:01:32 +09:00
Dean Herbert
d422a65900 Fix initial tablet size not being initialised 2021-03-19 19:01:32 +09:00
Dean Herbert
9a6a0f3df5 Add test coverage and better UI handling of no tablet connected scenario 2021-03-19 19:01:32 +09:00
Dean Herbert
bba25a0182 Tidy up draw hierarchy and bindable logic 2021-03-19 19:01:31 +09:00
Dean Herbert
932745e5c4 Fix remaining feedback loops 2021-03-19 19:01:31 +09:00
Dean Herbert
e3bed4c97d Simplify aspect ratio application, add window conforming and direct adjustment 2021-03-19 19:01:31 +09:00
Dean Herbert
43359553c1 Add aspect ratio display and limiting 2021-03-19 19:01:31 +09:00
Dean Herbert
9b70f0ee1f Tidy up visual appearance of settings and add a reset button 2021-03-19 19:01:31 +09:00
Dean Herbert
2dc2cb04c3 Fix bounds check becoming false when using full area 2021-03-19 19:01:31 +09:00
Dean Herbert
382109c7a2 Make test scene feel more like settings (width-wise) 2021-03-19 19:01:31 +09:00
Dean Herbert
464702182d Consume device name 2021-03-19 19:01:31 +09:00
Dean Herbert
94f184d113 Add feedback when area extends beyond tablet size 2021-03-19 19:01:31 +09:00
Dean Herbert
0a6525baee Fix slider bars reloading each time the tablet size is changed 2021-03-19 19:01:31 +09:00
Dean Herbert
926e40925e Add exclude rule to fix dynamic compilations issues with settings sections 2021-03-19 19:01:31 +09:00
Dean Herbert
3b7edf1333 Make tablet display always fit to size of settings area 2021-03-19 19:01:31 +09:00
Dean Herbert
d026c8da85 Initial pass of configuration interface 2021-03-19 19:01:31 +09:00
Dean Herbert
563a0584d5 Implement editor timeline stacking support 2021-03-19 18:48:51 +09:00
Dean Herbert
32c571fc94 Adjust keyboard step to be something sensible 2021-03-19 17:13:30 +09:00
Dean Herbert
0195d654ca Increase the precision of speed multiplier to match osu-stable 2021-03-19 17:09:49 +09:00
Dean Herbert
a9c4fa442a Avoid potential crash if an overlay is toggled before it has been loaded 2021-03-19 16:49:09 +09:00
Dean Herbert
711d895a04
Merge pull request #8238 from voidedWarranties/editor-song-end 2021-03-19 16:32:23 +09:00
Dean Herbert
9491e6394a Include the bundled skins when selecting a random skin 2021-03-19 15:46:43 +09:00
Dean Herbert
bf4317d3f0 Ensure looping is disabled on old samples when switching skins 2021-03-19 15:34:21 +09:00
Dean Herbert
0e821e857e Remove unnecessary duplicated skin changed handling
For some reason we were handling this both in `DrawableSkinnableSound`
and `PoolableSkinnableSample` in very similar ways. Only one seems
required.
2021-03-19 15:23:32 +09:00
voidedWarranties
b9761c8196 Further simplify logic 2021-03-18 16:20:31 -07:00
Bartłomiej Dach
b419d2c2e2 Fix invalid xmldoc indent 2021-03-18 19:52:38 +01:00
Bartłomiej Dach
aec859b4d1 Merge branch 'master' into fix-unsafe-skinnable-sample-play 2021-03-18 19:51:46 +01:00
Dan Balasescu
d9ec3c327e
Merge branch 'master' into input-handler-configuration 2021-03-18 22:17:48 +09:00
Dean Herbert
a8cc3a3b44 Implement enable state changes locally for InputHandlers which should be toggleable 2021-03-18 21:17:04 +09:00
Dean Herbert
c694deb7d6 Revert changes to SettingsSourceAttribute class 2021-03-18 21:16:50 +09:00
smoogipoo
917717686a Expand explanatory comment 2021-03-18 19:26:29 +09:00
smoogipoo
b68dc686ee Fix converted mania scores not accounting for GREATs 2021-03-18 19:19:53 +09:00
Dan Balasescu
53ae24db9b
Merge pull request #12058 from peppy/fix-whitespace-in-ini
Fix skin parser not stripping whitespace before parsing
2021-03-18 18:46:28 +09:00
Dean Herbert
5b0d75ee56 Only trim trailing spaces to avoid breakage in storyboard parsing 2021-03-18 16:30:30 +09:00
Dean Herbert
bb3c3f302a Fix skin parser not stripping whitespace before parsing 2021-03-18 15:36:11 +09:00
Dan Balasescu
b3e96c8385
Merge pull request #12043 from bdach/fix-reverse-crash
Fix selection box operation hotkeys not registering in change handler
2021-03-18 13:30:33 +09:00
voidedWarranties
df6570ebf5 Improve logic and add previously failing test
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-17 15:48:55 -07:00
Bartłomiej Dach
f95ce90c95 Adjust kudosu count formatting 2021-03-17 23:32:08 +01:00
Joehu
08ffe425f9 Update kudosu description color in line with web 2021-03-17 14:46:23 -07:00
Bartłomiej Dach
2e63c2ce20 Fix selection box operation hotkeys not registering in change handler
Could lead to crashes after reversing a note cluster and playing it
back.

The root cause of the crash was that the hotkey operations were not ran
inside of an editor change handler operation. This, in turn, caused the
autoplay replay to not be regenerated after flipping an object cluster,
therefore finally manifesting as a hard crash due to negative time
offsets appearing in judgement results, which interfered with the
default implementation of note lock.

Note that this incidentally also fixes the fact that selection box
hotkey operations (reverse and flip) did not handle undo/redo.
2021-03-17 22:17:42 +01:00
Joehu
599c55fca5 Update total kudosu earned description text in line with web 2021-03-17 13:22:00 -07:00
Joehu
6cea74f0fa Remove available kudosu section from user profile overlay in line with web 2021-03-17 13:21:41 -07:00
Bartłomiej Dach
a691291ae8 Merge branch 'master' into editor-song-end 2021-03-17 18:18:19 +01:00
Dan Balasescu
5a7e416495
Merge pull request #12027 from peppy/new-beatmap-empty-fields
Don't fill beatmap metadata with template values on creating a new beatmap
2021-03-17 19:36:21 +09:00
Nathan Alo
51e0304c54 properly format strings per ruleset 2021-03-17 18:31:09 +08:00
Nathan Alo
133ff085a5 refactor code 2021-03-17 18:06:40 +08:00
Nathan Alo
8046b5a818 set text to platform clipboard on copy 2021-03-17 17:35:49 +08:00
Dean Herbert
e0c0107461 Merge branch 'update-config-usages' into input-handler-configuration 2021-03-17 18:08:13 +09:00
Dean Herbert
fccd495f27 Remove obsoleted setting for now 2021-03-17 18:07:51 +09:00
Dean Herbert
577d40d8d1 Update framework 2021-03-17 18:05:18 +09:00
Dean Herbert
249ab8ab3d Merge branch 'master' into input-handler-configuration 2021-03-17 18:05:14 +09:00
Dean Herbert
a1a0074c32 Revert "Local framework"
This reverts commit b9b095ee75.
2021-03-17 18:05:11 +09:00
Dean Herbert
d0e61e5b4d Put back the label 2021-03-17 17:14:04 +09:00
Dean Herbert
3b6a1180b6 Remove non-accessed field 2021-03-17 17:02:11 +09:00
Dean Herbert
5adc675862 Focus artist textbox on entering song setup if fields are empty 2021-03-17 16:57:14 +09:00
Dean Herbert
26d6f96c4e Fix LabelledTextBox not correctly forwarding focus to its underlying TextBox component 2021-03-17 16:56:58 +09:00
Dean Herbert
eda891223c Start the editor with empty artist/creator/difficulty name fields 2021-03-17 16:47:12 +09:00
smoogipoo
7fa5fd5647 Update usages of config with framework changes 2021-03-17 16:10:16 +09:00
Dean Herbert
c7740d1181 Fix opening the editor occasionally causing a hard crash due to incorrect threading logic
Setting one of the global screen `Bindable`s (in this case, `Beatmap`)
is not valid from anywhere but the update thread. This changes the order
in which things happen during the editor startup process to ensure
correctness.

Closes #11968.
2021-03-17 15:52:25 +09:00
smoogipoo
b495504cae Merge branch 'master' into fix-mouse-disable-default-indicator 2021-03-16 10:58:56 +09:00
smoogipoo
da3dc61aae Remove newline 2021-03-16 10:58:42 +09:00
Joehu
393f1fbd3f Remove skype 2021-03-15 10:07:50 -07:00
Dean Herbert
f3faad74d5
Merge pull request #12003 from UselessToucan/ef_core_5 2021-03-15 15:05:32 +09:00
Joehu
3dd72d6f7d Fix disable mouse buttons setting not showing default indicator when using keybind 2021-03-14 22:47:05 -07:00
Dean Herbert
1e519f0d31 Fix seemingly innocent logic change causing breakage in score imports 2021-03-15 14:20:59 +09:00
Dean Herbert
6d4c1ba2ae Fix a couple of new inspections introduced in Rider EAPs 2021-03-15 13:35:08 +09:00
Dean Herbert
fce21f23d6 Add comments marking workarounds required for EFcore 5 2021-03-15 13:29:26 +09:00
Dean Herbert
2904f479c6 Share file lookup workaround in ArchiveModelManager with workaround extensions class 2021-03-15 13:26:14 +09:00
Dean Herbert
79d3379f55 Reformat application of configuration 2021-03-15 13:20:22 +09:00
Dean Herbert
8a35533889 Add fall-through case to catch a potential requery for unsupported model type 2021-03-15 13:11:58 +09:00
Dean Herbert
2bdffd1004 Move skin requery logic into extension methods 2021-03-15 13:11:58 +09:00
Dean Herbert
900da7b891 Rename and refactor extenion methods to be easier to read 2021-03-15 13:11:58 +09:00
Roman Kapustin
28ef64b62a Explicitly specify SingleQuery behavior 2021-03-14 21:43:27 +03:00
Roman Kapustin
0a1e325fc7 Extract requerying of navigational properties from DbContext 2021-03-14 19:34:53 +03:00
Bartłomiej Dach
6438a7ee12
Merge branch 'master' into user-hide-toolbar-forever 2021-03-13 17:31:37 +01:00
Dean Herbert
a227b0a581 Build on xmldoc with rationale 2021-03-13 23:29:47 +09:00
Dean Herbert
e70ba2d005 Remove unnecessary second variable 2021-03-13 23:29:01 +09:00
Dean Herbert
4afbccfcff Fix initial operation potentially running before DI is completed 2021-03-13 19:30:40 +09:00
Dean Herbert
b13f193c8d Fix incorrect task being returned for changelog continuations 2021-03-13 19:26:38 +09:00
Joehu
0ba5312a40 Move blocking show logic to UpdateState 2021-03-13 00:05:26 -08:00
Joehu
5999e4ba33 Add xmldoc for hiddenbyuser bool 2021-03-12 20:18:32 -08:00
Salman Ahmed
43c1e1d217 Update existing usages
Resolve post-conflict issues
2021-03-13 06:09:07 +03:00
Salman Ahmed
2a2ee3fa5e Update legacy sprite text constructor 2021-03-13 06:05:36 +03:00
Salman Ahmed
64d1cb5193 Remove text skin components in favour of plain LegacySpriteTexts 2021-03-13 06:05:36 +03:00
Salman Ahmed
91741564e8 Add legacy font enum and extensions 2021-03-13 06:05:36 +03:00
Salman Ahmed
115c186cb7 Move hit circle font from osu! ruleset 2021-03-13 06:05:36 +03:00
Joehu
62f2a823f6 Hide toolbar forever when the user hides it 2021-03-12 15:48:50 -08:00
Joehu
6c0734a09f Handle global action in toolbar instead of osugame 2021-03-12 15:48:49 -08:00
Dean Herbert
86164c027a Update the method we use to reset input settings 2021-03-12 18:44:10 +09:00
Dean Herbert
3458dcc33a Use whitelist to avoid exposing settings to user that shouldn't be 2021-03-12 18:40:38 +09:00
Dean Herbert
03230edcb1 Update bindings settings to handle the new structure and show all handlers 2021-03-12 18:38:16 +09:00
Dean Herbert
8635abbc4a Add the ability to not get controls for disabled bindables 2021-03-12 18:37:55 +09:00
Dean Herbert
3c21c83cc8 Rename KeyboardSection to BindingSection 2021-03-12 18:36:28 +09:00
Dean Herbert
4374e7da81 Convert bindable names to human readable sentences 2021-03-12 18:34:22 +09:00
Dean Herbert
a33ffd56b8 Allow CreateSettingsControls to work with all bindables in target class 2021-03-12 18:34:22 +09:00
Dean Herbert
b9b095ee75 Local framework 2021-03-12 18:34:22 +09:00
Dean Herbert
e7707eee94 Switch RestoreDefaultsValueButton to use HasPendingTasks to avoid tooltip always showing 2021-03-12 15:23:11 +09:00
Roman Kapustin
a60ff80c04 Use expression body in ModsJson get accessor 2021-03-12 00:02:29 +03:00
Roman Kapustin
5a4b0174b1 Ignore MultipleCollectionIncludeWarning 2021-03-11 22:40:35 +03:00
Roman Kapustin
d2f943395d Hotfix importing scores from stable 2021-03-11 22:12:47 +03:00
Roman Kapustin
c6c616f244 Actualize tests 2021-03-11 21:02:40 +03:00
Roman Kapustin
47b80d2474 Workaround InvalidOperation exceptions 2021-03-11 20:51:54 +03:00
Roman Kapustin
f1302d1600 Update Microsoft.EntityFrameworkCore 2021-03-11 19:23:56 +03:00
Dan Balasescu
023af75cc3
Merge branch 'master' into fix-storyboard-alpha-start-time-woes 2021-03-11 22:09:56 +09:00
Dean Herbert
efb4a366d4
Fix xmldoc explaining incorrect behaviour
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-11 12:15:59 +09:00
Dean Herbert
8aaba32431 Fix storyboard commands occurring before the earliest point of visibility delaying gameplay
In osu-stable, storyboard intros start from the first command, but in
the case of storyboard drawables which have an initial hidden state, all
commands before the time at which they become visible (ie. the first
command where `Alpha` increases to a non-zero value) are ignored.

This brings lazer in line with that behaviour. It also removes several
unnecessary LINQ calls.

Note that the alpha check being done in its own pass is important, as
it must be the "minimum present alpha across all command groups,
including loops". This is what makes the implementation slightly
complex.

Closes #11981.
2021-03-09 15:55:12 +09:00
Dean Herbert
dc9028d24a Update framework 2021-03-09 14:27:29 +09:00
Dean Herbert
9b5d11f2a5
Merge pull request #11958 from bdach/ruleset-filter-v3
Allow rulesets to specify custom song select filtering criteria
2021-03-08 23:23:24 +09:00
Dan Balasescu
ff2327ffac
Merge branch 'master' into configure-await-false 2021-03-08 22:24:29 +09:00
Dean Herbert
b1cd01ceb8 Apply ConfigureAwait changes to game side 2021-03-08 14:36:35 +09:00
Dean Herbert
765cc5cf37 Remove iOS multiplayer blocking code 2021-03-08 14:35:22 +09:00
Dean Herbert
85bad1ab89
Merge pull request #11934 from ppy/dependabot/nuget/Microsoft.Extensions.Configuration.Abstractions-5.0.0
Bump Microsoft.Extensions.Configuration.Abstractions from 2.2.0 to 5.0.0
2021-03-08 14:07:43 +09:00
Dean Herbert
f46880f68a Merge branch 'master' into intro-triangles-background-access 2021-03-08 13:31:09 +09:00
Dean Herbert
74fc5d5b8c Fix potential cross-thread drawable mutation in IntroTriangles 2021-03-08 13:30:07 +09:00
dependabot-preview[bot]
d961d110bf
Bump Microsoft.Extensions.Configuration.Abstractions from 2.2.0 to 5.0.0
Bumps [Microsoft.Extensions.Configuration.Abstractions](https://github.com/dotnet/runtime) from 2.2.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits/v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-08 02:58:52 +00:00
Dean Herbert
2b1ab3576b
Merge branch 'master' into migrate-country-rank 2021-03-08 11:07:25 +09:00
Bartłomiej Dach
95902dfb8e
Merge branch 'master' into fix-legacy-combo-counter-depth 2021-03-07 16:15:31 +01:00
Dean Herbert
503f29609a Also set additive mode to match stable 2021-03-07 23:40:09 +09:00
Joehu
3e4dfdb675 Fix pop out count being above displayed count on legacy combo counter 2021-03-06 20:37:27 -08:00
Bartłomiej Dach
06e42b4b4c Fix taiko leaving behind empty judgements on legacy skins 2021-03-06 16:02:20 +01:00
Bartłomiej Dach
12b7d9e06d Simplify custom filter criteria retrieval 2021-03-06 12:16:01 +01:00
Bartłomiej Dach
f00089846b Merge branch 'master' into ruleset-filter-v3 2021-03-06 12:14:53 +01:00
Dean Herbert
b241749119
Merge pull request #11928 from smoogipoo/fix-test-multiplayer-beatmap 2021-03-04 23:43:55 +09:00
Salman Ahmed
132fcda089 Force config sensitivity value to local setting bindable
Re-enable the local bindable to update the sensitivity value then change back to whatever state it was in previously.
2021-03-04 17:00:44 +03:00
Salman Ahmed
fe64c3dbd4 Refrain from disabling cursor sensitivity at config-level 2021-03-04 17:00:44 +03:00
Dan Balasescu
5b6018295d
Merge branch 'master' into diffcalc/skill-mods 2021-03-04 13:06:26 +09:00
Bartłomiej Dach
f733d1ec1f Expose and document query parser and helpers 2021-03-03 22:03:01 +01:00
Bartłomiej Dach
f9148eec20 Refactor filter query parsing helper methods
In preparation for exposition as public.
2021-03-03 21:34:14 +01:00
Dan Balasescu
6d4391de15
Merge pull request #11957 from peppy/move-mouse-settings-load-complete
Move bindable logic in MouseSettings to LoadComplete
2021-03-03 22:43:24 +09:00
Dean Herbert
534e16237a Remove unnecessary intial construction of bindable 2021-03-03 20:36:41 +09:00
Dean Herbert
23a46819dc
Merge branch 'master' into multiplayer-confirm-on-exit 2021-03-03 20:35:31 +09:00
Dean Herbert
0f5bce70ad Split confirmation dialog classes apart 2021-03-03 20:34:37 +09:00
Dan Balasescu
a25b21b98f
Merge pull request #11955 from peppy/fix-multiplayer-beatmap-selection-exiting-game
Fix selecting a beatmap at the multiplayer match screen exiting the match
2021-03-03 19:40:28 +09:00
smoogipoo
6affe33fb2 Fix another test scene 2021-03-03 19:40:19 +09:00
smoogipoo
012b48dbe5 Remove explicit public definition
Interface members are public by default.
2021-03-03 19:03:45 +09:00
Dean Herbert
002646370c Move bindable logic in MouseSettings to LoadComplete 2021-03-03 16:47:42 +09:00
Dean Herbert
0ede28da2f Fix test failures due to missing dependency 2021-03-03 15:24:55 +09:00
Dean Herbert
cb4c3503a0 Confirm exiting a multiplayer match 2021-03-03 14:54:18 +09:00
Dean Herbert
d332fd2414 Handle case where local user tries to change beatmap while not the host 2021-03-03 14:53:47 +09:00
Dean Herbert
7dce9b04fa Add a more basic ConfirmDialog implementation 2021-03-03 14:50:45 +09:00
Dean Herbert
7c59040082 Re-present even when already the current beatmap
This feels better and closer to what a user would expect.
2021-03-03 14:17:07 +09:00
Dean Herbert
fcea900a53 Move main menu (song select) presentation logic to a local implementation
Reduces cross-dependencies between OsuGame and MainMenu.
2021-03-03 14:13:51 +09:00
Dean Herbert
36e1fb6da8 Add flow to allow MatchSubScreen to handle beatmap presentation locally 2021-03-03 14:13:51 +09:00
Dean Herbert
6e75ebbb06 Add interface to handle local beatmap presentation logic 2021-03-03 14:13:48 +09:00
Bartłomiej Dach
42c3309d49 Use ruleset criteria in parsing and filtering 2021-03-02 20:11:21 +01:00
Bartłomiej Dach
c375be6b07 Instantiate ruleset criteria 2021-03-02 20:10:03 +01:00
Bartłomiej Dach
14e249a134 Add ruleset interface for extending filter criteria 2021-03-02 20:07:11 +01:00
Bartłomiej Dach
e46543a4a9 Constrain operator parsing better 2021-03-02 19:56:36 +01:00
Bartłomiej Dach
26736d990f Enable filter parsing extensibility 2021-03-02 19:42:47 +01:00
Bartłomiej Dach
3b125a26a8 Add test coverage 2021-03-02 19:21:03 +01:00
Bartłomiej Dach
40a28367c6 Fix restore-to-default buttons never showing if initially hidden 2021-03-02 18:50:33 +01:00
Dan Balasescu
dc7573f7c7
Merge pull request #11943 from peppy/remove-simple-finalizers
Remove easy to remove finalizers
2021-03-02 20:53:09 +09:00
Dan Balasescu
2aae9b6600
Merge branch 'master' into remove-working-beatmap-finalizer 2021-03-02 19:14:16 +09:00
Dan Balasescu
20825b4b78
Merge pull request #11945 from peppy/fix-confine-setting-disable-mode
Fix confine mode dropdown becoming visible again after filtering
2021-03-02 19:06:49 +09:00
smoogipoo
30ff0b83c1 Fix test failures due to unpopulated room 2021-03-02 19:06:21 +09:00
Dean Herbert
0300a55447 Update framework 2021-03-02 18:00:50 +09:00
Dean Herbert
6372a0265a Fix confine mode dropdown becoming visible again after filtering
Changes from a hidden to a disabled state, with a tooltip explaining
why.

Closes #11851.
2021-03-02 17:44:58 +09:00
Dean Herbert
103dd4a6ce Remove WorkingBeatmap's finalizer 2021-03-02 16:14:43 +09:00
Dean Herbert
c4ba045df1 Add note about finalizers required for audio store clean-up 2021-03-02 16:07:51 +09:00
Dean Herbert
fa95929121 Remove easy to remove finalizers 2021-03-02 16:07:09 +09:00
dependabot-preview[bot]
7829a0636e
Bump Sentry from 3.0.1 to 3.0.7
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.0.1 to 3.0.7.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/3.0.1...3.0.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-02 00:43:47 +00:00
Dean Herbert
22da76c510
Merge pull request #11937 from ppy/dependabot/nuget/SharpCompress-0.28.1
Bump SharpCompress from 0.27.1 to 0.28.1
2021-03-02 09:42:53 +09:00
Salman Ahmed
2609b22d53 Replace usage of CurrentModeRank in line with API change 2021-03-01 23:07:25 +03:00
dependabot-preview[bot]
9db37e62d8
Bump Microsoft.AspNetCore.SignalR.Protocols.MessagePack
Bumps [Microsoft.AspNetCore.SignalR.Protocols.MessagePack](https://github.com/dotnet/aspnetcore) from 5.0.2 to 5.0.3.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.2...v5.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-01 20:05:53 +00:00
dependabot-preview[bot]
2d3c3c18d4
Bump SharpCompress from 0.27.1 to 0.28.1
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.27.1 to 0.28.1.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.27.1...0.28.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-01 20:05:35 +00:00
Salman Ahmed
fe54a51b5a Remove UserRanks object and move to outer country_rank property 2021-03-01 22:42:20 +03:00
smoogipoo
7adb33f40e Fix beatmap getting nulled due to failing web request 2021-03-01 17:24:54 +09:00
smoogipoo
f7e4cfa4d0 Fix initial room settings not being returned correctly 2021-03-01 17:24:32 +09:00
smoogipoo
97bb217830 Fix test room playlist items not getting ids 2021-03-01 17:24:05 +09:00
Dean Herbert
3bb46cd8cc
Merge pull request #11916 from bdach/restore-default-transform-mutation
Fix restore default button potentially mutating transforms during load
2021-02-28 12:40:17 +09:00
Bartłomiej Dach
7e17c5ab71 Trim yet another array copy 2021-02-27 15:46:18 +01:00
Bartłomiej Dach
1e56d2cbba Make SettingSourceAttribute implement IComparable 2021-02-27 15:30:08 +01:00
Bartłomiej Dach
528de5869e Fix multiple enumerations when ordering setting sources
This was not spotted previously, because the base `Attribute` overrides
`Equals()` to have semantics similar to structs (per-field equality) by
using reflection. That masked the issue when strings were used, and
migrating to `LocalisableString` revealed it, as that struct's
implementation of equality currently uses instance checks.

Whether `LocalisableString.Equals()` is the correct implementation may
still be up for discussion, but allowing multiple enumeration is wrong
anyway, since the underlying enumerables are live (one especially is a
yield iterator, causing new object instances to be allocated).
2021-02-27 14:58:01 +01:00
Bartłomiej Dach
52e81385a6 Fix restore default button mutating transforms during load 2021-02-27 11:39:18 +01:00
Dean Herbert
4fd8501c86 Remove unnecessary using (underlying enumerator change) 2021-02-26 20:03:03 +09:00
Dean Herbert
98d525d1db Update framework 2021-02-26 19:56:10 +09:00
Dan Balasescu
b1702273c8
Merge pull request #11904 from peppy/editor-centralise-selection-change-handling
Centralise cases of performing actions on the current selection
2021-02-26 19:01:30 +09:00
Dan Balasescu
e80db89def
Merge pull request #11903 from peppy/fix-chat-post-error-display
Show API human readable error message when chat posting fails
2021-02-26 19:00:17 +09:00
Dan Balasescu
d7f3519bd7
Merge pull request #11907 from peppy/fix-import-from-stable-no-beatmaps-message
Fix "failed to import" message showing when importing from a stable install with no beatmaps
2021-02-26 18:45:54 +09:00
Dean Herbert
7e6bd0e995 Fix "failed to import" message showing when importing from a stable install with no beatmaps 2021-02-26 17:30:59 +09:00
Dean Herbert
3e65dfb9e7 Reduce allocation overhead when notification overlay has visible notifications 2021-02-26 17:11:47 +09:00
Dean Herbert
cd1c1bf534 Centralise cases of performing actions on the current selection
By moving this to a central location, we can avoid invoking the
EditorChangeHandler when there is no selection made. This helps
alleviate the issue pointed out in
https://github.com/ppy/osu/issues/11901, but not fix it completely.
2021-02-26 14:15:13 +09:00
Dean Herbert
254f9bb58b Show API human readable error message when chat posting fails
Closes #11902.
2021-02-26 13:38:00 +09:00
Bartłomiej Dach
d0decc73be Merge branch 'master' into beatmap-difficulty-cache-nullable 2021-02-25 19:40:38 +01:00
Dean Herbert
a792c3f13c
Merge pull request #11900 from peppy/update-bpm-with-mods
Update the displayed BPM at song select with rate adjust mods
2021-02-26 00:25:55 +09:00
smoogipoo
01a4815412 Make labels disappear on null beatmap/no hitobjects 2021-02-25 23:36:02 +09:00
Dan Balasescu
46ea0f44eb
Merge branch 'master' into beatmap-difficulty-cache-nullable 2021-02-25 22:52:15 +09:00
Dan Balasescu
8e12dd98f9
Merge pull request #11897 from peppy/fix-song-select-star-rating-display-zero-flashing
Fix the star rating display at song select flashing to zero when changing mods
2021-02-25 22:51:35 +09:00
smoogipoo
c1f27ba938 Merge branch 'master' into fix-song-select-star-rating-display-zero-flashing 2021-02-25 22:13:48 +09:00
smoogipoo
c3eb44137b Move ValueChanged bind back to load() 2021-02-25 22:09:41 +09:00
smoogipoo
649ce20e35 Fix up super weird and super wrong DI 2021-02-25 22:01:53 +09:00
smoogipoo
b090a82b35 Merge branch 'master' into update-bpm-with-mods 2021-02-25 21:58:54 +09:00
smoogipoo
de417a660d Make BPM update with changes in mod settings 2021-02-25 21:51:32 +09:00
smoogipoo
98313a98bf DI mods in parent class and pass them down 2021-02-25 21:48:02 +09:00
Dean Herbert
8004652d27
Merge branch 'master' into optimised-has-flag-checks 2021-02-25 21:24:39 +09:00
Dean Herbert
3802cb29a4 Fix failing tests doing reference comparisons between string and LocalisedString 2021-02-25 17:49:54 +09:00
Dean Herbert
6d1c5979ea Update framework 2021-02-25 17:28:59 +09:00
Dean Herbert
90e8308716 Merge branch 'master' into localisation-refactor-framework 2021-02-25 17:28:55 +09:00
Dean Herbert
2db4b793d7 Also handle most common BPM display 2021-02-25 17:05:00 +09:00
Dean Herbert
31c52bd585 Update the displayed BPM at song select with rate adjust mods
This only covers constant rate rate adjust mods. Mods like wind up/wind
down will need a more complex implementation which we haven't really
planned yet.
2021-02-25 17:00:44 +09:00
Dean Herbert
5fa9bf61b6 Update xmldoc 2021-02-25 16:22:40 +09:00
Dean Herbert
03771ce8ec Allow determining a BeatmapDifficultyCache's bindable return's completion state via nullability 2021-02-25 16:19:01 +09:00
Dean Herbert
9f3ceb99eb Fix the star rating display at song select flashing to zero when changing mods
Due to the use of bindable flow provided by `BeatmapDifficultyCache` in
this usage, the display would briefly flash to zero while difficulty
calculation was still running (as there is no way for a consumer of the
provided bindable to know whether the returned 0 is an actual 0 SR or a
"pending" calculation).

While I hope to fix this by making the bindable flow return nullable
values, I think this particular use case works better with non-bindable
flow so have switched across to that.
2021-02-25 16:05:13 +09:00
smoogipoo
dff1d80f39 Update HasFlag usages to HasFlagFast 2021-02-25 15:38:56 +09:00
Dean Herbert
2c8e62ae35 Fix toolbar not completing enough of layout to propagate hotkeys to buttons before initial display 2021-02-25 14:52:51 +09:00
Dean Herbert
e82eaffaed Flip order back to original for romanisable strings 2021-02-25 14:14:07 +09:00
Dean Herbert
4cdde42228 Remove unnecessary backing field 2021-02-25 14:08:01 +09:00
Dean Herbert
a362382d38 Add back more correct null checks 2021-02-25 14:06:21 +09:00
Dean Herbert
67773c42ef
Merge pull request #11888 from H2n9/modtimeramp-new-behaviour 2021-02-25 14:01:57 +09:00
Bartłomiej Dach
421b7877d4 Avoid mixing precision across time ramp bindables
Bears no functional difference, it's just a bit less of an eyesore.
2021-02-24 19:16:10 +01:00
Ronnie Moir
73d6a3687e Change rate correction logic to be more explicit 2021-02-24 14:40:56 +00:00
Dan Balasescu
3e2b21a9b4
Merge pull request #11892 from peppy/allow-collection-name-collisions
Fix crash on two collections existing with the same name
2021-02-24 23:08:05 +09:00
Dan Balasescu
a7d10630e0
Merge pull request #11893 from peppy/fix-request-queue-reference-holding
Fix requests being indefinitely queued when user is offline
2021-02-24 23:07:02 +09:00
Dean Herbert
fa6d797adf Remove redundant prefix 2021-02-24 20:30:17 +09:00
Dean Herbert
9ed8d902f7 Fix requests being indefinitely queued when user is offline 2021-02-24 19:57:42 +09:00
Dean Herbert
5dc0aefb2b Cancel request on leaving results screen 2021-02-24 19:54:52 +09:00
Dean Herbert
0c202e0777
Merge branch 'master' into fix-selecting-incompatible-freemods 2021-02-24 19:24:04 +09:00
Dean Herbert
165da32044 Fix dropdown crash on collection name collisions 2021-02-24 18:41:42 +09:00
Dan Balasescu
c0f21c8cbe
Merge branch 'master' into fix-selecting-incompatible-freemods 2021-02-24 15:10:48 +09:00
smoogipoo
0b44d2483b Make some properties virtual
I think they were intended to be this way from the beginning.
2021-02-24 15:03:41 +09:00
smoogipoo
14160b897e Fix references to ModSuddenDeath 2021-02-24 14:44:53 +09:00
smoogipoo
30a58691f0 Make SD and PF incompatible with each other 2021-02-24 14:34:37 +09:00
Dan Balasescu
a229c3a0f4
Merge pull request #11882 from peppy/fix-import-collections-twice-crash
Fix importing collections twice from stable causing a hard crash
2021-02-24 14:31:54 +09:00
Dan Balasescu
de48b7c8c8
Merge branch 'master' into fix-import-collections-twice-crash 2021-02-24 13:25:31 +09:00
Dan Balasescu
90e515aadd
Merge branch 'master' into disable-all-mouse-buttons 2021-02-24 13:25:28 +09:00
Dan Balasescu
cfea4c7d4d
Merge pull request #11881 from peppy/disable-hub-connections-on-ios
Disable multiplayer/spectator on iOS until it can be supported again
2021-02-24 13:09:03 +09:00
Dean Herbert
e1f71038e3 Remove unncessary action 2021-02-24 12:13:55 +09:00
Dean Herbert
71182347d6 Also add a notifiation when trying to enter the multiplayer screen
Turns out the only check required to get into this screen was that the
API was online, which it always is even if the multiplayer component
isn't.

This provides a better end-user experience.
2021-02-24 11:30:14 +09:00
Ronnie Moir
f6d3cd6413 Change SamplePlaybackWithRateMods to use rate calulated from the sample
Replace hardcoded numbers
2021-02-23 21:25:59 +00:00
Bartłomiej Dach
6dc0cf5ea9
Merge branch 'master' into fix-import-collections-twice-crash 2021-02-23 22:14:25 +01:00
Ronnie Moir
7394c62cc8 Make ModTimeRamp and ModRateAdjust incompatible 2021-02-23 18:10:03 +00:00
Ronnie Moir
a6e840634b Adjust scrubbing behaviour to allow dragging through rate values 2021-02-23 15:52:53 +00:00
Ronnie Moir
f45cedeb85 Adjust initial and final rate ranges and prevent them from overlapping 2021-02-23 15:38:09 +00:00
Dean Herbert
e679a1916f
Merge pull request #11833 from frenzibyte/fix-pofl-on-cooldown
Keep pausing gameplay on focus loss if cannot on first attempt
2021-02-24 00:15:58 +09:00
Dean Herbert
c514233141 Fix importing collections twice from stable causing a hard crash
Somehow a bindable equality check failure got through review. Not sure
if there's some way to protect against this going forward, but we may
want to.
2021-02-23 15:57:43 +09:00
Dean Herbert
664d243003 Disable multiplayer/spectator on iOS until it can be supported again 2021-02-23 15:22:46 +09:00
Dean Herbert
ec4b770cba Remove unused using statement 2021-02-23 14:56:03 +09:00
Dean Herbert
672fd3f9d2 When disable mouse buttons during gameplay is selected, disable more globally
Until now the disable setting would only apply to left/right buttons,
and only in gameplay. This change will cause any global actions bound to
mouse buttons to also not work during gameplay.

Closes #11879.
2021-02-23 14:37:46 +09:00
Dean Herbert
6a5c6febc5 Add inline comment explaining the retry loop 2021-02-23 13:23:32 +09:00
Salman Ahmed
5493c55da7 Fix silly mistake 2021-02-22 16:59:35 +03:00
Salman Ahmed
5e9040c291 Use "pausing supported" conditional instead 2021-02-22 16:26:35 +03:00
Dean Herbert
8a97e2e28d Update LocalisedString usages to RomanisedString 2021-02-22 19:01:42 +09:00
Dean Herbert
1fd76ea3fb Apply changes to UI components overriding functions with changing signatures 2021-02-22 19:01:42 +09:00
smoogipoo
f48e017ac9 Move nested class to bottom of file 2021-02-22 18:34:05 +09:00
smoogipoo
0bda9e4b79 Implement some new methods 2021-02-22 18:31:33 +09:00
smoogipoo
ee6a94273d Merge branch 'master' into fix-unsafe-skinnable-sample-play 2021-02-22 18:31:27 +09:00
smoogipoo
d985b8ab2a Increase beatmapset download timeout 2021-02-22 17:14:39 +09:00
Salman Ahmed
6bac83964a Merge branch 'master' into fix-pofl-on-cooldown 2021-02-22 10:03:27 +03:00
smoogipoo
ccb83ef3a3 Fix checkbox not being updated 2021-02-22 15:47:47 +09:00
Dean Herbert
fde026d443 Remove redundant interface specification 2021-02-22 14:54:48 +09:00
Dean Herbert
63dd55c92c Add missing methods from updated audio component interface implementation 2021-02-22 14:18:52 +09:00
Dean Herbert
e2c5dded7f Update framework 2021-02-22 14:14:36 +09:00
smoogipoo
8d463987dd Fix being able to select incompatible freemods 2021-02-22 13:24:24 +09:00
Dan Balasescu
8037b101cb
Merge branch 'master' into perform-from-subscreen-support 2021-02-22 11:55:51 +09:00
Samuel Cattini-Schultz
66643a97b0 Add a list of mods to Skill class
Although this isn't necessary for existing official rulesets and calculators, custom calculators can have use cases for accessing mods in difficulty calculation.
For example, accounting for the effects of visual mods.
2021-02-20 20:37:44 +11:00
Samuel Cattini-Schultz
442347df8e Fix clockrate adjusted difficulty calculations bug in strain decay
When starting a new section, the starting strain value was calculated using the unadjusted timing value, meaning decay curves were essentially being stretched or squashed according to the clockrate.

This caused incorrect strain peaks for any section where the peak occurs at the start of the section (none of the objects in the section added enough strain after decay to exceed the starting strain).

This bug caused star ratings with clockrates above 1 to be lower than they should and below 1 to be higher than they should.
2021-02-20 20:23:49 +11:00
Dean Herbert
3b7ebfa2ac Update framework 2021-02-20 17:17:31 +09:00
Dean Herbert
38a2124921 Support instant exit if pausing is not allowed in the current game mode 2021-02-20 14:26:50 +09:00
Dean Herbert
5eee46074c Ensure the current screen is current when a sub screen is found as the target 2021-02-19 19:45:29 +09:00
Dan Balasescu
52372fe50d
Merge pull request #11713 from peppy/fix-error-exit-during-results-transition
Fix a potential crash when exiting play during the results screen transition
2021-02-19 18:39:21 +09:00
Dan Balasescu
9fc57b2145
Merge pull request #11832 from peppy/leaderboard-compact-mode
Show compact leaderboard during gameplay to reduce distractions
2021-02-19 18:17:46 +09:00
Dean Herbert
362e4802f7 Add the ability for PerformFromMenuRunner to inspect nested screen stacks 2021-02-19 17:58:04 +09:00
Salman Ahmed
0771154dd2 Make PauseCooldownActive protected and expose on test class 2021-02-19 11:42:30 +03:00
Salman Ahmed
ddd1dcff88 Attempt pausing every single frame 2021-02-19 11:33:26 +03:00
Dean Herbert
82cc06ca57 Fix new logic not considering fail overlay correctly 2021-02-19 17:26:54 +09:00
Dean Herbert
4c214b74ce Merge branch 'master' into fix-error-exit-during-results-transition 2021-02-19 17:13:55 +09:00
Dean Herbert
b8c1e8ed7a
Merge pull request #11708 from frenzibyte/multiplayer-participant-rank
Display user global rank for multiplayer room participants
2021-02-19 16:57:30 +09:00
Dean Herbert
e4d3c91ff4
Merge pull request #11819 from peppy/update-framework
Update implementation of AdjustableAudioComponents in line with framework changes
2021-02-19 16:57:03 +09:00
Dean Herbert
781379826b
Merge pull request #11793 from peppy/playlists-freemod-support
Add "free mod" user mod selection support to the playlists system
2021-02-19 16:56:21 +09:00
Dean Herbert
9d02f589fe Compact leaderboard during gameplay 2021-02-19 16:51:39 +09:00
Salman Ahmed
4436585aa4 Keep attempting to pause gameplay while window not active 2021-02-19 10:46:32 +03:00
Salman Ahmed
772471a6d8 Add failing test case 2021-02-19 10:46:31 +03:00
Dean Herbert
691cfa5bc3 Add expanded/compact display modes for GameplayLeaderboard 2021-02-19 16:46:30 +09:00
Dean Herbert
ee9e6fff40 Add bindable flow for expanded leaderboard state 2021-02-19 15:09:41 +09:00
Dan Balasescu
a6d163619a
Merge pull request #11827 from peppy/perform-from-screen-subclass-support
Allow beatmap imports from any derived version of SongSelect, rather than only PlaySongSelect
2021-02-19 15:05:18 +09:00
Dean Herbert
484968d797
Fix weird bool check
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-02-19 14:46:10 +09:00
Dean Herbert
4504023a23 Merge branch 'master' into playlists-freemod-support 2021-02-19 14:43:59 +09:00
Dean Herbert
39059ed82d Remove unnecessary null coalesce check 2021-02-19 14:36:51 +09:00
Dean Herbert
df05c57f44 Merge branch 'master' into playlists-freemod-support 2021-02-19 14:35:20 +09:00
Dean Herbert
a2aec6bcdc
Merge pull request #11808 from smoogipoo/multiplayer-no-playlist-mangling
Rework multiplayer playlist handling to support multiple items
2021-02-19 14:33:53 +09:00
Dean Herbert
1701d69a60 Fix calls to IsAssignableFrom being back-to-front 2021-02-19 14:33:08 +09:00
Dean Herbert
95d62d03e2
Merge pull request #11826 from frenzibyte/fix-score-type-wrong-order
Fix misordered hit error in score meter types
2021-02-19 14:16:57 +09:00
Dean Herbert
87edf67879 Update framework 2021-02-19 14:07:39 +09:00
smoogipoo
c0e0bd4f42 Add compatibility with old server build 2021-02-19 13:57:04 +09:00
Dean Herbert
85a844a378 Restructure class slightly 2021-02-19 13:40:12 +09:00
smoogipoo
183a481a34 Refactor playlist update to remove .Contains() check 2021-02-19 13:32:32 +09:00
Dean Herbert
841c2c56d9 Remove confusing pp_rank include (will be removed osu-web side too) 2021-02-19 13:30:42 +09:00
smoogipoo
bc10fcafae Remove now unnecessary schedule 2021-02-19 13:23:51 +09:00
Dean Herbert
b68dbbceff
Merge branch 'master' into multiplayer-participant-rank 2021-02-19 13:16:44 +09:00
Dan Balasescu
f32a2739ec
Merge pull request #11823 from peppy/online-overlay-login-placeholder
Add login placeholder logic to OnlineOverlay
2021-02-19 11:53:04 +09:00
Dean Herbert
4caca9653a Update framework 2021-02-19 10:39:56 +09:00
Dean Herbert
ce0011f710 Merge branch 'master' into update-framework 2021-02-19 10:39:50 +09:00
Dan Balasescu
6240d3964c
Merge pull request #11817 from peppy/fix-collection-dropdown-cross-thread-manipulation
Fix potential crash from cross-thread drawable manipulation in CollectionFilterDropdown
2021-02-19 10:06:42 +09:00
Dan Balasescu
28550f19e8
Merge branch 'master' into online-overlay-login-placeholder 2021-02-19 10:06:25 +09:00
Dean Herbert
10ec4cd8e0 Revert change to loading layer's default state 2021-02-18 22:38:17 +09:00