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

37304 Commits

Author SHA1 Message Date
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
d90cf532ea
Merge pull request #11986 from peppy/configure-await-false
Use ConfigureAwait(false) for all async calls
2021-03-08 22:58:10 +09:00
Dan Balasescu
ff2327ffac
Merge branch 'master' into configure-await-false 2021-03-08 22:24:29 +09:00
Dan Balasescu
f15ee813c2
Merge pull request #11985 from peppy/ios-signalr-workaround
Fix multiplayer/spectator not working on iOS
2021-03-08 16:32:51 +09:00
Dean Herbert
02194a93cb Apply missing additions to android project 2021-03-08 15:22:03 +09:00
Dean Herbert
6cb0db9c33 Apply override rules to iOS/Android test projects 2021-03-08 14:54:49 +09:00
Dean Herbert
d2bc48e576 Exclude tests from ConfigureAwait rule 2021-03-08 14:36:35 +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
7763e1dbe1 Apply workaround for runtime iOS failures
See https://github.com/mono/mono/issues/20805#issuecomment-791440473.
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
Dan Balasescu
ef88cbd9f4
Merge pull request #11984 from peppy/intro-triangles-background-access
Fix potential cross-thread drawable mutation in IntroTriangles
2021-03-08 14:06:26 +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
ed4577a130
Merge pull request #11940 from frenzibyte/migrate-country-rank 2021-03-08 11:57:35 +09:00
Dean Herbert
2b1ab3576b
Merge branch 'master' into migrate-country-rank 2021-03-08 11:07:25 +09:00
Bartłomiej Dach
418f33dc17
Merge pull request #11977 from Joehuu/fix-legacy-combo-counter-depth 2021-03-07 16:49:13 +01: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
Bartłomiej Dach
fb19890d1d
Merge pull request #11970 from bdach/taiko-legacy-judgement-leftovers 2021-03-07 13:34:46 +01: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
ad1b86e33a Change LifetimeEnd idiom to Expire() for readability 2021-03-06 18:54:25 +01: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
Dean Herbert
a0ccfa8129
Merge pull request #11961 from frenzibyte/fix-sensitivity-globally-disabled 2021-03-04 23:38:36 +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
b1a35fea51
Merge pull request #11687 from Syriiin/diffcalc/skill-mods
Add a list of mods to Skill class
2021-03-04 13:38:55 +09: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
Dan Balasescu
a98ca1ec4e
Merge pull request #11956 from peppy/multiplayer-confirm-on-exit
Show confirmation dialog when leaving a multiplayer match
2021-03-03 22:41:32 +09:00
smoogipoo
77607c06eb Fix not being able to enter gameplay in TestSceneMultiplayer 2021-03-03 22:07:39 +09:00
smoogipoo
0f83b66cda Add separate test for stateful multiplayer client 2021-03-03 22:01:03 +09:00
smoogipoo
1ecb1d122a Fix up TestSceneMultiplayer 2021-03-03 21:54:34 +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