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
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
Salman Ahmed
f6df5a9d2b
Suppress false warning
2021-02-18 15:55:45 +03:00
Salman Ahmed
a407bfe73b
Privatize UserRanks and expose a similar CountryRank field instead
2021-02-18 15:37:52 +03:00
Salman Ahmed
e14a59f272
Fix creating ruleset instances per LINQ select
2021-02-18 15:26:59 +03:00
Dan Balasescu
cea9ecc2cc
Merge pull request #11820 from smoogipoo/fix-offthread-collection-import
...
Fix collections being imported from BDL thread
2021-02-18 19:52:37 +09:00
Dan Balasescu
8b8d03dfd6
Merge pull request #11822 from peppy/chat-login-placeholder
...
Add login placeholder for chat overlay
2021-02-18 19:36:30 +09:00
smoogipoo
8a1a4ea2d4
Set Current directly
2021-02-18 19:33:04 +09:00
Dean Herbert
d85a4a22e5
Allow beatmap imports from any derived version of SongSelect, rather than only PlaySongSelect
2021-02-18 19:19:28 +09:00
Salman Ahmed
a01896a652
Fix misordered hit error in score meter types
2021-02-18 13:04:22 +03:00
Dean Herbert
487a39eea9
Update interface implementations with framework changes
2021-02-18 18:52:34 +09:00
Dean Herbert
880fe82073
Add sample wrapper in LegacySkin to keep a reference and avoid GC death
2021-02-18 18:32:51 +09:00
Dean Herbert
4aff54412a
Move dispose method to end of file
2021-02-18 18:32:39 +09:00
Dean Herbert
00574a5288
Use ISample everywhere in Skin GetSample lookup path
2021-02-18 18:32:28 +09:00
Dean Herbert
990c1b1d6e
Revert accidental removal of newlines
2021-02-18 18:19:57 +09:00
Dean Herbert
0bd1964d8e
Add login placeholder logic to OnlineOverlay
...
A perfect implementation of this would probably leave the filter/header
content visible, but that requires some re-thinking and restructuring to
how the content is displayed in these overlays (ie. the header
component shouldn't be inside the `ScrollContainer` as it is fixed).
Supersedes and closes #10774 .
Closes #933 .
Addresses most pieces of #7417 .
2021-02-18 18:07:24 +09:00
Dean Herbert
58d8f0733c
Allow using OnlineViewContainer without deriving it
2021-02-18 18:07:24 +09:00
Dean Herbert
c3f66a0c74
Add login placeholder for chat overlay
2021-02-18 17:46:07 +09:00
Dan Balasescu
46b67dd7bc
Merge pull request #11821 from peppy/fix-carousel-border-additive-alplha
...
Fix carousel items' borders getting blown out when selected and hovered
2021-02-18 17:45:58 +09:00
Dean Herbert
71316bbee5
Allow using OnlineViewContainer without deriving it
2021-02-18 17:45:58 +09:00
smoogipoo
668cc144f6
Fix test failures + multiple filter operations firing
2021-02-18 17:39:01 +09:00
Dean Herbert
b713eb2eae
Make field readonly
2021-02-18 17:13:48 +09:00
Dean Herbert
c3a98b6ad1
Fix carousel items' borders getting blown out when selected and hovered
...
I tried restructuring the hierarchy to avoid needing this added property
(moving the hover layer out of the border container) but this leads to
some subpixel leakage outside the borders which looks even worse.
Closes #6915 .
2021-02-18 16:59:44 +09:00
smoogipoo
46ba5de32c
Fix collections being imported from BDL thread
2021-02-18 16:19:36 +09:00
smoogipoo
e911760318
Split OnlinePlayComposite to remove if-statement
2021-02-18 15:47:33 +09:00
Dean Herbert
143e145670
Update implementation of AdjustableAudioComponents
2021-02-18 15:44:23 +09:00
smoogipoo
56e9e10ff5
Make server authoritative in playlist item id
2021-02-18 15:30:31 +09:00
Dean Herbert
421cdb6650
Consume new method in existing usages (and remove some unnecessary set/unset code)
2021-02-18 15:01:11 +09:00
Dean Herbert
dfedea9ea2
Move preview point logic to a specific method in WorkingBeatmap
2021-02-18 14:55:44 +09:00
Dean Herbert
49589b64c3
Intro track should not restart from preview point
2021-02-18 14:55:15 +09:00
Dean Herbert
90dce52042
Fix potential crash from cross-thread drawable manipulation in CollectionFilterDropdown
2021-02-18 14:10:28 +09:00
Dean Herbert
e7308193e7
Add xmldoc explaining how PreviewTime is intended to work
2021-02-18 13:03:29 +09:00
Dan Balasescu
e30fb72ee2
Merge pull request #11811 from peppy/fix-mod-display-thread-safety
...
Fix ModDisplay potentially being operated on before loaded completely
2021-02-18 00:05:31 +09:00
Dan Balasescu
d8b10eca0c
Merge pull request #11802 from peppy/fix-import-contention
...
Fix long-running import tasks holding up user interactive imports
2021-02-17 23:35:48 +09:00
Dan Balasescu
cb4f1f2f7d
Merge pull request #11809 from peppy/fix-audio-preview-volume
...
Fix audio previews not being adjusted in volume correctly
2021-02-17 23:35:18 +09:00
Dean Herbert
3208b2c5bf
Fix potential nullref if mods are never set
2021-02-17 23:13:51 +09:00
smoogipoo
6ef235c4c5
Fix beatmap panel flickering multiple times
2021-02-17 21:54:43 +09:00
smoogipoo
2a1bb2f578
Fix selected item potentially changing during gameplay
2021-02-17 21:40:21 +09:00
Dean Herbert
403536ef80
Fix ModDisplay potentially being operated on before loaded completely
...
Closes https://github.com/ppy/osu/issues/11810 .
2021-02-17 21:11:46 +09:00
Dean Herbert
9c298fac4a
Merge pull request #11801 from peppy/fix-import-always-importing
...
Fix intro beatmap always being imported even if already in a good state
2021-02-17 20:59:33 +09:00
Dean Herbert
172e2e9b3f
Fix audio previews not being adjusted in volume correctly
2021-02-17 20:51:17 +09:00
Dean Herbert
0196ee882a
Redirect batch imports to a separate task scheduler to avoid contention with interactive actions
2021-02-17 19:41:18 +09:00
Dean Herbert
c1db33e075
Improve some xmldoc on ArchiveModelManager for methods which are not going to trigger user interactive flow
2021-02-17 19:40:56 +09:00
smoogipoo
8930ff4465
Merge branch 'master' into multiplayer-no-playlist-mangling
2021-02-17 19:29:01 +09:00
Dean Herbert
c1620ce21b
Fix intro beatmap always being imported even if already in a good state
2021-02-17 19:19:49 +09:00
smoogipoo
604add04e4
Fix song select mods being reset incorrectly
2021-02-17 19:06:37 +09:00
smoogipoo
70a995919c
Update comments
2021-02-17 17:58:24 +09:00
smoogipoo
0d1149911c
Don't display expired playlist items
2021-02-17 17:33:10 +09:00
smoogipoo
fb0e9d6760
Add played property to playlist item
2021-02-17 16:58:32 +09:00
Dan Balasescu
57ede6eb37
Merge branch 'master' into fix-multiplayer-mod-propagation-race
2021-02-17 16:22:51 +09:00
Dean Herbert
86faa7f465
Merge pull request #11798 from smoogipoo/multiplayer-long-types
...
Use long type where required in multiplayer
2021-02-17 15:50:12 +09:00
Salman Ahmed
a845e96b7a
Replace Ranks.Global completely with a GlobalRank property
2021-02-17 08:52:04 +03:00
Salman Ahmed
d7c91a7c6f
Merge branch 'fix-tournament-user-population' into multiplayer-participant-rank
2021-02-17 08:42:59 +03:00
smoogipoo
9a7b6ebe50
Fix missed occurrence
2021-02-17 14:30:52 +09:00
Bartłomiej Dach
8f72631c31
Fix typo in comment
2021-02-16 21:48:19 +01:00
smoogipoo
f61b8e6154
Change to long
2021-02-16 21:32:38 +09:00
smoogipoo
100097d78f
Fix playlist not being handled correctly for non-joined cases
2021-02-16 21:32:35 +09:00
Dan Balasescu
bef0e5cfa1
Merge pull request #11790 from peppy/playlists-show-remaining-attempts
...
Display remaining attempts for playlist rooms with room-level attempt limits
2021-02-16 21:10:19 +09:00
Dan Balasescu
ffa90c1a23
Remove whitespace
2021-02-16 20:23:19 +09:00
Dan Balasescu
8e077c2857
Merge pull request #11791 from peppy/rooms-container-fix-click-deselection
...
Add the ability to deselect the currently selected room via clicking away
2021-02-16 20:22:24 +09:00
smoogipoo
379393fe10
Merge branch 'multiplayer-long-types' into multiplayer-no-playlist-mangling
2021-02-16 19:37:55 +09:00
