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

38032 Commits

Author SHA1 Message Date
Dean Herbert
4dd0c2c7a5 Add assert ensuring we don't ever get to the results screen with an F rank
Intentionally an assertion as I want tests to fail, but I don't want
this to cause crashes for an end user if it does happen to occur.
2023-03-29 14:11:58 +09:00
Dean Herbert
a8bb2e33ac Ensure all preconditions are checked before progressing to results screen after storyboard ends 2023-03-29 14:00:11 +09:00
Dean Herbert
aad540629f Remove duplicate load rule from ShaderPrecompiler 2023-03-29 12:36:56 +09:00
Dean Herbert
8c1df3c8d9 Fix web account registration not bypassing the URL warning 2023-03-28 15:38:19 +09:00
Dean Herbert
0d77ec013a Fix ruleset-local shader manager not correctly falling back to existing cached shaders 2023-03-28 15:00:49 +09:00
Dean Herbert
5dfac02b11 Preload triangle shader on startup 2023-03-28 14:15:38 +09:00
Dean Herbert
c742b3f0a8 Update DrawableRulesetDependencies xmldoc to read more correctly 2023-03-28 14:15:19 +09:00
Joseph Madamba
8b30c67580
Fix incorrect song select matching label by showing both beatmap and difficulty count for less ambiguity 2023-03-26 18:08:28 -07:00
Joseph Madamba
76a6f97fbb
Fix wrong definition of a beatmap in first run setup 2023-03-26 17:32:03 -07:00
Joseph Madamba
3e0bbb2432
Fix select beatmap button not highlighting when creating a multiplayer room using keyboard 2023-03-26 16:03:21 -07:00
Dean Herbert
6924dc5c50 Update framework 2023-03-27 02:16:33 +09:00
Dean Herbert
898717231b Hide vulkan renderer option for now
We'll bring it back when it's more stable.
2023-03-27 02:00:10 +09:00
Bartłomiej Dach
292486c25a
Use more resilient restore method 2023-03-26 14:35:00 +02:00
Bartłomiej Dach
f3c174a7f2
Fix test errors due to missing dependencies 2023-03-26 13:52:26 +02:00
Dean Herbert
bab93bed17 Fix string interpolation and use GetDescription on renderer value 2023-03-26 20:43:28 +09:00
Dean Herbert
ba078e8357 Show "automatic" resolved renderer inline in dropdown instead 2023-03-26 20:29:30 +09:00
Dean Herbert
764361b3d3 Add special case to hide definitely non-working renderers on android 2023-03-26 20:14:33 +09:00
Dean Herbert
e346b02ebf Add display of current renderer 2023-03-26 20:09:35 +09:00
Dean Herbert
91da546ba2 Merge branch 'master' into add-renderer-selection 2023-03-26 19:33:15 +09:00
Dean Herbert
c803eb8e04 Update framework 2023-03-26 16:14:15 +09:00
Dean Herbert
d31b37e87e Merge branch 'master' into fix-ubo-not-bound 2023-03-26 16:14:11 +09:00
Joseph Madamba
e1906a90eb
Use image@2x from tournament banner api 2023-03-25 13:08:46 -07:00
Joseph Madamba
450c5cef07
Add comment explaining loading container padding 2023-03-24 18:42:34 -07:00
Terochi
e6f1ec57a9 Bring back and make use of clearPreviousSamples() 2023-03-23 18:46:48 +01:00
Dean Herbert
ab6cfea5c7
Revert old value instead of always using default
Co-authored-by: cdwcgt <loginchen@outlook.com>
2023-03-23 11:27:05 +09:00
Dean Herbert
3050a16bf8 Don't require a restart when selecting Automatic and startup setting was also automatic 2023-03-22 16:56:36 +09:00
Dean Herbert
aabe86dc26 Limit renderers to those available for the current platform 2023-03-22 16:49:29 +09:00
Dean Herbert
956fabb445 Show restart notice when changing renderer 2023-03-22 16:49:29 +09:00
Dean Herbert
13be709718 Add basic renderer selection 2023-03-22 16:49:29 +09:00
Dean Herbert
ad5bdf6511 Merge branch 'master' into fix-ubo-not-bound 2023-03-22 16:46:39 +09:00
Dean Herbert
9bc6b46e4e Update framework 2023-03-22 16:36:05 +09:00
Joseph Madamba
6f3bb85eaa
Always show down arrow on inactive sort buttons 2023-03-22 00:19:23 -07:00
Dean Herbert
425be20e46 Fix song select search textbox font size incorrectly having increased 2023-03-22 14:17:39 +09:00
Joseph Madamba
d9571b6fc9
Move filter control property setters to load() 2023-03-21 21:31:35 -07:00
Joseph Madamba
74a15d7424
Fix overlay headers being blocked by loading layer 2023-03-21 20:32:26 -07:00
Joseph Madamba
e1fb63e1f3
Move beatmap listing filter control to header 2023-03-21 20:32:26 -07:00
Terochi
1478a26cc0 Addressed changes 2023-03-21 23:15:49 +01:00
Joseph Madamba
3cd01ee621
Fix beatmap listing sort direction not resetting when changing criteria 2023-03-21 15:08:37 -07:00
Joseph Madamba
df3ccdff9f
Add failing beatmap listing sort direction on criteria change test 2023-03-21 15:08:37 -07:00
Bartłomiej Dach
9ff9cd3b7f
Merge branch 'master' into skin-editor-cyclic-selection 2023-03-21 19:49:55 +01:00
Dean Herbert
e31a90e043 Don't cycle selection when more than one items are selected 2023-03-21 21:31:10 +09:00
Dean Herbert
5cb8160eee
Merge pull request #22773 from peppy/show-song-select-visible-beatmap-count
Show count of visible beatmaps at song select
2023-03-21 18:22:29 +09:00
Bartłomiej Dach
ea8da69263
Fix importing beatmaps not changing count of visible beatmaps
Reproduction steps:

1. Go to song select
2. Open beatmap listing
3. Import a beatmap that would fit the current filter criteria
4. The count of visible beatmaps does not change

Fixed by updating the count on `BeatmapSetsChanged` too.
2023-03-20 20:53:53 +01:00
Bartłomiej Dach
695ee39b87
Privatise setter 2023-03-20 20:30:54 +01:00
Dean Herbert
bec28cc7f1
Merge pull request #22883 from smoogipoo/fix-logo-animation
Use custom vertex shader for logo animation
2023-03-20 16:36:43 +09:00
Dean Herbert
8557589a35 Update resources 2023-03-20 15:28:13 +09:00
Joseph Madamba
970df5d88a
Update profile kudosu section in line with web 2023-03-18 19:49:30 -07:00
Dan Balasescu
c08513d590 Actually use custom vertex action 2023-03-17 20:47:11 +09:00
Dan Balasescu
bcd24873d6 Use custom vertex type 2023-03-17 20:37:05 +09:00
Dean Herbert
8bdb89d05d Update resources 2023-03-17 19:12:43 +09:00
Dan Balasescu
1c3b60b9e6 Use custom vertex shader for logo animation 2023-03-16 23:56:41 +09:00
Salman Ahmed
678e8ed736 Update UBO usages inline with framework changes 2023-03-16 14:06:35 +03:00
Cootz
54f864463c
Merge branch 'master' into BitmapUpdatesOnScore 2023-03-16 13:54:47 +03:00
Dean Herbert
cb9b14b30f Revert "Merge pull request #22741 from cdwcgt/do-not-fetch-deletePending"
This reverts commit 15c44a2817, reversing
changes made to de2ab05e78.
2023-03-16 19:48:36 +09:00
Cootz
556964eae0
Merge branch 'master' into BitmapUpdatesOnScore 2023-03-16 12:16:42 +03:00
Dean Herbert
3b62f87b64 Ensure Player does not fail a score on exit if a replay is currently loaded 2023-03-16 17:14:20 +09:00
Dean Herbert
15c44a2817
Merge pull request #22741 from cdwcgt/do-not-fetch-deletePending
Don't fetch `beatmapset` that already `PendingDelete` when import score
2023-03-16 16:37:18 +09:00
Dean Herbert
cd102da3af Move matches string inside text box 2023-03-16 16:34:31 +09:00
Dean Herbert
8e6a4559e3 Add xmldoc for new method and reorder methods in SkinReloadableDrawable 2023-03-16 15:58:42 +09:00
Dean Herbert
297e7d6542 Fix Flush call being run too late in PoolableSkinnableSample 2023-03-16 15:33:30 +09:00
Dean Herbert
89b42ddd98 Don't localise beatmap count string for now 2023-03-16 15:02:38 +09:00
Terochi
edc6314634 Drank some coffee and figured out the fix 2023-03-15 10:49:59 +01:00
Dean Herbert
5f9b13a775 Rename Add/AddRange methods as they are no longer conflicting with Container 2023-03-15 18:02:41 +09:00
Dean Herbert
9e444af380 Use object initialisers and fix order of initialisation vs add 2023-03-15 18:02:26 +09:00
Terochi
b0f1a69523 Update the pauseLoop sample instantly on skin change 2023-03-15 09:05:34 +01:00
Terochi
a9c349fa6d Cache any skin changes in SkinReloadableDrawable to ScheduledDelegate 2023-03-15 09:03:29 +01:00
Dean Herbert
de2ab05e78
Merge pull request #22765 from Joehuu/fix-overlay-sidebar-scroll
Fix overlay sidebars not scrolling to end due to parent scroll view
2023-03-15 16:52:59 +09:00
Dean Herbert
0a19b1e9cf
Merge pull request #22860 from rozukke/fix-skin-ini-import
Fix import of skins with non-ASCII names that have been previously exported by lazer
2023-03-15 15:36:51 +09:00
Dean Herbert
f8e773ab8e
Merge branch 'master' into fix-overlay-sidebar-scroll 2023-03-15 15:30:50 +09:00
Dean Herbert
1cf870d956 Add test coverage and fix fail case where a drag selection ends incorrectly with cyclic selection 2023-03-15 15:16:48 +09:00
Terochi
390ad335d0 Reloading samples before playing then when skin change occurs 2023-03-14 21:35:52 +01:00
Terochi
1d5e596615 Update FailAnimation to use SkinnableSound 2023-03-14 20:44:30 +01:00
Dean Herbert
f91af8fa64
Merge pull request #22750 from smoogipoo/veldrid-renderer
Update graphic code in line with framework renderer changes
2023-03-15 00:29:54 +09:00
Dean Herbert
6546f5968a Merge branch 'master' into skin-editor-cyclic-selection 2023-03-14 20:43:56 +09:00
Dean Herbert
b46fc14e56
Merge pull request #22848 from Rovearix/Fix-Dragging-Preventing-Beatmap-Loading
Prevent LoadingLayer from blocking loading
2023-03-14 20:42:10 +09:00
Dean Herbert
d65d09e45f Change field to const 2023-03-14 20:24:39 +09:00
Dean Herbert
8fd07b51f7
Merge pull request #22842 from LumpBloom7/Fix-argon-progress-bar-oversized-fill
Fix argon progress bar fill being oversized
2023-03-14 18:46:25 +09:00
Dean Herbert
4cea29402b Don't show epilepsy warning when storyboards are disabled
I have more thoughts on this warning in general (which will likely see
it removed or moved in the future) but this seems like a quick QOL fix
for now.

As mentioned in https://github.com/ppy/osu/discussions/22861.
2023-03-14 18:32:26 +09:00
Dean Herbert
0b23809585 Update resources 2023-03-14 17:52:17 +09:00
Dean Herbert
48d11610b3 Update framework 2023-03-14 17:44:51 +09:00
Dean Herbert
969c0e9c9d Merge branch 'master' into veldrid-renderer 2023-03-14 17:35:38 +09:00
Rovearix
9ac9287dbd Switched the implementation to set the blockInput flag for the BeatmapMetadataDisplay's LoadingLayer. This prevents the UIEvents from being being handled in this case without modifying the class 2023-03-13 08:07:55 -04:00
Rovearix
ba728bdab1 Changed the event to be the more correct one to block 2023-03-13 07:49:51 -04:00
rozukke
1f7721786b Perform check to account for non-ASCII characters 2023-03-13 22:01:26 +11:00
Dean Herbert
da947d8661 Gracefully handle beatmaps specifying images using the video storyboard type 2023-03-13 18:24:16 +09:00
Dean Herbert
eb37d740b1 Update supported video filetypes to match osu-stable 2023-03-13 18:24:16 +09:00
Rovearix
c1618a7a16 Prevent elements that are anchored in the center from blocking loading 2023-03-12 10:57:53 -04:00
Joseph Madamba
6e5b1280b7
Fix multiple notice boxes having no spacing 2023-03-11 21:36:29 -08:00
Joseph Madamba
ea88aee41f
Display stub notice in marked wiki articles 2023-03-11 21:36:28 -08:00
Joseph Madamba
0cf69a1084
Make yaml line strings verbatim 2023-03-11 21:36:23 -08:00
Derrick Timmermans
febdca4547
Fix argon progress bar fill being oversized 2023-03-12 02:08:00 +01:00
Dan Balasescu
e327993d11
Merge pull request #22527 from Terochi/replay-length-extension
Replay recording extension until results screen transition
2023-03-11 15:41:32 +09:00
tsrk
d806b85a30
revert: make counters an IEnumerable again
As suggested by bdach as this would make the last two commits useless

Refs: 5d15426
2023-03-09 10:25:03 +00:00
Dean Herbert
d95bcb10cc
Merge pull request #22744 from EXtremeExploit/groups-badges-list
Add group badges to list view
2023-03-09 15:45:46 +09:00
Bartłomiej Dach
ab87f5e0c9
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-03-08 22:37:09 +01:00
EXtremeExploit
686259a33c
Make support badge in list match groups 2023-03-08 13:57:20 -03:00
Dean Herbert
4f7be332f3 Revert isDraggingBlueprint to field 2023-03-08 19:24:03 +09:00
Dean Herbert
245c3c025c Refactor endClickSelection to reduce nesting 2023-03-08 19:23:32 +09:00
tsrk
5d15426c27
refactor: make Counters return a Container 2023-03-08 01:52:12 +00:00
tsrk
5b0db94a24
docs: add XMLDoc for methods in KCD 2023-03-08 00:58:54 +00:00
tsrk
44297a7d0a
refactor: make KCD a CompositeDrawable 2023-03-08 00:47:16 +00:00
Bartłomiej Dach
72695f7c90
Merge branch 'master' into omit-barline-in-timing-control-point 2023-03-07 22:46:24 +01:00
Bartłomiej Dach
6c5ccdfd90
Merge branch 'master' into optimise-search 2023-03-07 22:07:29 +01:00
Bartłomiej Dach
12af002c4d
Reorder and add xmldoc to KeyCounter members 2023-03-07 21:28:42 +01:00
Bartłomiej Dach
98f40b2679
Improve documentation of InputTrigger 2023-03-07 21:22:59 +01:00
Bartłomiej Dach
5213bfa5c9
Merge branch 'master' into make_skin_reset_dangerous 2023-03-07 21:06:44 +01:00
Bartłomiej Dach
cfafa8af8c
Merge branch 'master' into hud/player-components 2023-03-07 19:44:12 +01:00
Bartłomiej Dach
7ade525eef
Display corner radius setting as percentage 2023-03-07 19:43:52 +01:00
Cootz
5d41d343fd
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-03-07 15:46:52 +03:00
Cootz
7107834b9e Fix truncating bug 2023-03-07 15:43:03 +03:00
Cootz
5191204569 Bring truncating logic back to Export method 2023-03-07 15:39:43 +03:00
Dean Herbert
97bee4db89 Fix localisations 2023-03-07 18:07:53 +09:00
Dean Herbert
26ef7c2637 Rename confirmation dialog class to mention revert not reset 2023-03-07 18:07:46 +09:00
Dean Herbert
55467fcbe3 Update xmldoc for DangerousActionDialog to match new behaviour 2023-03-07 18:07:46 +09:00
Dean Herbert
dc2945f4f8 Move avatar user loading to BDL also 2023-03-07 17:39:21 +09:00
Dean Herbert
5af41bb1c8 Move filter matching code into own method to simplify early returns 2023-03-07 17:24:17 +09:00
Dean Herbert
5e90b67be0 Move GameplayState usage to BDL 2023-03-07 17:01:29 +09:00
Dean Herbert
d98199961b Adjust default sizing to fit a bit better with existing elements 2023-03-07 17:00:10 +09:00
Dean Herbert
f7f1dff647 Fix incorrect case of localisable string for "corner radius" 2023-03-07 16:45:33 +09:00
Dean Herbert
6a7c4d0bf7 Remove NRT disables in new classes 2023-03-07 16:41:39 +09:00
Dean Herbert
97ba236eb1 Add basic xmldoc to KeyCounter classes 2023-03-07 16:41:39 +09:00
Dean Herbert
28520414aa Move KeyCounter components to HUD namespace 2023-03-07 16:41:39 +09:00
Dean Herbert
15d65059b5 Tidy up Add method logic 2023-03-07 16:21:57 +09:00
Dean Herbert
8f6df5ea0f
Merge branch 'master' into gameplay/key-counter-abstraction 2023-03-07 16:09:45 +09:00
Dean Herbert
2cce785fa5 Fix storyboard videos not fading out on completion
Closes https://github.com/ppy/osu/issues/22802.

Stable uses a 1,000 ms fade-in / out. Rather than matching that, I've
stuck with 500ms (what lazer was already using for the fade-in) because
I think it feels better.

Tested using the beatmap linked in the issue thread.
2023-03-07 15:54:35 +09:00
Dean Herbert
21bdbb20e6 Add optional support for cyclic selection to BlueprintContainer 2023-03-07 14:22:12 +09:00
tsrk
fc0e27fb15
style: use normalised CornerRadius values 2023-03-06 20:11:52 +00:00
tsrk
952814604e
style: fix late night oopsies 2023-03-06 20:06:56 +00:00
Bartłomiej Dach
ec15e2b9cc
Merge branch 'master' into dont-filter-results-on-sort-mode 2023-03-06 17:57:47 +01:00
OliBomby
1fcf41379d Added maintainability patch by bdach 2023-03-06 16:20:36 +01:00
tsrk
3a240aaa5f
style: use 64 radius 2023-03-06 10:27:59 +00:00
Dean Herbert
87d0bef313 Use nullable comparison helper method instead of manual implementation 2023-03-06 15:16:32 +09:00
tsrk
07bde4990d
feat: implement PlayerAvatar 2023-03-05 23:17:39 +00:00
tsrk
20a610ea6c
style: a NRT pass on UpdateableFlag 2023-03-05 23:15:58 +00:00
tsrk
654eacd449
feat(l10n): localise CornerRadius 2023-03-05 23:10:42 +00:00
tsrk
082bfe3621
refactor: SkinnableAvatar to PlayerAvatar 2023-03-05 23:09:02 +00:00
mk56-spn
908651cc11 make ResetConfirmDialog properly utilise its parent's logic
Adjust name of `DeleteAction` to `DangerousAction`
2023-03-05 20:57:26 +01:00
OliBomby
b0cd801405 fix code quality 2023-03-04 19:34:22 +01:00
OliBomby
5146f7c978 using array again in GetSearchableTerms 2023-03-04 16:49:46 +01:00
OliBomby
70a925aab1 added extra early-returns 2023-03-04 16:49:33 +01:00
OliBomby
b90c389ff0 using List instead of Span in GetSearchableTerms 2023-03-04 15:42:35 +01:00
Bartłomiej Dach
60cdd3c070
Clear components sidebar unconditionally on every target change
Fixes the working layer dropdown lingering after exiting from a
skinnable screen to a non-skinnable one.
2023-03-04 14:10:05 +01:00
Bartłomiej Dach
d233f3a3ab
Show non-skinnable screen placeholder at higher level 2023-03-04 13:49:10 +01:00
Bartłomiej Dach
49e298e304
Accept ISerialisableDrawableContainer directly in SkinBlueprintContainer
An end result of #22674 is that `SkinBlueprintContainer`s are only ever
created by supplying a `SkinComponentsContainer` to them. However,
`SkinBlueprintContainer` still contained remnants of code that suggested
it was designed to handle cases where more than the drawable supplied to
it contained more than one `ISerialisableDrawableContainer`, or even
zero.

The zero path is totally dead right now (because every
`SkinComponentsContainer` is *by necessity* an
`ISerialisableDrawableContainer`), and the more-than-one path is dead
*for now* (and potentially forever?). Therefore, just hard-couple
`SkinBlueprintContainer` to receive a single target container.
2023-03-04 13:33:21 +01:00
Bartłomiej Dach
2f25fb4083
Move NonSkinnableScreenPlaceholder to outer scope 2023-03-04 13:22:43 +01:00
Bartłomiej Dach
15409b9c15
Fix skin selection not clearing on exit to non-skinnable screen 2023-03-04 13:18:34 +01:00
tsrk
d5ba5eed88
fix(SkinnableAvatar): init avatar.CornerRadius 2023-03-03 23:47:22 +00:00
tsrk
d39b8c7c23
fix(SkinnableAvatar): update outdated interface 2023-03-03 19:35:45 +00:00
EXtremeExploit
edd37a9a7c
cleanup 2023-03-03 16:16:45 -03:00
EXtremeExploit
e23db62386
Do list group'badges in a nicer way 2023-03-03 16:14:19 -03:00