1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:02:55 +08:00
Commit Graph

37334 Commits

Author SHA1 Message Date
Dean Herbert
9b5e35565b
Merge pull request #11975 from frenzibyte/legacy-spinner-placements
Adjust legacy spinner components placements to match osu!stable
2021-03-12 23:12:43 +09:00
Dean Herbert
e3813ab828
Merge branch 'master' into legacy-spinner-placements 2021-03-12 19:47:34 +09:00
Dan Balasescu
6e7bb87977
Merge pull request #12005 from peppy/fix-settings-reset-button-tooltips
Switch RestoreDefaultsValueButton to use HasPendingTasks to avoid tooltip always showing
2021-03-12 16:06:38 +09:00
Dean Herbert
e7707eee94 Switch RestoreDefaultsValueButton to use HasPendingTasks to avoid tooltip always showing 2021-03-12 15:23:11 +09:00
Dan Balasescu
d8db29de35
Merge pull request #11990 from peppy/fix-storyboard-alpha-start-time-woes
Fix storyboard commands occurring before the earliest point of visibility delaying gameplay
2021-03-12 00:07:23 +09:00
Dan Balasescu
023af75cc3
Merge branch 'master' into fix-storyboard-alpha-start-time-woes 2021-03-11 22:09:56 +09:00
Dan Balasescu
99ef5077c2
Merge pull request #11992 from peppy/fix-spm-during-fade-out
Fix SPM counter immediately disappearing/decreasing after spinner has already been completed
2021-03-11 22:04:35 +09:00
smoogipoo
ea9b48d17d Remove unused using 2021-03-11 21:21:48 +09:00
smoogipoo
b5bdf235ca Slightly improve comments more 2021-03-11 21:21:44 +09:00
smoogipoo
8bc494b224 Adjust explanatory comments 2021-03-11 20:57:00 +09:00
Dean Herbert
1591d593e2 Move spin start time to inside result and switch to standard state handling 2021-03-11 12:58:15 +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
Salman Ahmed
3f34981664 Fix incorrect spinner top offset calculation with clarification 2021-03-11 05:40:20 +03:00
Dan Balasescu
f6baf49ad6
Merge pull request #11989 from peppy/fix-ios-builds
Fix iOS release build crashes
2021-03-09 18:34:32 +09:00
Dean Herbert
4e8bcc9265 Fix SPM counter decreasing after spinner has already been completed 2021-03-09 16:54:46 +09:00
Dean Herbert
5a6864eb78 Fix SPM counter immediately disappearing on completion of spinners 2021-03-09 16:54:46 +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
a5b3ac7ef8 Add failing test covering alpha commands proceeding non-alpha (but ignored) commands 2021-03-09 15:54:11 +09:00
Dan Balasescu
296afd2d17
Merge pull request #11971 from bdach/taiko-judgement-pooling
Enable pooling for taiko judgements
2021-03-09 15:17:24 +09:00
Salman Ahmed
0549395869 Inline "legacy coordinates container" and add "spinner Y centre" const 2021-03-09 08:55:32 +03:00
Dean Herbert
dc9028d24a Update framework 2021-03-09 14:27:29 +09:00
Salman Ahmed
bb79da1aac Correct playfield shift counteract comment
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-09 00:34:00 +03: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
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
Salman Ahmed
0ad3073c1a
Use MathF utility class instead
Co-authored-by: Berkan Diler <b.diler@gmx.de>
2021-03-07 21:21:44 +03:00
Salman Ahmed
fbfaa378fc Move spinner top offset constant outside 2021-03-07 20:47:16 +03: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
f5a80e6269
Merge branch 'master' into taiko-judgement-pooling 2021-03-07 13:35:25 +01:00
Bartłomiej Dach
fb19890d1d
Merge pull request #11970 from bdach/taiko-legacy-judgement-leftovers 2021-03-07 13:34:46 +01:00
Salman Ahmed
413cbb30a0
Reword playfield shift counteract comment
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-07 13:39:46 +03: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
8f4dadb06a Enable pooling for taiko judgements 2021-03-06 17:38:04 +01:00