1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 16:07:25 +08:00
Commit Graph

26260 Commits

Author SHA1 Message Date
Dean Herbert
36b5414b1d Update comment to hopefully explain a weird conditional better 2021-06-18 17:46:01 +09:00
Dean Herbert
d5a1524eb0 Add missing rulesetID check for global action matching 2021-06-18 17:12:01 +09:00
Dean Herbert
d06e52505a Fix thread safety of KeyBindingStore.GetReadableKeyCombinationsFor 2021-06-18 17:11:39 +09:00
Dean Herbert
c369beeaaa Merge branch 'master' into realm-key-binding-store 2021-06-18 16:52:35 +09:00
Dean Herbert
0bc68a7018 Move xmldoc to method 2021-06-18 16:50:31 +09:00
Dean Herbert
19507e107e Reorder methods to make more sense 2021-06-18 16:46:40 +09:00
Dean Herbert
a7f40dc6d4 Merge branch 'remove-synchronous-prepare-score-method' into storyboard-outro-logic-refactor 2021-06-18 16:45:01 +09:00
Dean Herbert
45122594e5 Remove the synchronous version of PrepareScoreForResults
Replaces all existing usages with the `async` version.
2021-06-18 16:24:08 +09:00
Dean Herbert
f3426e38b4 Add note about delay parameter 2021-06-18 16:18:20 +09:00
Dean Herbert
3819a1f03b Remove exit override behaviour
I don't actually know under what scenario this could have been hit, and
actually caused expected behaviour. Consider that in the scenario I
describe in the comment (which I added yesterday), the user is
requesting a pause or exit which would be "cancelled showing the results
instead". But in such a scenario, `PerformExit` would first be run,
which cancels the `resultsDisplayDelegate` in the first place.

The only special case would be pressing the close button on the window
decoration? Which I don't think should be a special case in the first
place, so I'm just going to remove this for the time being to keep
things simple.
2021-06-18 16:12:35 +09:00
Dean Herbert
06d1bd971c Default DrawableStoryboard to a completed state to avoid state change on empty storyboards 2021-06-18 16:08:49 +09:00
Dean Herbert
7ef8eac773 Remove unnecessary (and no longer correct) exception 2021-06-18 16:08:31 +09:00
Jamie Taylor
752d0a9f0b
add sound to scroll-to-top button 2021-06-18 16:08:14 +09:00
Dean Herbert
2bf855fcca Move all storyboard outro skip logic out of updateCompletionState
This method should only be called to trigger the score completion
portion of player progression. The storyboard skip/end logic is now
handled separately in `progressToResults`.
2021-06-18 15:50:43 +09:00
smoogipoo
5cf2ac78fc Adjust font namespaces 2021-06-18 15:40:35 +09:00
Dan Balasescu
2cd72a92e8
Merge pull request #13499 from ekrctb/fix-mania-editor-crash
Rewrite mania selection blueprint to use only `HitObject` (no `DrawableHitObject`) for layout
2021-06-18 15:10:28 +09:00
Dan Balasescu
cdc1c60fab
Merge branch 'master' into fix-mania-editor-crash 2021-06-18 13:49:25 +09:00
Dean Herbert
4de27429bc Change ModSelectOverlay to never deselect the user triggered selection 2021-06-18 13:17:55 +09:00
Dean Herbert
5933e0d2d9 Change CheckCompatibleSet to never deselect the current candidat when checking incompatibility 2021-06-18 13:17:32 +09:00
smoogipoo
97cd1217a4 Move IApplicableToDrawableHitObjects to its own file 2021-06-18 13:06:13 +09:00
Bartłomiej Dach
f282326f9a Move score preparations back below ShowResults check 2021-06-17 19:04:52 +02:00
Bartłomiej Dach
3a1444e75d Fix malformed xmldoc tag
Oops. Made a typo in the PR suggestion.
2021-06-17 19:02:56 +02:00
Dean Herbert
9facfe8964
Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-06-18 01:07:54 +09:00
Dean Herbert
e0a3696145
Merge branch 'master' into player-completion-refactoring 2021-06-17 23:51:42 +09:00
Bartłomiej Dach
aae2923e14 Merge branch 'master' into player-pause-exit-results-flow-refactoring 2021-06-17 16:05:09 +02:00
Bartłomiej Dach
10b0d066be Reword comments slightly 2021-06-17 16:04:58 +02:00
Bartłomiej Dach
561dbea9e1 Use xmldoc-specific syntax for nicer formatting 2021-06-17 15:26:50 +02:00
Dan Balasescu
6cec1145e3
Merge pull request #13523 from ekrctb/applicable-to-dho
Reduce boilerplate of `IApplicableToDrawableHitObjects` by taking a single DHO instead of an enumerable
2021-06-17 19:59:06 +09:00
Dan Balasescu
77a0e9145d
Merge pull request #13539 from peppy/improve-updateable-avatar-tooltip-handling
Fix edges of participant tiles showing incorrect tooltip
2021-06-17 19:14:40 +09:00
Dean Herbert
d03c6da60c Refactor and redocument updateCompletionState() and surrounding methods 2021-06-17 19:13:53 +09:00
Dean Herbert
246ab41cc6 Remove special casing for user exit during storyboard outro 2021-06-17 18:11:15 +09:00
Dean Herbert
7cbebe6d11 Rewrite xmldoc and inline comments for PerformExit 2021-06-17 18:10:59 +09:00
Dan Balasescu
79af80833f
Merge pull request #13537 from peppy/fix-author-info
Improve code quality of `AuthorInfo`
2021-06-17 16:34:45 +09:00
Dean Herbert
a0e5301c9f Update usages of showGuestOnNull 2021-06-17 16:33:43 +09:00
Dean Herbert
808b2baa41 Consume new behaviour to fix UserTile discrepancy
Closes https://github.com/ppy/osu/issues/13522.
2021-06-17 16:31:12 +09:00
Dean Herbert
d9cc1c227b Allow UpdateableAvatar to handle displaying username as tooltip 2021-06-17 16:31:12 +09:00
Dean Herbert
9495f87f04 Remove redundant NotNull attributes in nullable classes 2021-06-17 16:07:32 +09:00
Dean Herbert
8da0431fa0 Improve code quality of AuthorInfo 2021-06-17 16:05:50 +09:00
Dean Herbert
8e45f26617
Merge branch 'master' into applicable-to-dho 2021-06-17 15:23:56 +09:00
ekrctb
e7954ecb60 Use property instead of backing field consistently 2021-06-17 10:31:20 +09:00
ekrctb
9dcd0bf311 Remove IPlayfieldProvider by caching Playfield 2021-06-17 10:15:24 +09:00
Salman Ahmed
780388d174 Fix incorrect return value 2021-06-17 03:48:29 +03:00
Bartłomiej Dach
418dbf3f3e
Merge branch 'master' into fix-mania-editor-crash 2021-06-16 18:26:33 +02:00
Bartłomiej Dach
191f47f5ee
Merge branch 'master' into beatmap-listing-enum-localisation 2021-06-16 17:44:16 +02:00
Salman Ahmed
74ad6f9117 Remove default skin from the ruleset skin sources
That one doesn't need any changes to it, can be fetched from the `SkinManager` instead.
2021-06-16 17:24:31 +03:00
Salman Ahmed
52ddf08532 Consider not adding legacy skin transformers to non-legacy skins 2021-06-16 17:24:16 +03:00
Dean Herbert
a8b65d8417
Merge pull request #13430 from pavlukivan/taiko-hd-mod
Add osu!taiko "Hidden" mod
2021-06-16 23:24:04 +09:00
Gagah Pangeran Rosfatiputra
0e9ca3df3c
add remaining non-rtl language 2021-06-16 21:14:48 +07:00
Gagah Pangeran Rosfatiputra
4b926791b5
add inter font 2021-06-16 21:13:01 +07:00
Salman Ahmed
5ebf570ec4 Revert GetRulesetTransformedSkin accessibility change
This reverts commit 521077b714.

Forgot to do it when I made this `protected`, but subclasses in test scenes require this.
2021-06-16 16:49:38 +03:00
ekrctb
b6a9fa9999 Merge branch 'master' into applicable-to-dho 2021-06-16 22:04:10 +09:00
Dean Herbert
bacb916c03
Merge pull request #13524 from smoogipoo/fix-hud-test-failure
Fix intermittent HUD test failure
2021-06-16 21:53:58 +09:00
smoogipoo
19f0e3d695 Add HighPerformanceSession 2021-06-16 20:53:48 +09:00
Bartłomiej Dach
a295421b64 Use language-specific lookup key for Other filter 2021-06-16 13:27:02 +02:00
Bartłomiej Dach
69a474e4ab Merge branch 'master' into beatmap-listing-enum-localisation 2021-06-16 13:16:58 +02:00
Dan Balasescu
382de42438
Merge pull request #13498 from ekrctb/refactor-scrolling-hoc-2
Change coordinate used in newly added `ScrollingHitObjectContainer` methods
2021-06-16 20:02:32 +09:00
smoogipoo
2155a4da0a Fix intermittent HUD test failure 2021-06-16 19:52:58 +09:00
Dan Balasescu
6613301588
Merge branch 'master' into refactor-scrolling-hoc-2 2021-06-16 19:20:11 +09:00
smoogipoo
37babbde6a Simplify score filter row 2021-06-16 19:09:11 +09:00
Bartłomiej Dach
dc2e3ff89e Fix wrong language codes
Confused them with the flags from the web-side source used.

Tagalog (`tl`) still has no discernible effect, but that's because there
are actually no localisation files in `osu-resources` for that language.
Leave it be for now, as web has that entry, so it might mean that
translations might be coming at some point in the future.
2021-06-16 12:01:58 +02:00
ekrctb
c59a3ce83f Obsolete plural IApplicableToDrawableHitObjects 2021-06-16 18:52:16 +09:00
ekrctb
af80418ee8 Implement IApplicableToDrawableHitObject for mods
A breaking change in `ModWithVisibilityAdjustment` if the method was overriden.
2021-06-16 18:52:01 +09:00
Dean Herbert
379b84ba22 Update framework 2021-06-16 18:51:17 +09:00
Dean Herbert
f4fb2e127d
Merge pull request #13518 from smoogipoo/sort-by-localisation
Localise "sort by" text in overlays
2021-06-16 18:50:53 +09:00
Dan Balasescu
537cbd1214
Merge pull request #13520 from bdach/add-more-language-enum-values
Add more languages to settings dropdown
2021-06-16 18:49:42 +09:00
ekrctb
67d8e0059f Use singular IApplicableToDrawableHitObject for consumers 2021-06-16 18:47:04 +09:00
ekrctb
e69bb67afe Add IApplicableToDrawableHitObject that is taking a single DHO
Less cumbersome to implement than old version taking an enumerable. The implementation was always using `foreach` for the enumerable.
The new interface is not used yet.
2021-06-16 18:42:28 +09:00
Bartłomiej Dach
cc5145a131 Fix languages with a sub-language part not working properly 2021-06-16 11:10:03 +02:00
ekrctb
2b0e6b6b51 Don't invoke "completed" action for test scene virtual track
`MusicController` tries to play the next music when a track is completed.
In test scenes, we want to keep the virtual track, not random songs.
2021-06-16 17:44:21 +09:00
Dean Herbert
521077b714 Make getRulesetTransformedSkin private 2021-06-16 17:44:18 +09:00
Bartłomiej Dach
d298e95df7 Limit maximum height of settings enum dropdowns 2021-06-16 10:25:50 +02:00
Bartłomiej Dach
64bb1f381b Add more languages to settings dropdown 2021-06-16 10:25:30 +02:00
Dean Herbert
4b45d8318e
Merge branch 'master' into transformers-per-skin 2021-06-16 16:37:28 +09:00
Dean Herbert
5944c45f55 Specify types explicitly and don't handle non-nullable values with fallbacks 2021-06-16 16:24:30 +09:00
smoogipoo
fafd936c93 Localise "sort by" string in overlays 2021-06-16 16:21:41 +09:00
smoogipoo
6d6604e2f0 Fix incorrect indentation
I used this for the o!f example.
2021-06-16 16:19:47 +09:00
Dean Herbert
b24730efdb
Merge pull request #13512 from smoogipoo/add-localisation-example
Localise parts of the beatmap listing overlay
2021-06-16 16:03:40 +09:00
ekrctb
117e94bc94 Allow setting Entry of PoolableDrawableWithLifetime
It is more convenient than using the constructor because the only limited kind of expression is allowed in a base constructor call.
Also, the object initializer syntax can be used.
2021-06-16 16:00:08 +09:00
smoogipoo
3c3ff8be0d Localise beatmap listing enum values 2021-06-16 15:58:07 +09:00
Dean Herbert
cb80577922
Merge pull request #13509 from bdach/fix-seasonal-backgrounds
Fix seasonal backgrounds not cycling
2021-06-16 15:26:46 +09:00
Dean Herbert
68fa7d68cc
Merge pull request #13511 from smoogipoo/fix-possible-nullref-2
Fix possible nullref in difficulty recommender
2021-06-16 15:20:45 +09:00
Dean Herbert
f802679d38
Merge pull request #13497 from smoogipoo/fix-present-score
Make PresentScore() use replay hash as fallback
2021-06-16 15:18:01 +09:00
smoogipoo
4c5268694e Localise some of the BeatmapListingOverlay 2021-06-16 13:46:13 +09:00
smoogipoo
fa00d07107 Upgrade osu-resources 2021-06-16 13:26:36 +09:00
Dean Herbert
66efc3c4de
Merge branch 'master' into realm-key-binding-store 2021-06-16 13:23:13 +09:00
smoogipoo
a5261f0cb3 Add difficulty recommender instantly 2021-06-16 11:48:49 +09:00
smoogipoo
6be41e497a Fix possible nullref in difficulty recommender 2021-06-16 11:27:38 +09:00
Bartłomiej Dach
022b1a28d5 Add missing equality implementation for seasonal backgrounds
The equality operator is used to determine whether the next background
in the cycle should be loaded, to avoid pointless loads of the same
background several times (see #13362 and #13393). Its omission in the
latter pull caused seasonal backgrounds to no longer cycle.

Closes #13508.
2021-06-15 23:21:48 +02:00
Dean Herbert
9d168b19c9 Switch to non-beta release 2021-06-16 02:15:25 +09:00
Dean Herbert
acc06ca398 Merge branch 'master' into realm-key-binding-store 2021-06-16 02:14:58 +09:00
Dan Balasescu
e9d4ee3c87
Merge branch 'master' into enhance-mod-settings-text-box-visibility 2021-06-15 16:09:55 +09:00
ekrctb
ef96ceb4ab Introduce IPlayfieldProvider 2021-06-15 14:43:04 +09:00
smoogipoo
579a4aa9c8 Remove comment 2021-06-15 14:10:09 +09:00
smoogipoo
eb4c093371 Use hash as fallback 2021-06-15 14:06:17 +09:00
ekrctb
bbf0022689 Use natural anchor for TimeAtPosition and PositionAtTime
The natural anchor is the end of the scrolling direction (e.g. Bottom for Down scrolling).
2021-06-15 13:15:20 +09:00
smoogipoo
f6c6eea6dc Make PresentScore() only consider replay hash 2021-06-15 11:16:35 +09:00
Bartłomiej Dach
cb1e2e3d97 Improve xmldoc 2021-06-14 21:54:55 +02:00
Dan Balasescu
84ec378be1
Merge branch 'master' into refactor-scrolling-hoc-1 2021-06-14 20:42:38 +09:00
Dan Balasescu
980afd6a04
Merge branch 'master' into fix-song-select-leaderboard-events 2021-06-14 20:03:36 +09:00
Dan Balasescu
15a20ed9d6
Merge pull request #13486 from peppy/revert-nested-platform-container
Revert "Add nested `PlatformActionContainer` to allow testing of platform actions in visual tests"
2021-06-14 19:53:14 +09:00
Dean Herbert
75b5b50aee
Merge pull request #13490 from smoogipoo/arbitrary-localisation-assembly
Match any arbitrary assembly for localisations
2021-06-14 19:05:22 +09:00
Dean Herbert
13d0eaa9fe Update framework 2021-06-14 19:03:31 +09:00
smoogipoo
b327baa4de Match any arbitrary assembly for localisations 2021-06-14 17:47:31 +09:00
smoogipoo
aa5dae84b2 Make all localisation class strings verbatim 2021-06-14 16:51:17 +09:00
Dean Herbert
83402a70db Fix potential null ref when no beatmap is selected 2021-06-14 15:06:24 +09:00
Dean Herbert
f8b09b7c81 Avoid refresh if score is not related to current display 2021-06-14 14:28:14 +09:00
Dean Herbert
fc442713bb Debounce schedule at base class 2021-06-14 14:26:40 +09:00
Dean Herbert
8dd48d48f6 Add support for song select leaderboard to handle newly imported scores 2021-06-14 14:20:23 +09:00
Dean Herbert
564682270a Revert "Add nested PlatformActionContainer to allow testing of platform actions in visual tests"
This reverts commit be91203c92.
2021-06-14 13:18:52 +09:00
ekrctb
660bf50dc7 Clarify multiple coordinate systems
- Fix wrong position is set for DHOs for down/right scrolling direction.
2021-06-14 13:13:27 +09:00
ekrctb
09f1cbde7e Fix TimeAtPosition doc comment 2021-06-14 13:13:27 +09:00
ekrctb
fdb09ef4d7 Simplify flipPositionIfRequired using scrollLength 2021-06-14 13:13:27 +09:00
ekrctb
8cf4454780 Use Direction enum instead of int
The property is named `scrollingAxis` to distinguish from `direction`, which is of `ScrollingDirection` type (unfortunate name crash).
2021-06-14 13:13:27 +09:00
Dean Herbert
17347401cf Remove unused RankingType enum
We have `BeatmapLeaderboardScope` instead.
2021-06-14 11:27:46 +09:00
Pasi4K5
ef9cb2c958 Rename nested classes 2021-06-12 18:37:31 +02:00
Pasi4K5
b79d57b68c Move OsuSettingsNumberBox into SettingsNumberBox 2021-06-12 17:57:40 +02:00
Pasi4K5
c728f673d6 Rename classes 2021-06-12 17:37:01 +02:00
Pasi4K5
29f3880415 Move classes into SettingsTextBox 2021-06-12 17:34:02 +02:00
Pasi4K5
bb661abfa6 Clean up OsuModSettingsTextBox 2021-06-12 17:25:22 +02:00
Pasi4K5
fe39a47797 Add OsuModSettingsTextBox and OsuModSettingsNumberBox 2021-06-12 00:34:53 +02:00
Bartłomiej Dach
902bb84ca8
Merge branch 'master' into fix-wave-overlay-sound-on-switch 2021-06-11 22:05:08 +02:00
Dean Herbert
f773ea475d Update framework 2021-06-12 01:37:13 +09:00
Dean Herbert
c2759121b9
Merge pull request #13454 from nekodex/change-default-hover-click-sample
Change default HoverSounds/HoverClickSounds samples
2021-06-12 01:01:35 +09:00
Dean Herbert
121df57dca Fix focused overlays playing their "appear" sound when not necessarily changing state 2021-06-12 00:26:33 +09:00
Dean Herbert
0dbe5dd219 Remove unused using statement 2021-06-12 00:23:18 +09:00
Dean Herbert
d9ea8d64d4 Remove weird local sample logic in ChangelogOverlay 2021-06-12 00:05:49 +09:00
Salman Ahmed
8de0d33c5a Revert "Move collection change bind to LoadComplete"
This reverts commit d6d87e1975.

Actually that broke things due to the "disableable" instances not added early enough, revert for now.
2021-06-11 17:59:29 +03:00
Salman Ahmed
b6947c25ec Fix potentially adding the same skin multiple times 2021-06-11 17:55:07 +03:00
Dean Herbert
e098cac1cf Minor code reformatting / moving 2021-06-11 23:49:14 +09:00
Dean Herbert
5887b4a27c Update stand-alone usage of hover/select sounds in DrawableOsuMenuItem 2021-06-11 23:46:42 +09:00
Salman Ahmed
d6d87e1975 Move collection change bind to LoadComplete
Best practice anyways
2021-06-11 17:35:33 +03:00
Dean Herbert
97bb3de1c9 Update resources 2021-06-11 23:03:27 +09:00
Dean Herbert
9c6c1dd237 Merge branch 'master' into change-default-hover-click-sample 2021-06-11 23:03:23 +09:00
Salman Ahmed
108a3deb27 Also handle null Ruleset.CreateLegacySkinProvider values
Let's just go this way for now, maybe it's a better choice to always create transformers and disallow null, but it's too much work and out of scope at this point
2021-06-11 16:26:54 +03:00
smoogipoo
dca001a72d Upgraed localisation analyser packages 2021-06-11 22:22:47 +09:00
Bartłomiej Dach
550d566bf9 Simplify member access 2021-06-11 14:24:17 +02:00
Bartłomiej Dach
876a357bf2 Add support for animated colour fill in new style legacy health bar 2021-06-11 14:24:17 +02:00
Jamie Taylor
0b95d07390
Change 'default' hover/click samples into 'button' samples and make 'soft' the new 'default' 2021-06-11 20:47:57 +09:00
Dan Balasescu
3389c4830b
Merge branch 'master' into refactor-scrolling-hoc-1 2021-06-11 20:35:19 +09:00
Jamie Taylor
4f80a3b66d
Add fallback-to-default logic for HoverSounds and HoverClickSounds 2021-06-11 20:14:35 +09:00
Robin Avery
0c8851f4b7
Extract drawable.ScreenSpaceDrawQuad to a variable 2021-06-11 07:06:22 -04:00
Dean Herbert
26312bf60a
Merge branch 'master' into chat-mention 2021-06-11 20:03:44 +09:00
Robin Avery
a6774eb5b5
Inline getOriginPositionFromQuad 2021-06-11 06:59:00 -04:00
Robin Avery
c9b4f9eb71
Make getOriginPositionFromQuad local 2021-06-11 06:55:47 -04:00
Robin Avery
1bc8460902
Rename getTieredComponent to getAnchorFromPosition
Also rename parameter `component` to `xOrY`.
2021-06-11 06:53:40 -04:00
Robin Avery
6e181a6b63
Rename parameters of getTieredComponent 2021-06-11 06:53:04 -04:00
Robin Avery
a76eaeb52d
Make getTieredComponent local 2021-06-11 06:51:12 -04:00
Jamie Taylor
15d3b4444d
Rename HoverSounds and HoverClickSounds samples 2021-06-11 19:34:54 +09:00
Robin Avery
635300b311
Recalculate closest anchor when origin is changed 2021-06-11 06:28:30 -04:00
Robin Avery
a506f2a776
Revert rename of lambda variables 2021-06-11 06:22:24 -04:00