1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 18:47:26 +08:00
Commit Graph

36110 Commits

Author SHA1 Message Date
Dean Herbert
707d5346c9 Merge branch 'master' into fix-spinner-spinning-weirdness 2021-01-18 18:26:44 +09:00
Dan Balasescu
7e30489167
Merge pull request #11525 from peppy/fix-editor-selection-box-non-visible-hitobjects
Fix selection box not updating with hitcircles/sliders far in the future or past
2021-01-18 17:34:25 +09:00
Dean Herbert
02d2b2742b Fix selection box not updating with hitcircles/sliders far in the future or past 2021-01-18 16:57:36 +09:00
Dean Herbert
30f3e72c42
Merge pull request #11469 from Mysfit/beatmap-colour-setting
Add ability to toggle beatmap colours separate from skins
2021-01-18 16:46:53 +09:00
Dean Herbert
94fee8c31d Avoid doing a config lookup if initial conditional fails 2021-01-18 16:13:58 +09:00
Dean Herbert
1364de1166
Merge branch 'master' into beatmap-colour-setting 2021-01-18 16:07:46 +09:00
Dean Herbert
7b4f73eb8c
Merge pull request #11523 from smoogipoo/nupkg-rulesets
Add nuget deploys for all rulesets
2021-01-18 11:47:30 +09:00
smoogipoo
1b166d809e Adjust package titles 2021-01-18 11:08:03 +09:00
smoogipoo
ec00aaef90 Add nuget deploys for all rulesets 2021-01-18 10:53:31 +09:00
Dean Herbert
39746cb3de
Test removing nuget restore from iOS/Android build scripts 2021-01-18 00:11:35 +09:00
Dean Herbert
5e0fcc4a6c
Merge pull request #11473 from frenzibyte/explicit-search-control
Add "explicit maps" search filter control to beatmap listing
2021-01-17 23:27:15 +09:00
Dean Herbert
a9568e713a
Merge pull request #11519 from bdach/fix-android-multi-broken
Fix android users not being able to join multiplayer rooms
2021-01-17 23:24:05 +09:00
Dean Herbert
5278cad393 Reword setting to make more sense 2021-01-17 22:42:48 +09:00
Dean Herbert
5fd644fc57 Unify variable names 2021-01-17 22:42:48 +09:00
Bartłomiej Dach
eb53e32792 Use task completion source for room join flow
On Android, users were unable to join or create multiplayer rooms. The
root cause of that was that the both the wait and set of the
`ManualResetEvent` in `getRoomUsers` occurred on the same thread, which
created a chicken-and-egg situation - the set could not proceed until
the wait had actually completed.

Resolve by substituting the `ManualResetEvent` for a
`TaskCompletionSource` to achieve a promise-style task, which the
previous code was a crude approximation of anyway.

Closes #11385.
2021-01-17 14:40:22 +01:00
Dean Herbert
addd463d26
Merge branch 'master' into explicit-search-control 2021-01-17 21:44:25 +09:00
Dean Herbert
edb6d3907b
Merge pull request #11472 from frenzibyte/explicit-beatmap-markers
Add explicit content markers to beatmap panels and overlay
2021-01-17 21:44:10 +09:00
Bartłomiej Dach
1dc2af57a6
Merge pull request #11212 from Game4all/android-multiple-import-support-suppot
Add ability to import multiple files at once on android
2021-01-17 00:44:50 +01:00
Bartłomiej Dach
816cc7a59b Adjust explicit label spacing on beatmap set overlay 2021-01-17 00:35:23 +01:00
Bartłomiej Dach
dee46d7ba2 Use GroupBy() instead 2021-01-16 23:42:28 +01:00
Bartłomiej Dach
bb0d289993 Split variable for readability 2021-01-16 23:24:28 +01:00
Bartłomiej Dach
1d7be6a604 Merge branch 'master' into android-multiple-import-support-suppot 2021-01-16 23:13:11 +01:00
Bartłomiej Dach
ffe2a710d9
Merge pull request #10926 from UselessToucan/net5.0
Target .NET 5
2021-01-16 16:38:19 +01:00
Bartłomiej Dach
c80e9c08fd
Merge branch 'master' into net5.0 2021-01-16 16:07:44 +01:00
Mysfit
a3535f4b79 Further simplified beatmap colouring tests. 2021-01-16 02:09:35 -05:00
Mysfit
112967c1e8 Created base class for testing beatmap colours. 2021-01-15 23:46:46 -05:00
Bartłomiej Dach
daaf9f701f
Merge pull request #11496 from peppy/fix-judgement-animation-conditional 2021-01-15 22:59:55 +01:00
Bartłomiej Dach
d9b671667b Merge branch 'master' into fix-judgement-animation-conditional 2021-01-15 22:10:17 +01:00
Bartłomiej Dach
3c1a86d11d Trim braces for consistency 2021-01-15 22:04:45 +01:00
Bartłomiej Dach
eb40d3a5ba
Merge pull request #11501 from peppy/fix-spinner-test-not-playing-samples 2021-01-15 20:25:57 +01:00
Bartłomiej Dach
27db01b533
Merge branch 'master' into fix-spinner-test-not-playing-samples 2021-01-15 19:52:54 +01:00
Dan Balasescu
778efc5108
Merge pull request #11498 from peppy/fix-editor-timeline-scroll-snapping
Fix editor timeline not snapping on non-precise wheel scroll
2021-01-15 18:16:04 +09:00
Dean Herbert
14b3323682 Use OnComplete instead of Finally to avoid potentially stopping on aborted transforms 2021-01-15 17:18:15 +09:00
Dean Herbert
311f8b7017 Only restart spinning sample if it was not already playing 2021-01-15 17:17:51 +09:00
Dean Herbert
767c76921f Adjust transition time of spinner sound 2021-01-15 17:17:28 +09:00
Dean Herbert
8a6857f151 Add support for playing a SkinnableSample without restarting it 2021-01-15 17:16:12 +09:00
Dean Herbert
6adb6b6700 Fix spinner tests not playing spinning sound due to empty hitsamples 2021-01-15 17:13:52 +09:00
Dean Herbert
88a27124c0 Make long spinner test longer and fix step name 2021-01-15 17:13:27 +09:00
Dean Herbert
ed78be825f Fix editor timeline not snapping on non-precise wheel scroll
For wheel input with precision, we still prefer exact tracking for now.
May change this in the future based on feedback from mappers, but it
makes little sense to do non-snapped scrolling when input is coming from
a non-precise source.
2021-01-15 15:47:42 +09:00
Dean Herbert
c3049f431a
Merge branch 'master' into net5.0 2021-01-15 15:23:41 +09:00
Dean Herbert
2b578e97e5 Fix deadlock scenario when calculating fallback difficulty
The previous code would run a calcaulation for the beatmap's own ruleset
if the current one failed. While this does make sense, with the current
way we use this component (and the implementation flow) it is quite unsafe.

The to the call on `.Result` in the `catch` block, this would 100%
deadlock due to the thread concurrency of the `ThreadedTaskScheduler`
being 1. Even if the nested run could be run inline (it should be), the
task scheduler won't even get to the point of checking whether this is
feasible due to it being saturated by the already running task.

I'm not sure if we still need this fallback lookup logic. After removing
it, it's feasible that 0 stars will be returned during the scenario that
previously caused a deadlock, but I don't necessarily think this is
incorrect. There may be another reason for this needing to exist which
I'm not aware of (diffcalc?) but if that's the case we may want to move
the try-catch handling to the point of usage.

To reproduce the deadlock scenario with 100% success (the repro
instructions in the linked issue aren't that simple and require some
patience and good timing), the main portion of the lookup can be changed
to randomly trigger a nested lookup:

```
if (RNG.NextSingle() > 0.5f)
    return GetAsync(new
DifficultyCacheLookup(key.Beatmap, key.Beatmap.Ruleset,
key.OrderedMods)).Result;
else
    return new StarDifficulty(attributes);
```

After switching beatmap once or twice, pausing debug and viewing the
state of threads should show exactly what is going on.
2021-01-15 15:19:12 +09:00
Dean Herbert
ede5abdba4 Fix unstable multiplayer room ordering when selection is made 2021-01-15 15:19:12 +09:00
Dean Herbert
b8c85ef017 Revert polling changes to fix participant list display
It turns out this polling was necessary to get extra data that isn't
included in the main listing request. It was removed deemed useless, and
in order to fix the order of rooms changing when selecting a room.
Weirdly, I can't reproduce this happening any more, and on close
inspection of the code can't see how it could happen in the first place.

For now, let's revert this change and iterate from there, if/when the
same issue arises again.

I've discussed avoiding this second poll by potentially including more
data (just `user_id`s?) in the main listing request, but not 100% sure
on this - even if the returned data is minimal it's an extra join
server-side, which could cause performance issues for large numbers of
rooms.
2021-01-15 15:19:12 +09:00
Dean Herbert
d023ad8ad1 Remove assert messages 2021-01-15 15:18:29 +09:00
Dean Herbert
3f88340304 Restore previous exception handling flow for stable path lookup 2021-01-15 15:17:38 +09:00
Dean Herbert
7c612ec556 Remove global.json 2021-01-15 15:11:03 +09:00
Dean Herbert
e0a4a666c8 Remove unnecessary workaround (mentioned package is pinned by SignalR to a working version) 2021-01-15 15:01:16 +09:00
Dean Herbert
f42a6270bb Update framework (again) for native libs fix 2021-01-15 14:57:01 +09:00
Dean Herbert
51255033e2 Update some missed usages of KeyBindingContainer in tests 2021-01-15 14:57:01 +09:00
Dean Herbert
86f66727de Update KeyBinding usages in line with interface changes 2021-01-15 14:57:01 +09:00