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

3112 Commits

Author SHA1 Message Date
Givikap120
0779cd8f4f minor design fixes 2023-09-03 02:17:04 +03:00
Givikap120
2e2d4d0d60 Merge branch 'map_info_on_mod_settings' of https://github.com/Givikap120/osu into map_info_on_mod_settings 2023-09-03 02:09:18 +03:00
Givikap120
b0398b6259 functionality is done 2023-09-03 02:09:01 +03:00
Givikap120
f8adc911cd
Merge branch 'ppy:master' into map_info_on_mod_settings 2023-08-28 23:17:04 +03:00
Givikap120
50235cc245 somewhat working prototype 2023-08-28 23:16:33 +03:00
Bartłomiej Dach
97d1c6e9fc
Merge branch 'master' into carousel-difficulty-split 2023-08-28 11:07:43 +02:00
Bartłomiej Dach
b9795eb3d4
Fix changes to beatmap sets being undone on switching sort mode 2023-08-28 11:02:22 +02:00
Bartłomiej Dach
80ec18d117
Fix incorrect selection restore code in split case
The fallback to "any of the added sets" needs to be applied after
they've all been added, rather than with every added one. Otherwise, in
flows that expect a particular difficulty to be selected in the end
(such as exiting from editor) would end up switching away from the
edited beatmap.
2023-08-28 10:06:26 +02:00
Bartłomiej Dach
0af6cc1394
Fix online ID not being propagated in split difficulty mode
Would result in failures to re-download the beatmap in update flows, for
instance.
2023-08-28 10:05:59 +02:00
Givikap120
290f8db341 fixed stated problems
removed functions from `Ruleset.cs` and added a `GetEffectiveDifficulty()` instead
2023-08-26 02:13:14 +03:00
Givikap120
8a1fc7c340 Basic stuff (not working for now) 2023-08-26 01:20:41 +03:00
Dean Herbert
10b1450138 Rename remove method to better explain return type being IEnumerable 2023-08-25 18:10:54 +09:00
Givikap120
d5ac93f631 Added "value is rate changed" indication
Now if AR or OD value is not "true" and changed through rate - it will appear with symbol `*`
Instead of `11` it wil show as `11*`
2023-08-25 01:25:12 +03:00
Givikap120
772633178c Moved ruleset decl in right place 2023-08-25 01:02:12 +03:00
Givikap120
17b9b1649a Fixed "works only for std" problem
1) Now it use AR/OD calculation from Ruleset class
2) Implemented needed functions in each of default rulesets
2023-08-25 00:58:26 +03:00
Dean Herbert
89eeff515b Reduce complexity of selection restore 2023-08-25 00:52:54 +09:00
Givikap120
ed886a4dc3 Added a true AR/OD display when using DT/HT 2023-08-24 16:49:42 +03:00
Dean Herbert
9e94f38091 Fix typo in local variable 2023-08-24 18:33:15 +09:00
Dean Herbert
018be4c20f Fix selection not being retained when switching between split mode 2023-08-22 18:49:02 +09:00
Dean Herbert
ecbf0f138e Fix incorrect handling when new beatmaps arrive 2023-08-22 18:48:07 +09:00
Dean Herbert
2b1c6ae612 Ensure ID is maintained in temporary BeatmapSetInfos 2023-08-22 18:48:07 +09:00
Dean Herbert
290d18ad69 Split out difficulties in beatmap carousel in a bit of a hacky way
Seems like the simplest path forward for now, without a full rewrite.
2023-08-22 18:47:41 +09:00
Jamie Taylor
b15a54c914
Use new overlay pop-in/pop-out samples 2023-08-17 18:36:36 +09:00
Bartłomiej Dach
e208f38bcb
Merge pull request #24361 from peppy/fix-editor-global-music-hotkey-conflicts
Disallow interacting with the global track state in `Player` and `Editor`
2023-07-30 12:28:53 +02:00
Dean Herbert
f15394fb6d Fix temporary auto mod (ctrl+enter at song select) not reverting in all scenarios 2023-07-28 14:49:06 +09:00
Bartłomiej Dach
3b11559fd0
Revert "Show only the break length instead of total minute breaks"
This reverts commit 9edaa6909e.
2023-07-25 22:17:55 +02:00
Dean Herbert
157b1f301b Rename AllowTrackAdjustments to more understandable ApplyModTrackAdjustments 2023-07-25 20:20:53 +09:00
Dean Herbert
9edaa6909e Show only the break length instead of total minute breaks 2023-07-25 17:02:27 +09:00
Dean Herbert
480163ec2e Show drain length in length tooltip at song select 2023-07-25 16:58:53 +09:00
Aki
cb354685ca
simplify code 2023-07-16 10:21:32 +08:00
Aki
309c852222
Compute the top local rank directly without an expensive detach call 2023-07-15 23:00:13 +08:00
Dean Herbert
d72765b6f8
Merge pull request #24114 from peppy/editor-save-local-score-management
Ensure scores always have the correct linked `BeatmapInfo`
2023-07-07 15:40:54 +09:00
Dean Herbert
ddd65f5fe7
Merge pull request #24135 from peppy/update-realm
Bring realm library up-to-date
2023-07-07 10:59:38 +09:00
Dean Herbert
f69f6adf67 Remove beatmap info wedge rotation animation
It looks jank and also causes framebuffer overheads.

But mostly because it looks jank.
2023-07-06 16:15:42 +09:00
Dean Herbert
a98a36872e Bring realm library up-to-date 2023-07-06 13:37:43 +09:00
Dean Herbert
d74b1e148d Make ScoreInfo.BeatmapInfo nullable 2023-07-04 14:50:34 +09:00
Bartłomiej Dach
bf99fc61b8
Trim full phrase filters in a more precise manner 2023-06-27 21:50:36 +02:00
Bartłomiej Dach
e3d97b37f1
Rename MatchMode.{None -> Substring} 2023-06-27 21:28:37 +02:00
Bartłomiej Dach
06654dc618
Merge branch 'master' into full-term-exact-match 2023-06-27 21:27:39 +02:00
Dean Herbert
c423f77d53 Add support for matching full terms using suffixed ! 2023-06-27 15:34:33 +09:00
Dean Herbert
702266198b Add missing "title=" search support at song select 2023-06-27 15:21:13 +09:00
Bartłomiej Dach
4cb122dad4
Escape user input before embedding into regex 2023-06-26 22:27:48 +02:00
Bartłomiej Dach
8a7a42b7ec
Remove weird nullable enable and double licence header 2023-06-26 22:19:52 +02:00
Dean Herbert
a74547c43c Add exact match support at song select 2023-06-26 18:26:44 +09:00
Dean Herbert
14c95f4584 Apply NRT to FilterCriteria 2023-06-26 17:54:11 +09:00
Bartłomiej Dach
e3a89a6273
Fix remaining obvious CI inspections 2023-06-24 16:07:01 +02:00
Dean Herbert
0ab0c52ad5 Automated pass 2023-06-24 01:00:03 +09:00
Dean Herbert
eb31fdecee Apply osu! side changes in line with FocusedOverlayContainer.PopIn abstract change
See https://github.com/ppy/osu-framework/pull/5834
2023-06-18 20:57:32 +09:00
Bartłomiej Dach
eafd774044
Bring back old formatting spec 2023-06-17 20:03:24 +02:00
Dean Herbert
4919069ea6 Avoid humanizer regex compilation overhead when opening song select for the first time 2023-06-18 02:19:03 +09:00
Dean Herbert
ce41ef6e5d Move OrderByTotalScore() to an extension method 2023-06-16 15:24:30 +09:00
Salman Ahmed
39db17d2e9 Use better method to avoid rewinding to deleted beatmaps 2023-06-15 11:22:11 +03:00
Salman Ahmed
2360219b55 Merge branch 'master' into fix-rewind-bug 2023-06-15 10:48:23 +03:00
Bartłomiej Dach
af3fbdbfbe
Merge pull request #23829 from Joehuu/truncating-text-tooltips
Add tooltips to truncated text
2023-06-12 23:43:31 +02:00
Salman Ahmed
7269b4807e
Merge branch 'master' into improve-song-select-enter-performance 2023-06-12 13:13:59 +03:00
Joseph Madamba
85fedbd025
Add tooltips to truncated text 2023-06-08 19:44:07 -07:00
Dean Herbert
10c43d2273 Reduce delays and fades for carousel panels to improve song select initial display performance
Entering song select has seen a hit since the new renderer
implementations. The underlying cause is large numbers of vertex buffer
uploads (the counter hits >200k for me during the transition).

Song select is in the process of being redesigned, and we are probably
going to make improvements to the renderer to alleviate this, but in the
mean time we can greatly improve the user experience by reducing how
long the initial fade in delays take on panels.

Visually this doesn't look too jarring, and gives a more immediate
feeling when scrolling. It's also more feasible to load elements sooner
with https://github.com/ppy/osu/pull/23809 applied.
2023-06-08 17:28:58 +09:00
Dean Herbert
3978d4babb Crop and disable mipmaps on beatmap panel backgrounds
This is an effort to improve general performance at song select. At
least on the metal renderer, I can notice very high draw frame overheads
related to texture uploads.

By reducing the size of the texture uploads to roughly match what is
actually being displayed on screen (using a relatively inexpensive crop
operation), we can bastly reduce stuttering both during initial load and
carousel scroll.

You might ask if it's safe to disable mipmapping, but I've tested with
lower resolutions and bilinear filtering seems to handle just fine.
Bilinear without mipmaps only falls apart when you scale below 50% and
we're not going too far past that at minimum game scale, if at all.
2023-06-08 16:51:07 +09:00
Salman Ahmed
62cb6a98ca Remove redundant nullable suppression directives 2023-06-07 08:20:41 +03:00
Dean Herbert
8ba9677b96
Merge branch 'master' into add-last-played-filter 2023-06-06 16:12:23 +09:00
Dean Herbert
c54670aee1 Add comment explaining implementation 2023-06-06 13:30:56 +09:00
Joseph Madamba
4eb0f0261c
Fix song select beatmap panels not displaying correct background shown in web 2023-06-04 22:54:15 -07:00
Dean Herbert
764f0323f4 Show "rewind" text on random button when beginning a right mouse press 2023-05-17 14:51:40 +09:00
Dean Herbert
94b184712d Fix random button hover state not correctly being reset on right click 2023-05-17 14:51:40 +09:00
Dean Herbert
444f66b0ee Move to base class for added safety 2023-05-03 18:46:30 +09:00
Dean Herbert
cd31cff8cd Fix event subscriptions not being cleaned up in DrawableCarouselBeatmap
The handling of cleanup is performed only the `Item_Set` method. This
was already correctly called for `DrawableCarouselBeatmapSet`, but not
for the class in question here.

This would cause runaway memory usage at song select when opening many
beatmaps to show their difficulties. For simplicity, we don't yet pool
these (and generate the drawables each time a set is opened) which isn't
great but likely will be improved upon when we update the visual /
filtering of the carousel. But this simplicity caused the memory usage
to blow out until exiting back to the main menu when cleanup would
finally occur.
2023-05-03 18:41:30 +09:00
Renzo Poggio
0991c56e1c
Add extra check in 'SelectPreviousRandom'
Check if the poped beatmap exists within the beatmapSets
2023-04-25 00:05:15 -03:00
Joseph Madamba
c80a25328d
Shorten label to just "matches" 2023-04-17 20:59:41 -07:00
Joseph Madamba
d0cbe206a9
Revert back to one number with "matching beatmap difficulties" label 2023-04-10 23:37:29 -07:00
Joseph Madamba
f0c8a3202b
Merge remote-tracking branch 'upstream/master' into fix-beatmap-terminology 2023-04-10 23:22:15 -07:00
Joseph Madamba
f80de08f24
Adjust BeatmapSetsChanged xmldoc
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2023-04-10 11:28:23 -07:00
Joseph Madamba
c7dea71793
Use existing BeatmapSetsChanged action 2023-04-10 11:26:18 -07:00
Joseph Madamba
7f5b99c91b
Fix song select beatmap difficulty count not updating when deleting 2023-04-09 22:12:51 -07:00
Elvendir
8e156fdb51 Enforce integer through regex match instead 2023-04-07 00:29:46 +02:00
Elvendir
928145cdeb Enforce integer value before y and M
Change impacted Tests
2023-04-05 22:12:15 +02:00
Elvendir
c2f225f025 Made Operator.Equal not parse for date filter and added corresponding test 2023-04-05 21:25:58 +02:00
Elvendir
df170517a8 -renamed function inverse() to reverseInequalityOperator() for clarity
-changed default case of reverseInequalityOperator() to out of range exception
2023-04-05 11:59:31 +02:00
Elvendir
d6c6507578
Update osu.Game/Screens/Select/FilterQueryParser.cs
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-04-04 19:30:13 +02:00
Elvendir
4b053b4785 changed regex match to be inline with standard 2023-04-01 22:58:25 +02: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
Dean Herbert
425be20e46 Fix song select search textbox font size incorrectly having increased 2023-03-22 14:17:39 +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
Elvendir
6dead81d21 Generalized tryUpdateLastPlayedRange to tryUpdateDateRange and Added tests 2023-03-19 18:43:17 +01:00
Elvendir
216a88e18d limited max Date comparison 2023-03-18 21:35:10 +01:00
Elvendir
102576cd8c adddede LastPlayed as filter option in beatmap carousel 2023-03-18 17:53:41 +01:00
Cootz
556964eae0
Merge branch 'master' into BitmapUpdatesOnScore 2023-03-16 12:16:42 +03:00
Dean Herbert
f21238f517 Adjust shadow to look better 2023-03-16 16:51:57 +09:00
Dean Herbert
cd102da3af Move matches string inside text box 2023-03-16 16:34:31 +09:00
Dean Herbert
89b42ddd98 Don't localise beatmap count string for now 2023-03-16 15:02:38 +09:00
Bartłomiej Dach
6c5ccdfd90
Merge branch 'master' into optimise-search 2023-03-07 22:07:29 +01:00
Bartłomiej Dach
5213bfa5c9
Merge branch 'master' into make_skin_reset_dangerous 2023-03-07 21:06:44 +01: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
87d0bef313 Use nullable comparison helper method instead of manual implementation 2023-03-06 15:16:32 +09: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
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
OliBomby
91d206e8d2 Optimised GetSearchableTerms
Reduced memory allocations to 1
2023-03-03 19:21:50 +01:00
Dean Herbert
82293c0c86 Don't filter away results with missing data when using "Date Submitted" or "Date Ranked" sort modes
From a user's perspective, changing a sort / order mode shouldn't filter
away results, but we were doing this.

In terms of UX expectations, in stable this kind of scenario would
results in a group being added to the end of son select with "Not
ranked" or "Unknown". I think we should aim to match this eventually.
2023-03-03 16:36:18 +09:00
Dean Herbert
dc669835e2 Show count of visible beatmaps at song select 2023-03-03 15:28:51 +09:00
mk56-spn
90227a6496 Rename DeleteConfirmationDialog.cs into DangerousActionDialog.cs 2023-02-27 21:57:59 +01:00
mk56-spn
299023fce0 Improve visibility of wedge shading in test scene and fix an issue with excessive roundness on said shadow. 2023-02-21 16:07:26 +01:00
Bartłomiej Dach
6afa65bd3d
Merge branch 'master' into skinnable-clean-up-documentation 2023-02-17 20:59:18 +01:00
Dean Herbert
394d368f16 Fix song select potentially updating background parameters when not the current screen 2023-02-16 18:45:22 +09:00
Dean Herbert
a92e42bb84 Rename SkinnableTargetContainer to SkinComponentsContainer
Also use full `SkinComponentsContainerLookup` instead of the sub-type.
This will potentially be useful once we bring in per-ruleset targets.
2023-02-15 18:37:41 +09:00
Dean Herbert
9ed068c1e6 Only apply dim changes when background blur is disabled 2023-02-15 14:16:34 +09:00
Dean Herbert
19e3c5d33c Adjust song select background dimming to be more evenly applied 2023-02-15 13:59:24 +09:00
Dean Herbert
51d4ae5241
Merge branch 'master' into footer_V2_implementation 2023-02-14 14:00:53 +09:00
Dean Herbert
f0ebb920b9 Make Actions nullable 2023-02-14 13:54:00 +09:00
MK56
5006dbe3db
Update osu.Game/Screens/Select/FooterV2/FooterButtonV2.cs
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2023-02-14 00:07:02 +01:00
mk56-spn
ae9a17d76b Add offset to FooterButtonV2.cs shadow 2023-02-13 22:20:41 +01:00
mk56-spn
be52d0a60c Add note explaining shadow opacity
pass ColourProvider in from test, instead of hard coding it in `FooterButtonV2.cs`
2023-02-13 22:18:34 +01:00
mk56-spn
61584ba63c Fix corner_radius missing in some parts of FooterButtonV2.cs.
Adjust shadow radius value to 5 to match figma.
2023-02-13 22:15:29 +01:00
mk56-spn
6e6421caea Change FooterV2.cs colour to use ColourProvider instead of OsuColour.
Remove unnecessary `FillFlowContainer`
2023-02-13 22:12:25 +01:00
PC
7e127dafe2 Update reference 2023-02-07 11:52:47 +03:00
Cootz
2c7386db39 FIx score appearing on BeatmapLeaderboard and TopLocalRank 2023-02-06 15:14:14 +03:00
Dean Herbert
ddcc02fdfe
Merge pull request #22505 from Joehuu/fix-hover-click-sounds
Fix some clickable elements having no hover and click sounds
2023-02-06 16:52:19 +09:00
mk56-spn
38cc47d64e Remove ``IsPresent`` usages 2023-02-04 16:52:30 +01:00
mk56-spn
de37a0a000 enable pixelSnapping for the ``BufferedContainer`` in BeatmapInfoWedgeV2.cs 2023-02-03 19:53:04 +01:00
mk56-spn
5fc8f1d1be Fix ``BeatmapInfoWedgeV2.cs`` starCounter needing janky rotation application 2023-02-03 19:52:01 +01:00
Joseph Madamba
5a76c1ab9c Refactor HoverSampleDebounceComponent to inherit Component 2023-02-03 00:29:25 -08:00
Dean Herbert
4ec46c7476
Merge branch 'master' into footer_V2_implementation 2023-02-03 16:30:16 +09:00
Dean Herbert
48f7e0163c Adjust comments and formatting of comments 2023-02-03 16:27:20 +09:00
Dean Herbert
4248453616 Use FinishTransforms rather than manual duplication of background colour logic 2023-02-03 16:27:20 +09:00
Dean Herbert
a1200b8fe8 Adjust footer button colour handling to read better and take into account mouse down 2023-02-03 16:27:20 +09:00
Dean Herbert
f7094567d7 Rename and document method to limit scope 2023-02-03 15:04:47 +09:00
mk56-spn
80fd1a0bc7 Remove leftover comment regarding X axis offsets 2023-02-02 18:29:12 +01:00
Dean Herbert
91fbf388da Use localisation strings from ButtonSystem for better consistency 2023-02-02 15:00:24 +09:00
Dean Herbert
500e9c7944 Refactor into a method rather than property 2023-02-02 14:53:58 +09:00
Dean Herbert
942e7729f3 Merge branch 'master' into carousel 2023-02-02 14:41:55 +09:00
mk56-spn
27c52a45fc Use inline lambda for scheduling 2023-01-30 16:13:55 +01:00
mk56-spn
92690afa5f de-nest ``removeOldInfo()`` 2023-01-30 16:12:26 +01:00
mk56-spn
c7d49bdc82 Update ``BeatmapInfoWedgeV2.cs` animation to be similar to exit transition in `SongSelect.cs` 2023-01-30 13:13:57 +01:00
mk56-spn
f5d579144b Remove free mods button 2023-01-30 12:57:24 +01:00
mk56-spn
41f5e5143a Remove ``onclick` and `mousedown`` override 2023-01-30 12:56:39 +01:00
Dean Herbert
e333e12b2e Fix typo in settings enum (seriously) 2023-01-25 16:32:00 +09:00
Dean Herbert
3faab66f39 Merge branch 'master' into beatmapSelectionBlur 2023-01-25 16:32:00 +09:00
Dean Herbert
1a9ed1ac3f Remove unnecessary IgnoreUserSettings value change 2023-01-25 16:28:06 +09:00
Jérémiah DÉCOMBE
e0a7559d85 variable naming + loc 2023-01-24 09:55:08 +01:00
Jérémiah DÉCOMBE
7ca2a431e6 changing song select background blur setting to boolean 2023-01-24 09:19:53 +01:00
Jérémiah DÉCOMBE
d783998c81 using BindValueChanged and IsCurrentScreen for setting binding 2023-01-24 09:09:05 +01:00
Dean Herbert
bb15ee50e0 Fix beatmap leaderboard potentially showing incorrect leaderboard 2023-01-24 13:52:59 +09:00
Jeremiah DECOMBE
c1876aac88 removing parameter name abbreviations 2023-01-24 00:36:38 +01:00
Jeremiah DECOMBE
b573e42cc2 BeatmapSelectionBackgroundBlurLevel renamed to SongSelectBackgroundBlurLevel 2023-01-24 00:08:11 +01:00
Jeremiah DECOMBE
26adc28943 missing blank line between methods 2023-01-23 23:15:37 +01:00
Jeremiah DECOMBE
f13a5465ba variable naming and loc modifications 2023-01-23 23:07:50 +01:00
mk56-spn
655242371b Buffer wedge content to avoid opacity issues when showing / hiding 2023-01-23 17:00:46 +01:00
Jérémiah DÉCOMBE
6daa364779 adding setting to adjust blur of the background of the song select screen 2023-01-23 13:53:31 +01:00
Dean Herbert
e3932c077b
Merge pull request #22032 from frenzibyte/fix-potential-difficulty-failure-alt
Fix advanced statistics display potentially performing invalid difficulty calculation
2023-01-23 15:39:47 +09:00
Bartłomiej Dach
4a6f6300c5
Merge branch 'master' into fix-carousel-sort-change-after-play 2023-01-18 17:15:20 +01:00
Bartłomiej Dach
7ba448b13c
Update comment to match implementation 2023-01-18 17:12:57 +01:00
mk56-spn
0ac7cd7409 Expose star difficulty to wedge to allow updating starcounter and background colour internally. 2023-01-18 13:55:52 +01:00
Dean Herbert
3b27774561 Remove OnlineID sort consideration 2023-01-18 19:21:02 +09:00
Dean Herbert
4ad79a8a0a Move IsLoaded check inside BeatmapCarousel 2023-01-18 12:00:47 +09:00
mk56-spn
92a755c5da adjust colourbar to position itself in a more simple fashion 2023-01-17 22:16:59 +01:00
Bartłomiej Dach
6f11fbdeed
Merge branch 'master' into fix-carousel-sort-change-after-play 2023-01-17 20:46:06 +01:00
Dean Herbert
8e1002b744 Fix song select potentially operating on Carousel before it is fully loaded
Should fix test failures like
https://github.com/ppy/osu/actions/runs/3939620830/jobs/6739690253.
2023-01-18 01:56:18 +09:00
Dean Herbert
a9ac28b504 Add fallback sorts to CarouselBeatmapSet to ensure stable sorting 2023-01-17 16:40:25 +09:00
Dean Herbert
ef35493864 Avoid need for weird null check by reordering initialisation process 2023-01-17 15:27:21 +09:00
mk56-spn
74b72e4ac0 Address issues that joehuu brought up 2023-01-16 22:46:18 +01:00
OliBomby
832d033777 Fix merge issues 2023-01-16 01:09:04 +01:00
OliBomby
ab6bf6e1dc Merge remote-tracking branch 'upstream/master' into carousel 2023-01-16 00:27:56 +01:00
OliBomby
1c0a650575 Fix typo 2023-01-16 00:17:26 +01:00
OliBomby
87ee9ab813 Added custom menu items in DrawableCarouselBeatmap 2023-01-16 00:13:12 +01:00
mk56-spn
9a29c9ae26 remove hacky method to check if carousel is null 2023-01-15 15:32:53 +01:00
Dean Herbert
c5775aa452
Merge branch 'master' into song_select_nullability 2023-01-15 22:44:13 +09:00
Dean Herbert
4cf4a66858 Make MusicController a required dependency of SongSelect 2023-01-15 22:43:30 +09:00
Dean Herbert
f7af5a8115 Revert some formatting changes 2023-01-15 22:39:00 +09:00
Dean Herbert
4906f37109
Merge pull request #22181 from frenzibyte/attempt-fix-song-select-test-failure
Fix intermittent failure in beatmap carousel tests
2023-01-15 02:35:36 +09:00
ansel
515ada6815 Remove CanBeNull where it's no longer requered 2023-01-13 23:11:50 +03:00
ansel
a41a031909 Localise some notifications 2023-01-13 23:11:25 +03:00
Salman Ahmed
112cf403ec Fix intermittent failure in certain beatmap carousel tests 2023-01-13 19:41:44 +03:00
mk56-spn
a6b6fb864e Make carousel non nullable and ensure pre load usages of methods that reference it are protected against failure 2023-01-13 13:10:29 +01:00
mk56-spn
403ca05e5e Enable nullability for song select 2023-01-13 00:52:14 +01:00
Bartłomiej Dach
aab84d50eb
Remove boxing overhead in CarouselItem comparator 2023-01-10 18:35:06 +01:00
mk56-spn
880428046a Fix margins on top right aligned elements. 2023-01-10 18:03:28 +01:00
mk56-spn
2a82f618ed Add TODO for text margin const, added pertinent comments to known "issues" 2023-01-10 17:34:47 +01:00
mk56-spn
9afdfd7f06 small tweaks, container edge - effect addition.. 2023-01-10 11:45:41 +01:00
mk56-spn
65c30d2c2e Remove nullability disabling 2023-01-10 11:45:41 +01:00
mk56-spn
1698272eb8 Simplify passing data from BeatmapInfoWedgeV2.cs to subclass wedgeinfotext 2023-01-10 11:45:40 +01:00
mk56-spn
61caabaa8e Add coloured star counter 2023-01-10 11:45:40 +01:00
mk56-spn
0199c19f74 Add a test scene and move colour bar to back and adjust positioning of it 2023-01-10 11:45:40 +01:00
mk56-spn
c646f8479b Move stardifficulty logic to main BeatmapInfoWedge class instead of text subclass ( for use by background star rating colour bar ) 2023-01-10 11:45:40 +01:00
mk56-spn
f561120295 Remove info labels, since they are no longer present in this component in thew new design 2023-01-10 11:45:40 +01:00
Dean Herbert
b7e845201f Fix whitespace around Debug.Assert 2023-01-10 18:03:17 +09:00
Dean Herbert
d53dafa29f Revert Debug.Assert 2023-01-10 17:52:28 +09:00
Dean Herbert
93038ce496 Use OfType instead of forceful nullability 2023-01-10 17:52:21 +09:00
mk56-spn
6abbc7dc28 Further fix nullability 2023-01-09 20:59:28 +01:00
mk56-spn
69260ca3c3 remove unnecessary usages of nullable forgiveness, add asserts for debugging 2023-01-09 18:36:55 +01:00
mk56-spn
47fb467012 Remove nullable disabling in carousel 2023-01-08 19:02:48 +01:00
Dean Herbert
464f251c0c
Merge branch 'master' into beatmap-set-link-genre-language 2023-01-06 17:09:06 +08:00
Salman Ahmed
8f37e69dc4 Schedule difficulty calculation to avoid performing with incomplete state updates 2023-01-05 12:52:08 +03:00
Salman Ahmed
39221a52da Fix advanced statistics display using decoupled ruleset bindable for difficulty calculation 2023-01-05 12:52:08 +03:00
Dean Herbert
beb3b96aca Harden request equality checks 2023-01-04 01:44:00 +08:00
Dean Herbert
8f7ae0395a Fix song select leaderboard potentially showing wrong scores on quick beatmap changes
Closes #22002.
2023-01-03 00:55:09 +08:00
mk56-spn
680646d3a6 Make offsetting of bottom bar more readable 2022-12-29 12:02:08 +01:00
Joseph Madamba
494886ef92 Rename Text to Metadata 2022-12-23 11:11:15 -08:00
Joseph Madamba
1d39e8d0ce Refactor MetadataSection to use generics and inheritance 2022-12-21 10:18:47 -08:00
mk56-spn
626f4b0dfd fix test failures, improve button logic 2022-12-19 16:35:20 +01:00
MK56
878e2f24c4
Merge branch 'master' into footer_V2_implementation 2022-12-19 13:19:23 +01:00
mk56-spn
407b0a0ad3 Address issues from Joehuu review 2022-12-19 11:30:23 +01:00
ansel
b66409bd37 Perform rewind with right click only if cursor didn't leave the button 2022-12-05 23:38:45 +03:00
mk56-spn
7373d79ba6 Use OsuColour instead of hex for button accent colour 2022-12-02 19:16:25 +01:00
mk56-spn
c5bad816db Add button colouring whilst corresponding overlay is present 2022-12-02 18:44:21 +01:00
mk56-spn
ea882f6874 Add disabled button dimming. 2022-12-01 22:31:14 +01:00
mk56-spn
55a21a75a4 Add hover lightening 2022-12-01 22:07:28 +01:00
mk56-spn
d7cea51551 Add functionality of Random button 2022-12-01 16:29:52 +01:00
mk56-spn
1530495e7c Add button "accent" colour, bottom bar, icon, text 2022-12-01 15:34:09 +01:00
mk56-spn
774eb178a1 Add basic button design and footer button addition flow 2022-12-01 13:13:37 +01:00
mk56-spn
18b4317e99 Create Basic V2 footer and test 2022-12-01 11:57:50 +01:00
mk56-spn
0aba119056 Merge remote-tracking branch 'origin/RangeSlider_implementation' into RangeSlider_implementation
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeFilterControl.cs
#	osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
2022-11-27 10:40:29 +01:00
Dan Balasescu
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
mk56-spn
92ed2ed4ef Refactor star "DifficultyRangeFilterControl" into generic range slider class 2022-11-26 12:19:08 +01:00
Dean Herbert
de163b2bb5 Change song select to only allow volume adjusting if alt is held while scrolling 2022-11-22 19:48:55 +09:00
Dean Herbert
4a79141824
Merge pull request #21338 from RATCM/fix-leaderboard-filter
Match leaderboard filter behaviour to web
2022-11-21 14:01:55 +09:00
RATCM
f5fbb7c8de Changed comments 2022-11-20 19:27:40 +01:00
RATCM
d20a357c0e Fixed ordering bug 2022-11-20 19:24:51 +01:00
RATCM
9040dfbd4e Match leaderboard filter behaviour to web 2022-11-20 17:39:46 +01:00
Bartłomiej Dach
7b274083d3
Fix phantom beatmap sets appearing on carousel after delete/update
Regressed in c40c70509e.

As it turns out, `item.Item.Filtered.Value` is not the only condition
that should be checked to determine if a carousel item should be hidden
or not - `item.Item.State.Value != CarouselItemState.Collapsed` should
also be true. This was even available as the `item.Item.Visible`
convenience property, which is used in this commit.

Failing to check `item.Item.State.Value` led to setting non-zero alpha
on collapsed carousel items, leading to phantom beatmap sets appearing,
as the alpha was set in the entire carousel's `Update()` method, thus
firing every frame.
2022-11-20 10:08:34 +01:00
nanashi-1
4773979e52 add condition 2022-11-17 16:15:34 +08:00
Salman Ahmed
87b4fee10f Remove leftover constant 2022-11-17 04:05:21 +03:00
Salman Ahmed
55beaf5d93 Revert buttons order change 2022-11-17 04:05:15 +03:00
Salman Ahmed
039ab83a46 Disable beatmap options button when none selected 2022-11-17 04:00:23 +03:00
Salman Ahmed
0e46614c57 Revert beatmap option button state changes 2022-11-17 03:57:01 +03:00
nanashi-1
5d8d8ffce5 fix naming 2022-11-16 10:09:51 +08:00
nanashi-1
55edd6c907 add space 2022-11-16 09:58:49 +08:00
nanashi-1
1fb8357e93 change disabledAlpha from readonly to const 2022-11-16 09:58:32 +08:00
nanashi-1
9101ad0cbd fixed naming 2022-11-16 09:42:40 +08:00
nanashi-1
5973bb1956 AddButton now returns the button 2022-11-15 20:57:31 +08:00
nanashi-1
1186ed3e32 add disable 2022-11-15 20:56:18 +08:00
nanashi-1
e8d170e772 disable certain options when no beatmap is selected 2022-11-15 20:55:55 +08:00
Dean Herbert
1aa0e40f2f Add "Component" prefix to lookup naming 2022-11-09 17:46:43 +09:00
Dean Herbert
e75c3b3f94 Rename SkinnableTarget to GlobalSkinLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
391840404d Play exiting transition in both directions 2022-11-07 11:59:43 +09:00
Dean Herbert
c40c70509e Improve song select transition to gameplay 2022-11-04 15:24:37 +09:00
Dean Herbert
20dd405c2b
Merge branch 'master' into maintain-common-mod-selection 2022-11-03 15:32:40 +09:00
Dean Herbert
d9d083752a Clamp backwards index to total current items to fix edge case of item removal 2022-10-26 11:03:11 +09:00
Dean Herbert
cf3bf41b49 Harden and simplify logic to avoid weird issues 2022-10-25 18:57:15 +09:00
Dean Herbert
22ea9a8ab4 Add early return of carousel group has no items 2022-10-25 13:34:22 +09:00
Dean Herbert
2456a18bc1 Rewrite implementation to avoid duplicated LINQ returns 2022-10-25 12:48:17 +09:00
Endrik Tombak
5a118cfdc3 Merge branch 'master' of https://github.com/ppy/osu into carousel-perform-selection
 Conflicts:
	osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
2022-10-24 21:40:48 +03:00
Salman Ahmed
01c65d3cc1 Remove seemingly unnecessary/leftover code 2022-10-14 02:16:36 +03:00
Salman Ahmed
964ed01abb Add confirmation dialog for updating locally modified beatmaps 2022-10-13 02:40:15 +03:00
Dean Herbert
a44ba579c5 Fix beatmap update button not respecting user "prefer no video" setting
Closes #20701.
2022-10-11 14:27:40 +09:00
Dean Herbert
d9f678d942 Change song select random key binding to not handle key repeat 2022-10-03 18:16:54 +09:00
Dean Herbert
5fc836d1f0 Apply NRT to BeatmapLeaderboard / MatchLeaderboard 2022-09-26 16:17:28 +09:00
Dean Herbert
32d56fe3a9 Use request cancellation and IsDisposed guard instead of more Schedule 2022-09-26 16:02:33 +09:00
Dean Herbert
0fa5e1b28e Fix intermittent leaderboard crash due to request finishing after drawable is disposed 2022-09-23 20:18:44 +09:00
Dean Herbert
5b73f24864 Fix outdated scores being held by BeatmapLeaderboard after external beatmap switch 2022-09-21 15:21:32 +09:00
Dean Herbert
68c040175a Ensure Leaderboard.Scores is updated immediately via request flow 2022-09-20 17:02:57 +09:00
Dean Herbert
46db3ad96d Move implementation to individual classes 2022-09-20 00:06:02 +09:00
Dean Herbert
4c4fdfd153 Provide scores directly to Player instance rather than relying on DI 2022-09-16 18:15:17 +09:00
Dean Herbert
0227eddda1 Merge branch 'master' into gameplay-leaderboards 2022-09-16 15:44:58 +09:00
Dean Herbert
b4e6a20846 Fix song select status prefix matching no longer working
Regressed in #19275 due to weird logic.
Closes #20289.
2022-09-14 12:59:05 +09:00
Dean Herbert
94693a4667 Fix oversight when making interface implementation explicit 2022-09-13 19:55:57 +09:00
Dean Herbert
6d167070f8 Add back DI leaderboard retrieval via bindable pathway 2022-09-13 18:45:11 +09:00
Dan Balasescu
3cfacb5e39
Merge pull request #20257 from peppy/update-button-show-login
Show login overlay when attempting to update a beatmap while logged out
2022-09-12 17:51:45 +09:00
Dan Balasescu
31225066a1
Merge pull request #19308 from frenzibyte/top-rank-badge-order
Fix best rank badge not handling legacy scores properly
2022-09-12 16:20:21 +09:00
Dean Herbert
94f8197e22 Show login overlay when attempting to update a beatmap while logged out 2022-09-12 16:15:14 +09:00
Salman Ahmed
95062c2cc8 Remove center origin specification to avoid single-frame layout issues 2022-09-09 19:42:58 +03:00
Salman Ahmed
dd10a06e3d Merge branch 'master' into top-rank-badge-order 2022-09-09 19:38:44 +03:00
Dean Herbert
602ffebd54 Apply NRT and fix code style 2022-09-09 23:29:04 +09:00
Dean Herbert
d961b96897 Merge branch 'master' into search-filter 2022-09-09 23:25:54 +09:00
Dean Herbert
d463bd2f3f
Merge pull request #20130 from Exanc/master
Display 0 stars instead of infinity for the minimum star slider
2022-09-08 17:51:32 +09:00
Dean Herbert
d523a2ac33 Rename default value field and make private 2022-09-08 15:53:08 +09:00
Dean Herbert
9ead5e59d3 Fix incorrectly displaying minimum value in placeholder messaging 2022-09-08 15:51:15 +09:00
Dean Herbert
f3bda4e040 Fix weird edge case of nullability in CarouselRoot
A bit unfortunately, but it's what we get for having ctor level bindings..
2022-09-07 14:27:25 +09:00
Dean Herbert
e18b524f8e Fix missing null checks on selectedBeatmap fields in BeatmapCarousel 2022-09-07 14:12:35 +09:00
Dean Herbert
241d33d415 Apply NRT to BeatmapCarousel 2022-09-07 14:07:53 +09:00
Exanc
4ea7ca4c07 Slight tweak to the StarsSlider
- MinimumStarsSlider now shows "0" when at it's minimum
 - Modified and NoResultsPlaceholder the tooltip to stay consistent with the changes
2022-09-05 00:09:20 +02:00
Dean Herbert
1524623624 Fix back-to-front filter logic
Was copied across from a place which was checking for `match` and
applied verbatim to a place that was `filter`. Which are polar
opposites.
2022-09-01 19:59:27 +09:00
Dean Herbert
82b9e1f0eb
Merge pull request #20011 from smoogipoo/scoring-refactor
Refactor scoring to remove async methods / simplify
2022-08-29 19:55:27 +09:00
Dan Balasescu
423f6f90f2 Remove async calls from ScoreManager 2022-08-29 15:34:08 +09:00
Salman Ahmed
a3e595a9aa Update comment to include inserted indices 2022-08-26 14:51:19 +03:00
Salman Ahmed
81c0a641b4 Fix selection fallback path not updated to check inserted indices 2022-08-26 14:51:08 +03:00
Salman Ahmed
f38194fb40 Merge branch 'master' into carousel-maintain-selection-over-update 2022-08-26 14:35:19 +03:00
Dean Herbert
217fa00a72 Bring logic up-to-date 2022-08-26 19:32:49 +09:00
Dean Herbert
a146db0e35 Merge branch 'master' into carousel-perform-selection 2022-08-26 19:29:00 +09:00
Andrew Hong
55f1b43329 Removed check 2022-08-22 13:41:36 -04:00
Andrew Hong
bcab7aea26
Merge branch 'master' into add-date-created-sort 2022-08-22 04:02:46 -04:00
Andrew Hong
c2036d3893 Moved filter exclusion 2022-08-22 03:39:46 -04:00
Andrew Hong
09ef13908c Adjust to reviews 2022-08-22 03:20:27 -04:00
Dan Balasescu
0815b01b75
Merge pull request #19783 from bdach/mod-select/presets-dont-open-customisation
Fix selecting preset containing Difficulty Adjust automatically opening customisation panel
2022-08-22 15:44:00 +09:00
Andrew Hong
c6a739f5a8 Add date submitted sorting 2022-08-21 23:09:33 -04:00
Dean Herbert
37799e3b31 Allow preparing preview point without looping 2022-08-17 13:20:24 +09:00
Dean Herbert
9d2c2b71cf Change conditional to check for insertions in addition to modifications
It is possible that the import process itself marks the previous
beatmaps as deleted due to an overlap in metadata or otherwise.
2022-08-16 16:21:36 +09:00
Bartłomiej Dach
5ff2e41a55
Add preset column to mod select test scene 2022-08-15 18:38:37 +02:00
Dean Herbert
cbe5cb5d03 Merge branch 'master' into carousel-maintain-selection-over-update 2022-08-08 18:01:26 +09:00
Bartłomiej Dach
839409d7ac
Add preset column to solo mod select overlay 2022-08-07 16:20:31 +02:00
Bartłomiej Dach
a0d093be5c
Extract common implementation of delete dialog 2022-08-06 21:04:12 +02:00
Dean Herbert
c0e5f11c90
Merge pull request #19532 from frenzibyte/fix-new-items-sort-stability
Fix newly imported beatmaps not using correct comparer for sorting
2022-08-02 02:20:51 +09:00
Salman Ahmed
fc7fc3d673 Fix newly imported beatmaps not using correct comparer for sorting 2022-08-01 19:13:57 +03:00
Salman Ahmed
faefda9143 Fix song select not updating selected beatmap card on editor resume 2022-07-30 19:47:42 +03:00
Dean Herbert
ad482b8afc Tidy up naming of collection dropdowns 2022-07-28 13:57:21 +09:00
Dean Herbert
67c7f324ee Simplify CollectionFilterDropdown filter flow weirdness 2022-07-28 13:57:21 +09:00
Dean Herbert
438067a18b Convert realm data propagation to more correctly use Live<T>
wip
2022-07-27 19:35:09 +09:00
Dean Herbert
41393616d8 Replace BeatmapCollection with RealmBeatmapCollection 2022-07-27 19:35:09 +09:00
Dean Herbert
9c543fef48 Remove CollectionManager 2022-07-27 18:45:33 +09:00
Dean Herbert
e6a3659581 Guard against NewModifiedIndices being empty 2022-07-27 14:23:47 +09:00