Denrage
6bf6084ae9
fixed according to suggestions
2021-04-19 19:24:46 +02:00
Denrage
9f24cdb355
Added Author Link in BeatmapInfoWedge
2021-04-19 16:54:09 +02:00
Dean Herbert
dfe3240b45
Merge pull request #12353 from nekodex/songselect-hoversamples
...
Add a hover sample type for SongSelect buttons
2021-04-10 01:45:47 +09:00
Jamie Taylor
ffacd38e57
Reduce the randomised pitch range of hover sounds
2021-04-09 23:03:14 +09:00
Jamie Taylor
8a0da06e89
Add a hover sample type for SongSelect buttons
2021-04-09 23:00:40 +09:00
Dean Herbert
0f2c03d54b
Add back "rewind" text, showing temporarily after a rewind occurs
2021-04-07 18:29:45 +09:00
Dean Herbert
afc745f999
Merge branch 'master' into rebind-song-select
2021-04-07 17:13:25 +09:00
Dean Herbert
3113eefcf6
Don't attempt to load content when not online
2021-04-06 17:12:00 +09:00
Dean Herbert
899d708dac
Move loading layer up one level to correct padding
2021-04-06 17:09:51 +09:00
Dean Herbert
1934e8e1fe
Fix loading layer being in the wrong place
2021-04-06 16:30:47 +09:00
Dean Herbert
59e6c46644
Remove unnecessary online state logic
2021-04-06 16:23:27 +09:00
Dean Herbert
dafa8bbe4e
Refactor BeatmapDetails to use GridContainer to keep a consistent layout
2021-04-06 16:21:20 +09:00
PercyDan54
a5a19319cc
Fix code style
2021-04-02 21:15:28 +08:00
PercyDan54
1ff77754fd
Use OnlineViewContainer
2021-04-02 20:14:31 +08:00
Dean Herbert
6cb14e91c9
Make Player abstract and introduce SoloPlayer
2021-03-23 18:18:49 +09:00
Bartłomiej Dach
12b7d9e06d
Simplify custom filter criteria retrieval
2021-03-06 12:16:01 +01: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
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
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
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
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
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
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
Dean Herbert
e82eaffaed
Flip order back to original for romanisable strings
2021-02-25 14:14:07 +09:00
Dean Herbert
a362382d38
Add back more correct null checks
2021-02-25 14:06:21 +09: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
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
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
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
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
90dce52042
Fix potential crash from cross-thread drawable manipulation in CollectionFilterDropdown
2021-02-18 14:10:28 +09:00
smoogipoo
d3f0c0730d
Merge branch 'master' into non-concurrent-sample-playback
2021-02-12 17:22:15 +09:00
Dean Herbert
cd01591dda
Consume new debounce logic in carousel header
2021-02-12 12:22:35 +09:00
Dean Herbert
98c5b0220c
Merge pull request #11725 from smoogipoo/freemods-user-settings
...
Add local user customisation for freemod mod settings
2021-02-11 16:02:24 +09:00
Dean Herbert
eaa7b4cb93
Rename second usage variable name to match
2021-02-11 14:54:50 +09:00
smoogipoo
6fff7c39da
Ensure tracker is disposed
2021-02-10 20:09:45 +09:00
smoogipoo
393cd6c74a
Add helper class for tracking changes to mod settings
2021-02-10 19:40:07 +09:00
Jamie Taylor
bc7f4a4f88
Use a single sample for CarouselHeader on-hover with randomised pitch instead of multiple samples
2021-02-10 17:53:47 +09:00
smoogipoo
69ca440ae5
Merge branch 'master' into more-accurate-most-common-bpm
2021-02-08 18:40:58 +09:00
Dean Herbert
3e750feaa4
Subclass LocalPlayerModSelectOverlay to correctly deselect incompatible mods on free mod selection
2021-02-05 16:42:35 +09:00
smoogipoo
97e3023df9
Renamespace/rename MatchSongSelect -> PlaylistsSongSelect
2021-02-01 20:16:58 +09:00
smoogipoo
9c4c47599f
Merge branch 'master' into freemods
2021-02-01 19:28:10 +09:00
smoogipoo
89a42d60fb
General cleanup
2021-02-01 18:50:32 +09:00
smoogipoo
426569c2a9
Move common song select implementation for online play
2021-02-01 14:57:39 +09:00
smoogipoo
230b347c1e
Move ModSelectOverlay.IsValidMod to a property
2021-02-01 12:18:11 +09:00
smoogipoo
45e41aaeac
Initial implementation of freemod selection overlay
2021-01-27 22:15:53 +09:00
smoogipoo
4019cc38e5
Allow footer buttons to be customised
2021-01-27 22:03:51 +09:00
smoogipoo
91d34d86f7
Abstractify ModSelectOverlay
2021-01-27 22:02:23 +09:00
Dean Herbert
a6516e3be5
Merge branch 'master' into scroll-to-20
2021-01-21 14:28:17 +09:00
Dean Herbert
7c4a072568
Merge branch 'master' into scroll-to-20
2021-01-21 13:48:26 +09:00
smoogipoo
eb85efcea2
Add check to playlists too
2021-01-20 20:59:28 +09:00
smoogipoo
de9d075f94
Initial sample + samplechannel rework
2021-01-19 17:11:40 +09:00
Dean Herbert
0b165dce4b
Fix multiplayer mod select showing autoplay as a choice
2021-01-18 17:50:32 +09:00
smoogipoo
24e991a5ef
Actually return beat length and not BPM
2021-01-15 14:35:09 +09:00
smoogipoo
c6e9a6cd5a
Make most common BPM more accurate
2021-01-15 14:28:49 +09:00
Dean Herbert
0a65ae8f1e
Fix the beatmap carousel playing the difficulty change sample on beatmap change
2021-01-15 14:07:24 +09:00
Dean Herbert
4973e23003
Merge branch 'master' into fix-transform-mutation-mod-selection
2021-01-08 11:16:15 +09:00
Bartłomiej Dach
4998aaaa98
Remove outdated warning disable
...
Does not trigger any more on Rider 2020.3.2.
2021-01-06 18:38:25 +01:00
Bartłomiej Dach
7651d4554a
Merge branch 'master' into fix-transform-carousel
2021-01-06 13:49:05 +01:00
Bartłomiej Dach
43b9fde457
Add some nullability annotations for good measure
2021-01-06 13:15:15 +01:00
Dean Herbert
99701a6d9b
Add null check on beatmapContainer for safety
2021-01-06 21:06:33 +09:00
Dean Herbert
ffafdf2209
Merge branch 'master' into fix-transform-carousel
2021-01-06 21:03:22 +09:00
Bartłomiej Dach
25b4628672
Merge branch 'master' into fix-transform-mutation-from-background
2021-01-06 11:04:51 +01:00
Bartłomiej Dach
52687fc37c
Merge branch 'master' into fix-transform-mutation-loading-layer
2021-01-05 23:10:51 +01:00
Dean Herbert
4b539b01c1
Match code between updateSelectedBeatmap/Ruleset
2021-01-05 20:38:58 +09:00
Dean Herbert
83dbba3cbf
Fix carousel beatmap set panels applying transforms to difficulties while they are loading
2021-01-05 18:41:45 +09:00
Dean Herbert
54982dcdd7
Refactor LoadingLayer to avoid applying effects to external drawables
...
In theory this seemed like a good idea (and an optimisation in some
cases, due to lower fill rate), but in practice this leads to weird edge
cases.
This aims to do away with the operations on external drawables by
applying a dim to the area behind the `LoadingLayer` when required.
I went over each usage and ensured they look as good or better than
previously.
The specific bad usage here was the restoration of the colour on dispose
(if the `LoadingLayer` was disposed in a still-visible state).
I'm aware that the `BeatmapListingOverlay` will now dim completely during
load. I think this is fine for the time being.
2021-01-05 17:31:45 +09:00
Dean Herbert
9bac791a57
Fix deselection of autoplay mod failing
2021-01-05 16:17:58 +09:00
Dean Herbert
b3f08b29ca
Ensure that all changes to screen backgrounds are on the correct thread
2021-01-05 15:22:50 +09:00
Dean Herbert
a3e4e2f6c3
Switch ResultsScreen and SongSelect inheritance and remove local implementation
2021-01-05 15:22:50 +09:00
Dean Herbert
53e6a349bb
Fix incorrect initial conditional
...
Turns out this wasn't actually required.
2021-01-03 22:44:32 +09:00
Dean Herbert
efb71713ef
Fix null condition inhibiting deselection events
2021-01-03 22:43:02 +09:00
Dean Herbert
a6d4992997
Ensure SelectionChanged events are only sent once when selection is null
2021-01-03 12:53:25 +09:00
Dean Herbert
caa5109e3a
Add precautionary null checks to update methods in SongSelect
2021-01-03 12:18:35 +09:00
Dean Herbert
e2de5bb8f9
Fix the beatmap carousel not returning to centre correctly after resizing window
2021-01-02 22:05:41 +09:00
Bartłomiej Dach
4c43a67b68
Rename I{Multiplayer -> OnlinePlay}SubScreen
2020-12-25 18:07:34 +01:00
Bartłomiej Dach
83fb7c7a1a
Re-namespace all files in OnlinePlay directory
2020-12-25 16:50:09 +01:00
Dean Herbert
5d4b73baa5
RealtimeMultiplayer -> Multiplayer
2020-12-25 14:10:59 +09:00
Endrik Tombak
78c14fd696
Refactor code into UserTrackingScrollContainer
2020-12-22 17:36:44 +02:00
Dean Herbert
df5e1d83bd
Allow recommender to potentially be null
2020-12-22 14:36:52 +09:00
Dean Herbert
8cc2ed3fae
Move from OsuGameBase to OsuGame
...
Also moves to a more suitable namespace.
2020-12-22 14:28:27 +09:00
Dean Herbert
626b7615ad
Move and rename some fields for better readability
2020-12-22 14:23:33 +09:00
Dean Herbert
dff865f335
Tidy up comments, code, and multiple linq enumeration
2020-12-22 14:12:02 +09:00
Dean Herbert
d229fbba6e
Merge branch 'master' into present-recommended
2020-12-22 13:52:29 +09:00
Endrik Tombak
c25e2c3dd5
Select recommended beatmap if last selection is filtered
2020-12-03 23:13:14 +02:00
Endrik Tombak
49be4978bd
Avoid calling ToList twice
2020-12-03 19:53:41 +02:00
Endrik Tombak
4cd2e207ac
Document getBestRulesetOrder
2020-12-03 19:53:06 +02:00
Endrik Tombak
48dad61a46
Apply review suggestions
2020-12-03 19:44:12 +02:00
Endrik Tombak
cbbcf36eaa
Merge branch 'master' of https://github.com/ppy/osu into present-recommended
2020-12-03 19:38:32 +02:00
Dan Balasescu
1d92800761
Merge pull request #11068 from peppy/fix-carousel-edge-masking
...
Fix beatmap carousel panels getting masked away when out of scroll bounds
2020-12-03 20:40:44 +09:00
smoogipoo
31f7f7072d
Fix song select panels not loading if partially offscreen
2020-12-03 15:13:20 +09:00
Dean Herbert
897f593b37
Fix beatmap carousel panels getting masked away when out of scroll bounds
...
Regressed in https://github.com/ppy/osu/pull/10973 due to removed masking specification.
Closes #11067 .
2020-12-03 13:26:28 +09:00
Dean Herbert
a852a27dfb
Fix current beatmap temporarily becoming empty during ruleset change
...
When changing the ruleset at song select, there was a scenario where it
would be set to default (empty) for one debounce length where this was
not actually required. This occurs when the currently selected beatmap
set has other difficulties which match the target ruleset, specifically.
2020-11-30 19:36:30 +09:00
Dean Herbert
792934f2c4
Allow scroll type to be specified
...
This brings back the ability for the carousel to scroll in a classic
way. It turns out this is generally what we want for "seek" operations
like "random", else it's quite hard to get the expected animation.
I did experiment with applying the animation after the pooled panels are
retrieved, but in a best-case scenario there is still a gap where no
panels are displayed during the random seek operation.
2020-11-27 13:54:38 +09:00
Dean Herbert
0a48dd8f76
Delegate scroll animation to panels themselves
2020-11-26 18:42:51 +09:00
Dean Herbert
ad258e2e52
Update scroll position before applying any panel animations
...
In the case of automatic scroll requirements (ie. scroll to selected) we
are delegating the animation logic to the panels themselves. In order to
make this work correctly, the scroll operation needs to take effect
before any animation updates are run.
2020-11-26 18:33:41 +09:00
Dean Herbert
6058c66edb
Move drawable carousel set movement logic into panels themselves
2020-11-26 18:32:43 +09:00
Dean Herbert
f8db7a9902
Remove ScrollableContent container from carousel
...
This was causing multiple issues with masking and sizing and really
didn't need to exist in the first place. Also not sure why the pool was
nested inside the scroll container, but it isn't any more. Probably for
the best.
2020-11-26 18:28:54 +09:00
Endrik Tombak
72d9da5fac
Apply review suggestions
2020-11-21 14:26:09 +02:00
Endrik Tombak
6c5a6b42e5
Only calculate recommended SR once
2020-11-21 14:09:32 +02:00
Endrik Tombak
944f3480c2
Merge branch 'master' of https://github.com/ppy/osu into present-recommended
...
Conflicts:
osu.Game/OsuGameBase.cs
osu.Game/Screens/Select/DifficultyRecommender.cs
osu.Game/Screens/Select/SongSelect.cs
2020-11-21 14:01:01 +02:00
Dean Herbert
2db42f8e67
Remove default allowRetry parameter value from ResultsScreen
2020-11-20 14:35:44 +09:00
Dean Herbert
5113d4af8f
Rename BeatmapDifficultyManager to BeatmapDifficultyCache
2020-11-06 13:14:29 +09:00
Dan Balasescu
98c992004b
Merge pull request #10660 from peppy/fix-song-select-first-track-looping
...
Fix looping mode not being set on first track after entering song select
2020-11-04 14:37:27 +09:00
Dean Herbert
cfe3218239
Move scheduler call to inside method itself for added safety
2020-11-04 10:23:06 +09:00
Dean Herbert
d788931661
Fix LoadComponentAsync calls potentially occuring after beatmap wedge disposal
...
As seen in https://ci.appveyor.com/project/peppy/osu/builds/36109658/tests .
Also adds cancellation logic for good measure.
2020-11-03 19:53:45 +09:00
Dean Herbert
df9ff76f23
Reduce assert to guard in the outwards direction
2020-11-03 16:49:13 +09:00
Dean Herbert
d5c95a8b46
Centralise into methods and add assertions for safety
2020-11-03 00:45:55 +09:00
Dean Herbert
c3d3856a64
Fix looping mode not being set on first track after entering song select
...
Closes #10656 .
2020-11-02 23:51:02 +09:00
smoogipoo
6f623d8cca
Rename IsUserPaused -> UserPauseRequested
2020-11-02 16:08:59 +09:00
Dean Herbert
8f2cd0e8c5
Add matching requestedByUser parameter to Play method
2020-11-02 15:01:30 +09:00
Dean Herbert
6e2d722b8a
Merge pull request #10649 from ppy/dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.3.1
2020-11-02 11:52:38 +09:00
Dean Herbert
61c9bb3245
Merge branch 'master' into dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.3.1
2020-11-02 10:56:09 +09:00
Dan Balasescu
b1b52f9073
Merge branch 'master' into fix-resume-beatmap-options-edit
2020-11-02 10:46:31 +09:00
Joehu
71d55f16f3
Fix edit beatmap options button not resuming back to song select
2020-11-01 13:50:38 -08:00
Bartłomiej Dach
3090b6ccb5
Resolve CA2249 inspections
...
"Use `string.Contains` instead of `string.IndexOf` to improve
readability"
2020-11-01 18:54:44 +01:00
cadon0
a1fa6588f6
Fix "bounce" when metadata container text is empty
2020-10-31 01:06:19 +13:00
Dean Herbert
8b04cd2cb0
Fix a potential null reference when loading carousel difficulties
2020-10-25 20:28:24 +09:00
Dean Herbert
8232bf1957
Merge pull request #10576 from Game4all/song-select-wedge-dynamic-star-rating
2020-10-23 15:39:02 +09:00
Dean Herbert
9753dab93b
Remove IOnlineComponent and change existing components to use bindable flow
2020-10-22 14:19:12 +09:00
Lucas A
cf69eacae9
Make StarRatingDisplay dynamic.
2020-10-21 19:05:14 +02:00
Lucas A
670775cecb
Make beatmap wedge difficulty indicator color update dynamically.
2020-10-21 18:57:48 +02:00
Dan Balasescu
1fe987d4b3
Merge pull request #10497 from peppy/beatmap-carousel-less-diffcalc-stutter
...
Disable difficulty calculation for set-level difficulty icons
2020-10-20 14:57:34 +09:00
Dan Balasescu
976f96b51d
Merge branch 'master' into beatmap-carousel-refactor-less-alloc-overhead
2020-10-20 14:26:23 +09:00
Dan Balasescu
13060b8575
Merge branch 'master' into beatmap-carousel-less-diffcalc-stutter
2020-10-20 14:26:16 +09:00
Dean Herbert
d5940193a2
Ensure visible items is greater than zero before trying to display a range
2020-10-19 19:55:20 +09:00
Dean Herbert
9106e97c37
Ensure max value in clamp is at least zero
2020-10-19 19:10:01 +09:00
Dean Herbert
1c2185e969
Replace comment with link to issue
2020-10-19 18:41:28 +09:00
Dean Herbert
044622a7a6
Fix out of bounds issues
2020-10-19 18:41:17 +09:00
Dean Herbert
467bb9b96f
Merge branch 'master' into beatmap-carousel-refactor
2020-10-19 13:17:11 +09:00
Dean Herbert
bff3856c83
Account for panel height when removing as off-screen
2020-10-19 13:13:32 +09:00
Dean Herbert
ee0efa0b4c
Fix off-by-one in display range retrieval logic
2020-10-19 13:05:42 +09:00
Dean Herbert
4590d9b93b
Remove outdated comment logic
2020-10-19 13:04:12 +09:00
Berkan Diler
cc11283143
Use string.Starts-/EndsWith char overloads
2020-10-16 11:27:02 +02:00
Dean Herbert
88ffcb9234
Update EndsWith usages
2020-10-16 12:58:34 +09:00
Dean Herbert
30e1fce7a4
Reduce alloc overhead of DrawableCarouselBeatmapSet using new function-based ctor
2020-10-14 15:10:50 +09:00
Dean Herbert
07e6609e6d
Disable difficulty calculation for set-level difficulty icons
2020-10-14 14:16:22 +09:00
Dean Herbert
e662dc5342
Add missing licence headers
2020-10-13 20:57:26 +09:00
Dean Herbert
8057ea1097
Fix formatting issues
2020-10-13 20:50:36 +09:00
Dean Herbert
3d416f4d64
Clean up beatmapSet resolution in DrawableCarouselBeatmapSet
2020-10-13 19:31:29 +09:00
Dean Herbert
75b6a5e17e
Remove unnecessary hack (fixed via framework update)
2020-10-13 19:31:29 +09:00
Dean Herbert
5d11db7753
Locallise ChildItems to DrawableCarouselBeatmapSet for clarity
2020-10-13 19:31:29 +09:00
Dean Herbert
37daefc2b5
Remove outdated comment
2020-10-13 19:12:33 +09:00
Dean Herbert
8eca28e8bc
Add comment about off-screen loading
2020-10-13 19:10:35 +09:00
Dean Herbert
834b0186f4
Adjust fade duration to be slightly shorter
2020-10-13 18:50:10 +09:00
Dean Herbert
2346644c04
Switch DelayedLoadUnloadWrappers to DelayedLoadWrappers
...
Due to pooling usage, there is no time we need to unload. Switching to
DelayedLoadWrapper cleans up the code and reduces overhead
substantially.
2020-10-13 18:47:40 +09:00
Dean Herbert
a1801f8ae4
Unmark todo for now
2020-10-13 18:47:36 +09:00
Dean Herbert
40a0ab7aaa
Avoid allocating CarouselItems for bounds checks
2020-10-13 18:33:31 +09:00
Dean Herbert
4f4f222514
Remove unnecessary fade (already applied by base DrawableCarouselItem)
2020-10-13 18:28:28 +09:00
Dean Herbert
83358d487f
Remove logging
2020-10-13 18:18:22 +09:00
Dean Herbert
3d9ea852ec
Remove masking override (no longer needed as our size is now correct)
2020-10-13 18:14:23 +09:00
Dean Herbert
69650c16fc
Simplify vertical position calculations by including spacing in height definition
2020-10-13 18:13:36 +09:00
Dean Herbert
b1ddb08a4e
Fix right click context menus appearing in incorrect locations
2020-10-13 18:01:12 +09:00
Dean Herbert
d9a6a6b245
Split content out into own class
2020-10-13 18:01:12 +09:00
Dean Herbert
9b2ebb8f0f
Fix main content DelayedLoadUnloadWrapper not getting a valid size before load
2020-10-13 17:45:41 +09:00
Dean Herbert
f3b937e358
Fix masking issues with certain aspect ratio displays
2020-10-13 17:37:33 +09:00
Dean Herbert
fdd4d95cdc
Fix difficulties being at incorrect vertical positions after filter is applied
2020-10-13 17:37:33 +09:00
Dean Herbert
1f0aa974dd
Fix failing tests
2020-10-13 17:37:33 +09:00
Dean Herbert
b536f571fd
Move header height propagation to update for safety
2020-10-13 17:37:33 +09:00
Dean Herbert
ded09b78cb
Avoid usage of AutoSize for DrawableCarouselItems in general
2020-10-13 17:37:33 +09:00
Dean Herbert
cecdf14f53
Avoid reconstructing beatmap difficulties that were recently displayed
2020-10-13 17:37:33 +09:00
Dean Herbert
1da49073ab
Calculate content height automatically
2020-10-13 17:37:33 +09:00
Dean Herbert
c08b5e8d03
Align beatmap difficulties correctly
2020-10-13 17:37:33 +09:00
Dean Herbert
cfec4f4fc1
Extract header element from base DrawableCarouselItem class
2020-10-13 17:37:33 +09:00
Dean Herbert
2aad482545
Fix x offsets of difficulties not being updated
2020-10-13 17:37:33 +09:00
Dean Herbert
1b7e3397c6
Use expiry to avoid ToArray
2020-10-13 17:37:33 +09:00
Dean Herbert
075bf23714
Better track off-screen drawables (and return to pool less often)
2020-10-13 17:37:33 +09:00
Dean Herbert
29983afcef
Replace pool/cleanup logic with simplest form possible
...
This will temporarily break panels that go off-screen, as they will
disappear immediately
2020-10-13 17:37:33 +09:00
Dean Herbert
06e84c8eb3
Add comments and split out update steps into a more logical flow
2020-10-13 17:37:33 +09:00
Dean Herbert
20b54fb904
Move transform clean-up to pooling free call
2020-10-13 17:37:33 +09:00
Dean Herbert
f6aa448523
Store y positions inside items rather than in a separate array
2020-10-13 17:37:33 +09:00
Dean Herbert
b92c22ad42
Add logging
2020-10-13 17:37:33 +09:00
Dean Herbert
9814e9ba7f
Split classes out to reduce loc burder on DrawableCarouselBeatmapSet
2020-10-13 17:37:33 +09:00
Dean Herbert
975cd5a840
Add back beatmap difficulty appear/disappear movement
2020-10-13 17:37:33 +09:00
Dean Herbert
fd8654cff3
Add back difficulty panel spacing
2020-10-13 17:37:33 +09:00
Dean Herbert
ce67f65084
Fix single results not showing up
2020-10-13 17:37:33 +09:00
Dean Herbert
220c8ba2c4
Fix incorrect vertical offsets when difficulties are filtered away
2020-10-13 17:37:33 +09:00
Dean Herbert
82f9ca3de9
Bind to filter event changes in base drawable item
2020-10-13 17:37:33 +09:00
Dean Herbert
813ee19728
Use existing event flow for rendering beatmap difficulties
2020-10-13 17:37:33 +09:00
Dean Herbert
8847cedf29
Add initial pass of vertical transforms
2020-10-13 17:37:33 +09:00
Dean Herbert
15325f5f51
Base bounds checks on +1 (to avoid worrying about current item heights)
2020-10-13 17:37:33 +09:00
Dean Herbert
bb03c5d77c
Temporarily disable masking temporarily to fix panels disappearing at extents
2020-10-13 17:37:33 +09:00
Dean Herbert
524419d5e4
Fix filtered items being considered for height calculation
2020-10-13 17:37:33 +09:00
Dean Herbert
0a144a1388
Correctly free panels after use to avoid finalizer disposal of subtree
2020-10-13 17:37:33 +09:00
Dean Herbert
c5a6f4b453
Fix scroll to selected beatmap
2020-10-13 17:37:33 +09:00
Dean Herbert
5c29aa8cce
Fix multiple difficulties being expanded at once
2020-10-13 17:37:33 +09:00
Dean Herbert
5c2f134665
Add back left offset for selected set
2020-10-13 17:37:33 +09:00
Dean Herbert
3cfc0dc82d
Add safeties to beatmap panel loading code
2020-10-13 17:37:33 +09:00
Dean Herbert
954d43ef56
Debounce state application events
2020-10-13 17:37:33 +09:00
Dean Herbert
ca1f5dcada
Add back panel padding
2020-10-13 17:37:33 +09:00
Dean Herbert
0400b34349
Load more components asynchronously after pool resolution
2020-10-13 17:37:33 +09:00
Dean Herbert
f3b24b9bb5
Avoid performing eager selection constantly on adding ranges of new children
2020-10-13 17:37:33 +09:00
Dean Herbert
0a978c6131
Add basic pooling setup
2020-10-13 17:37:33 +09:00
Dean Herbert
f17d661c1a
Add basic range-based invalidation
2020-10-13 17:37:33 +09:00
Dean Herbert
3143224e5b
Refactor how drawable carousel items are constructed
2020-10-13 17:37:33 +09:00
Dean Herbert
9193f5b0ba
Expose panel height from non-drawable models
2020-10-13 17:37:33 +09:00
Dean Herbert
a393bbe8f7
Remove direct drawable storage from carousel models
2020-10-13 17:37:33 +09:00
Dean Herbert
73c238fae3
Add the ability to search for local beatmaps via online IDs
...
Closes #10470 .
2020-10-10 21:34:11 +09:00
Joehu
c6386ea605
Remember leaderboard mods filter selection in song select
2020-09-15 21:53:35 -07:00
Dean Herbert
3c70b3127c
Fix potential nullref in FilterControl during asynchronous load
2020-09-15 23:19:31 +09:00
Dan Balasescu
6cbff98295
Merge branch 'master' into add-collections-to-beatmap-options
2020-09-15 15:23:33 +09:00
Dean Herbert
2c7492d717
Add null check in SongSelect disposal for safety
2020-09-15 14:34:58 +09:00
Joehu
43daabc982
Remove unused using and move dialog to BDL
2020-09-14 12:10:00 -07:00
Joehu
c833f5fcc4
Reorder buttons to match stable
2020-09-14 11:23:41 -07:00
Joehu
57610ddad5
Fix beatmap options absorbing input from toolbar ruleset selector
2020-09-14 11:22:16 -07:00
Joehu
c30174cea3
Add manage collections button to beatmap options
2020-09-14 11:21:23 -07:00
Joehu
1a8a7ae7f8
Remove hardcoded key param from AddButton
2020-09-14 11:19:18 -07:00
Joehu
368aca015a
Move override methods to bottom
2020-09-14 11:18:00 -07:00
Bartłomiej Dach
a377cccb4d
Unsubscribe from track changed event on disposal
2020-09-14 17:10:35 +02:00
Bartłomiej Dach
f17b2f1359
Ensure track is looping in song select immediately
2020-09-12 20:43:17 +02:00
smoogipoo
5b80a7db5f
Re-namespace collections dropdown
2020-09-11 16:01:01 +09:00
Dean Herbert
033bd82953
Merge branch 'master' into fix-filtercontrol-order
2020-09-11 13:07:41 +09:00
Dean Herbert
b594a2a507
Import collections on initial import-from-stable step
2020-09-11 11:16:00 +09:00
smoogipoo
314cd13b74
Fix song select filter ordering
2020-09-10 23:36:22 +09:00
Dean Herbert
18d96738a1
Fix hard crash on deleting a collection with no collection selected
2020-09-10 19:52:34 +09:00
smoogipoo
6b56c6e83f
Rename to CollectionMenuItem
2020-09-09 23:11:19 +09:00
smoogipoo
43525614ad
Store raw BeatmapCollection in filter control
2020-09-09 23:10:21 +09:00
smoogipoo
1a023d2c88
Fix a few more tests
2020-09-09 16:33:48 +09:00
smoogipoo
0360f7d845
Move CollectionManager to OsuGame
2020-09-09 15:39:15 +09:00
smoogipoo
4ddf5f054b
Rename BeatmapCollectionManager -> CollectionManager
2020-09-09 15:31:08 +09:00
smoogipoo
a5e1e8d043
Rename More... to Manage...
2020-09-08 18:57:18 +09:00
smoogipoo
ae022d7559
Show all items in dropdown, set global max height
2020-09-08 18:55:53 +09:00
smoogipoo
4962213cc4
Rename manage collections filter/text
2020-09-08 18:42:55 +09:00
smoogipoo
f581df47c8
Add "New collection..." item to dropdown
2020-09-08 18:25:09 +09:00
smoogipoo
c2da3d9c84
Fix button input and tests
2020-09-08 14:36:38 +09:00
smoogipoo
8a3c8a6185
Show button when selected or preselected
2020-09-08 14:03:49 +09:00
smoogipoo
32e3f5d091
Adjust button styling
2020-09-08 13:45:26 +09:00
Dean Herbert
8b770626fa
Add missing '...' from some popup menu items
2020-09-08 12:18:08 +09:00
Dean Herbert
b15bbc882a
Move items up in menu
2020-09-08 12:04:35 +09:00
Dean Herbert
3e5ea6c42f
Change "Add to" to "Collections"
...
Doesn't make send to be 'add to' when it can also remove
2020-09-08 12:00:00 +09:00
smoogipoo
ca4423af74
Fix tests
2020-09-08 00:07:12 +09:00
smoogipoo
e37c04cb6d
Change back to solid icon
2020-09-08 00:04:03 +09:00
smoogipoo
a1214512bc
Add filter control tests
2020-09-07 23:57:49 +09:00
smoogipoo
98e9c4dc25
General refactorings
2020-09-07 21:08:48 +09:00
smoogipoo
c1d255a04c
Split filter control into separate class
2020-09-07 20:44:39 +09:00
smoogipoo
120dfd50a6
Fix collection names not updating in dropdown
2020-09-07 20:29:28 +09:00
smoogipoo
b91a376f0a
Split dropdown into separate file
2020-09-07 20:06:38 +09:00
smoogipoo
6cc4517600
Merge branch 'master' into collection-database
2020-09-07 20:03:11 +09:00
smoogipoo
4b4dd02942
Make collection name a bindable
2020-09-05 04:43:59 +09:00
smoogipoo
345fb9d8e0
Rename classes
2020-09-05 03:55:43 +09:00
smoogipoo
ebd11ae0b7
Add a collection management dialog
2020-09-05 03:52:07 +09:00
Dan Balasescu
743c888986
Merge branch 'master' into expose-wedge-icons
2020-09-04 16:22:14 +09:00
Dan Balasescu
b631430a5b
Merge pull request #10045 from peppy/add-info-wedge-icons
...
Update and add missing beatmap statistic icons to info wedge
2020-09-04 16:22:01 +09:00
smoogipoo
4399f5976c
Fix global mods being retained by rooms
2020-09-04 15:20:55 +09:00
Dean Herbert
25e142965d
Strongly type and expose default beatmap information icon implementations for other rulesets
2020-09-04 15:01:32 +09:00
Dean Herbert
cd253ab055
Further tweaks to get closer to design originals
2020-09-04 13:05:39 +09:00
Dean Herbert
d6b46936a0
Adjust sizing to match updated textures with less padding
2020-09-04 12:55:28 +09:00
Dean Herbert
a99e7a1dc2
Merge branch 'master' into add-info-wedge-icons
2020-09-03 21:57:58 +09:00
Dean Herbert
7a0c1411b6
Merge branch 'master' into timeshift-leaderboard-topscore
2020-09-03 18:11:04 +09:00
Dean Herbert
72cb65c22f
Update and add missing beatmap statistic icons to info wedge
2020-09-03 17:52:22 +09:00
smoogipoo
fca0324264
Disallow being able to add dummy beatmap
2020-09-02 23:34:38 +09:00
smoogipoo
d83264f538
Add max height
2020-09-02 22:56:13 +09:00
smoogipoo
7fcbc3a814
Respond to changes in beatmap
2020-09-02 22:06:17 +09:00
smoogipoo
661eac8f1d
Add add/remove button to dropdown items
2020-09-02 22:03:38 +09:00
smoogipoo
02a908752f
Fix stackoverflow
2020-09-02 21:52:56 +09:00
smoogipoo
5ebead2bfd
Prevent ValueChanged binds to external bindable
2020-09-02 21:44:07 +09:00
smoogipoo
d363a5d164
Add basic ordering
2020-09-02 21:19:15 +09:00
smoogipoo
094ddecc95
Add dropdowns to carousel items
2020-09-02 21:08:31 +09:00
smoogipoo
6d5e155106
Change to BindableList to notify of changes
2020-09-02 20:44:26 +09:00
smoogipoo
9dde37fe40
Hook up collection filter
2020-09-02 20:25:42 +09:00
smoogipoo
bb090a55e0
Add dropdown to filter control
2020-09-02 20:25:25 +09:00
Dan Balasescu
f08e7828da
Merge branch 'master' into beatmap-track-rework
2020-09-01 16:06:38 +09:00
Bartłomiej Dach
876fd21230
Apply shear to right-anchored items
2020-08-31 19:31:47 +02:00
Bartłomiej Dach
2e2f26449d
Change anchoring to TopRight
2020-08-31 19:23:19 +02:00
smoogipoo
8cf26979fb
Allow null user score
2020-08-31 20:16:28 +09:00
smoogipoo
ed74c39b55
Move UserTopScoreContainer into base leaderboard
2020-08-31 19:54:22 +09:00
Bartłomiej Dach
7d273d631b
Do not show star difficulty on wedge if zero
2020-08-31 11:05:42 +02:00
Bartłomiej Dach
4736845318
Add spacing between star rating and beatmap status
2020-08-31 10:56:06 +02:00
smoogipoo
c3bfce6ccf
Add star rating to beatmap wedge
2020-08-31 15:03:41 +09:00
Dean Herbert
b51db90147
Merge branch 'master' into beatmap-track-rework
2020-08-26 23:20:56 +09:00
Bartłomiej Dach
29b4d98aac
Show retry/fail graph when either list is present
2020-08-24 20:41:50 +02:00
Bartłomiej Dach
cc6ae8e3bd
Fix crash if only one count list is received from API
2020-08-24 20:41:31 +02:00
Keijia
b5b2e523ad
change switch cases
2020-08-22 12:10:31 +03:00
Keijia
0b6185cd14
add "hp" filter keyword
2020-08-22 01:09:35 +03:00
Dean Herbert
e465afa280
Merge branch 'master' into beatmap-track-rework
2020-08-14 20:02:43 +09:00
smoogipoo
0500d82b5b
Fix playlist items sharing mod instances
2020-08-13 19:48:41 +09:00
smoogipoo
7d35893ecd
Make MusicController non-nullable
2020-08-11 12:40:58 +09:00
smoogipoo
f058f5e977
Fix incorrect value being set
2020-08-06 16:24:14 +09:00
smoogipoo
5c05fe3988
Expose track from MusicController
2020-08-06 16:24:14 +09:00
smoogipoo
6e42b8219c
Move track to MusicController, compiles
2020-08-06 16:24:14 +09:00
smoogipoo
877b985e90
Remove local cancellation token
2020-07-24 16:11:28 +09:00
smoogipoo
b10b99a670
Change method signatures to remove tracked/untracked
2020-07-24 13:52:43 +09:00
smoogipoo
76284a0f01
Move cancellation out of condition
2020-07-23 23:18:51 +09:00
smoogipoo
107b5ca4f2
Add support for bindable retrieval
2020-07-21 23:13:04 +09:00
smoogipoo
9a52058a7a
Update carousel beatmap SR on mod/ruleset changes
2020-07-16 21:08:24 +09:00
smoogipoo
24f14751ce
Update beatmap details SR on ruleset/mod changes
2020-07-16 21:08:08 +09:00
Joehu
73e1bf0d89
Check sub screen's OnBackButton instead
2020-07-14 13:19:48 -07:00
Joehu
36041fc245
Fix back button not working correctly with multi song select's mod select
2020-07-14 00:29:57 -07:00
Joehu
4caf4d31d4
Fix mod select blocking home and alt f4 in song select
2020-07-14 00:00:10 -07:00
Dean Herbert
0718e9e4b6
Update outdated comment
2020-07-13 13:08:41 +09:00
Dean Herbert
ab11a112b7
Fix correct filter criteria not being applied to beatmap carousel if beatmaps take too long to load
2020-07-12 22:33:41 +09:00
Dean Herbert
f231b5925f
Add "show converted" checkbox to song select for convenience
2020-07-09 13:47:23 +09:00
Dean Herbert
bbbe8d6f68
Remove group selector for now, tidy up code somewhat
2020-07-09 13:47:11 +09:00
smoogipoo
af7494b232
Improve quality of song select beatmap wedge
2020-06-29 13:58:35 +09:00
smoogipoo
099416b4c3
Move check inside next difficulty selection
2020-06-26 21:03:34 +09:00
smoogipoo
8f6d52550f
Fix potential exception if button is pressed before selection
2020-06-26 20:32:13 +09:00
smoogipoo
1b4c31a84f
Remove double schedule
2020-06-26 20:14:08 +09:00
smoogipoo
e3d654d33f
Cleanup
2020-06-26 20:14:02 +09:00
Dean Herbert
d704a4597d
Use existing helper function for key repeat
2020-06-25 21:33:02 +09:00
Dean Herbert
d7742766d0
Add key/press repeat support to carousel
2020-06-25 19:47:23 +09:00
Viktor Rosvall
9e1bf71233
Added text explaining a second copy will be made
2020-06-24 11:29:38 +02:00
Jack Boswell
eb3eb70a65
Merge branch 'master' into rebind-song-select
2020-06-10 22:03:26 +12:00
Jack Boswell (boswelja)
9dc1eab6ae
Improve code readability of FooterButtonRandom OnPressed
2020-06-10 13:05:11 +12:00
Jack Boswell (boswelja)
ea9207e0ad
Clean up FooterButtonRandom
...
Removed unnecessary using statements
Removed unnecessary constructor
2020-06-08 17:31:31 +12:00
Jack Boswell (boswelja)
bddd2b72ba
Remove secondaryText and related code from FooterButtonRandom
2020-06-08 15:05:53 +12:00
Jack Boswell (boswelja)
8b7718116d
Add missing blank lines
2020-06-07 16:06:18 +12:00
Jack Boswell (boswelja)
0e155c8eb9
Don't switch FooterButtonRandon Action on pressed.
...
Instead, create a new Action that invokes either NextRandom or PreviousRandom, depending on rewindSearch
2020-06-07 15:34:19 +12:00
Jack Boswell (boswelja)
a40475e6aa
Remove triggerNextRandom from SongSelect
2020-06-04 21:09:47 +12:00
Jack Boswell (boswelja)
cb6e473910
Remove triggerPreviousRandom from SongSelect
2020-06-04 21:08:07 +12:00
Jack Boswell (boswelja)
cab132673a
Break FooterButtonRandom creation into multiple lines
2020-06-04 21:03:10 +12:00
Jack Boswell (boswelja)
8533d7573d
Rename FooterButtonRandom actions to better describe what they are used for
2020-06-04 21:00:29 +12:00
Jack Boswell (boswelja)
62984cb7f5
Remove unused Hotkey assignment
2020-06-04 20:58:53 +12:00
Jack Boswell (boswelja)
df148cf9d1
Rename secondaryAction to rewindSearch
2020-06-04 20:58:19 +12:00
Jack Boswell (boswelja)
bd3e40a8cf
Move default return out of switch/case
2020-06-04 20:57:24 +12:00
Jack Boswell (boswelja)
a78a8c0d0d
Add missing blank lines
2020-06-04 16:59:04 +12:00
Jack Boswell (boswelja)
7141bed78d
Remove redundant directive from FooterButton
2020-06-04 16:40:16 +12:00
Jack Boswell (boswelja)
eb242085c6
Remove redundant interface from FooterButtonMods
2020-06-04 16:24:32 +12:00
Jack Boswell (boswelja)
aeb736e9d2
Fix CodeFactor code style issues
2020-06-04 16:13:50 +12:00
Jack Boswell (boswelja)
aa08847bc9
Set FooterButtonRandom actions properly when creating the button
2020-06-04 16:08:16 +12:00
Jack Boswell (boswelja)
568503ef99
Update FooterButtonRandom to comply with the changes in FooterButton
...
FooterButtonRandom now has 2 Action variables, one for both primary and secondary
2020-06-04 16:07:50 +12:00
Jack Boswell (boswelja)
05e4499bc1
Update FooterButtonOptions to comply with the changes in FooterButton
2020-06-04 15:25:18 +12:00
Jack Boswell (boswelja)
18db31b504
Update FooterButtonMods to comply with the changes in FooterButton
2020-06-04 15:25:05 +12:00
Jack Boswell (boswelja)
782fddb6f1
Modify FooterButton to implement IKeyBindingHandler for responding to hotkeys
2020-06-04 15:21:13 +12:00
smoogipoo
f3b5149648
Move some suggestions to warnings, resolve issues
2020-06-03 16:48:44 +09:00
Dean Herbert
93572fc17d
Merge branch 'master' into present-recommended
2020-06-03 12:31:23 +09:00
Lucas A
275d95082a
Fix crash in testing environment.
2020-06-02 16:01:01 +02:00
Lucas A
f63c66396f
Apply review suggestions.
2020-06-02 13:32:52 +02:00
Lucas A
e9b09373e7
Fix crashing if selected ruleset doesn't have an autoplay mod.
2020-06-01 17:41:04 +02:00
Dean Herbert
d4b7c81f96
Merge branch 'master' into results-screen-condensed-panel
2020-05-30 23:13:52 +09:00
Dean Herbert
f989f1aa00
Change event flow to avoid firing store delete events on update
2020-05-27 16:08:47 +09:00
smoogipoo
de0b6ec9f1
Create abstract implementation
2020-05-26 17:00:41 +09:00
Dean Herbert
052ad79fc6
Convert dangerous events to IBindables
2020-05-19 16:44:22 +09:00
Dean Herbert
a5c1b461f6
Fix null reference in difficulty recommender
2020-05-12 11:14:51 +09:00
smoogipoo
401c516503
Expose searchable terms from beatmap info instead
2020-05-07 13:04:08 +09:00
smoogipoo
5186da8412
Fix potential song select nullref
2020-05-07 11:37:04 +09:00
Dan Balasescu
0eae8d078b
Merge branch 'master' into master
2020-05-05 13:33:29 +09:00
alex
0e2ccac33b
Add spaces to comments
2020-05-04 18:36:24 -07:00
Dean Herbert
06f58dd3e3
Ensure correct beatmap and ruleset when presenting a score from song select
2020-05-04 15:20:43 +09:00
Endrik Tombak
1c04d58d6e
Fix recommender's incorrect usage of current ruleset
2020-05-01 19:44:35 +03:00
Bartłomiej Dach
623611d9dc
Simplify ruleset ordering
2020-05-01 17:15:35 +02:00
Bartłomiej Dach
9f091f3a56
Do not query API for custom rulesets
2020-05-01 17:02:28 +02:00
Endrik Tombak
33a608fd15
Merge branch 'master' of https://github.com/ppy/osu into present-recommended
...
Conflicts:
osu.Game/Screens/Select/SongSelect.cs
2020-05-01 11:06:20 +03:00
Dean Herbert
000c34dc26
Move recommender to field construction
2020-04-30 21:01:53 +09:00
Dean Herbert
cf4e79cf38
Show loading spinner when carousel is not ready to be displayed
2020-04-30 11:51:06 +09:00
Dean Herbert
119000f1ab
Reduce database includes where possible
2020-04-28 21:43:35 +09:00
Endrik Tombak
657bf5ad86
Merge branch 'master' of https://github.com/ppy/osu into present-recommended
2020-04-25 10:13:57 +03:00
smoogipoo
fcfb2b9026
Merge branch 'master' into fix-select-new-from-sub-screen
2020-04-21 14:36:53 +09:00
Dan Balasescu
3b3a7bdd85
Merge branch 'master' into scroll-to-center
2020-04-21 10:21:08 +09:00
Bartłomiej Dach
e3cd3cf1da
Convert to auto-properties
2020-04-20 21:43:07 +02:00
Bartłomiej Dach
9b6e26583b
Add xmldocs
2020-04-20 21:42:43 +02:00
Dean Herbert
ee1ccb8bcb
Fix in a slightly different and hopefully more understandable way
2020-04-20 14:03:55 +09:00
Endrik Tombak
b57d709d15
Don't use Parent
2020-04-19 18:29:06 +03:00
Endrik Tombak
a8bfd21f3f
Merge branch 'master' of https://github.com/ppy/osu into scroll-to-center
2020-04-19 18:21:34 +03:00
Endrik Tombak
4aaa00e321
Fix CI complaints
2020-04-17 20:33:12 +03:00
Endrik Tombak
1ac9ee5990
Optimize recommender (for custom rulesets)
2020-04-17 18:15:11 +03:00
Dean Herbert
5833a7ac91
Fix presenting new ruleset and beatmap at once causing wedge display desync
2020-04-17 18:56:17 +09:00
Dean Herbert
d62094cd4b
Fix carousel not correctly updating when selection changes to a new beatmap from a child screen
2020-04-16 18:10:35 +09:00
Dean Herbert
03a74a4320
Apply same conditional check changes to DrawableCarouselBeatmapSet
2020-04-16 12:13:26 +09:00
Dean Herbert
91b13f91ea
Add exception disallowing potential edit when disabled at a property level
2020-04-16 12:11:12 +09:00
Dean Herbert
c4caf38feb
Simplify menu item checks (and add for other items)
2020-04-16 12:10:20 +09:00
Joehu
e2b28bfe88
Hide edit context menu item in multiplayer song select
2020-04-15 18:17:12 -07:00
Endrik Tombak
b5c1752f0a
Calculate best ruleset order only once
2020-04-15 18:14:51 +03:00
Endrik Tombak
bbef94b4df
Reset best order on ruleset change
2020-04-14 18:56:20 +03:00
Endrik Tombak
00d1cf1ce2
Recommend from all rulesets
2020-04-14 18:42:18 +03:00
Endrik Tombak
dd6c9173da
Move DifficultyRecommender to OsuGameBase
2020-04-14 18:42:00 +03:00
Endrik Tombak
b475316a4e
Simplify and comment
2020-04-12 20:40:08 +03:00
Endrik Tombak
63a1686dfb
Scroll to screen middle
2020-04-12 12:42:52 +03:00
Dean Herbert
73a3f1fe65
Remove unnecessary DI
2020-04-11 17:30:34 +09:00
Dean Herbert
7aac0e59a8
Reduce dictionary lookups
2020-04-11 17:13:35 +09:00
Dean Herbert
310cf830d4
Simplify api request logic
2020-04-11 17:13:35 +09:00
Dean Herbert
abea7b5299
Tidy up function passing, naming, ordering etc.
2020-04-11 17:13:35 +09:00
Dean Herbert
7f753f6b4d
Remove current ruleset from function call
2020-04-11 16:43:09 +09:00
Dean Herbert
a843793957
Un-nest class
2020-04-11 16:41:11 +09:00
Endrik Tombak
deaf24f141
Fix oversight on null
2020-04-09 19:30:40 +03:00
Endrik Tombak
35f97dfc75
Style changes
2020-04-09 18:59:18 +03:00
Endrik Tombak
f40bdcd34e
Initial rewrite, moving API logic to SongSelect
2020-04-09 18:47:28 +03:00
Dean Herbert
260de77304
Merge branch 'master' into select-recommended
2020-04-09 15:30:35 +09:00
Dean Herbert
4bfc738f5b
Merge pull request #7639 from santerinogelainen/master
...
Add top rank to the beatmap carousel
2020-04-08 23:36:47 +09:00
smoogipoo
ed3e0a01e1
Re-namespace into song select
2020-04-07 15:31:22 +09:00
Joehu
57b6a91449
Remove unnecessary input override on footer button mods
...
Was used when it expanded on hover, but doesn't anymore.
2020-04-05 14:57:44 -07:00
Santeri Nogelainen
163de36777
Merge remote-tracking branch 'upstream/master'
2020-04-04 22:29:15 +03:00
Santeri Nogelainen
1e8badb14a
Move all logic to TopLocalRank and remove CarouselBeatmapRank
2020-04-04 22:28:36 +03:00
Joehu
493b654011
Remove horizontal margin from mod display
...
Can skew center alignment on fill flow containers.
Fixes affected areas. Vector2(5, 0) is similar to MarginPadding { Left = 10 }.
2020-04-03 11:30:02 -07:00
Dean Herbert
b47a532df3
Adjust code formatting slightly
2020-03-30 00:07:48 +09:00
Endrik Tombak
b4f0500706
Invert logic
2020-03-28 20:21:21 +02:00
Endrik
2c27894527
Use All instead of ToList Any
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-28 19:58:33 +02:00
Santeri Nogelainen
6bde102207
Merge remote-tracking branch 'upstream/master'
2020-03-28 18:14:17 +02:00
Santeri Nogelainen
faa2b49be4
Fix namespace for CarouselBeatmapRank, make UpdateableRank in TopLocalRank readonly
2020-03-28 18:13:39 +02:00
Santeri Nogelainen
1c711147f3
Move all carousel rank logic into separate classes (TopLocalRank and CarouselBeatmapRank)
2020-03-28 17:22:01 +02:00
Endrik Tombak
87854fc4fa
Rename variable
2020-03-28 13:23:31 +02:00
Endrik Tombak
6a0c5c87aa
Use already existing variable
2020-03-28 13:06:03 +02:00
Endrik Tombak
fc3f9ff6fa
Don't use drawables for select next
2020-03-28 12:54:48 +02:00
Endrik Tombak
bbbaaae3ee
Write tests
2020-03-26 19:18:16 +02:00
Endrik Tombak
ee112c6f50
Move and change logic
2020-03-26 18:42:08 +02:00
Endrik Tombak
2f5dc93d61
Select recommended difficulty
2020-03-26 00:19:54 +02:00
Dean Herbert
b1d4261402
Fix track looping state not being reset when entering editor from song select
...
Closes #8432 .
2020-03-25 15:50:19 +09:00
Dean Herbert
2a1e7a7ff0
Merge branch 'master' into fix-select-filter-not-absorbing-input
2020-03-24 14:03:58 +09:00
Dan Balasescu
6279c78e3c
Merge branch 'master' into fix-keypad-autoplay-shortcut
2020-03-24 13:34:31 +09:00
Joehu
5bc5119389
Handle OnHover on song select filter and footer
2020-03-23 16:03:33 -07:00
Joehu
96d962ab30
Fix autoplay keyboard shortcut not working with keypad enter key
2020-03-23 11:25:40 -07:00
Joehu
96848405fd
Fix song select filter not absorbing input from carousel
2020-03-23 10:54:45 -07:00
Dean Herbert
47c7673c9e
Fix crash when holding a key down while entering player
2020-03-23 17:04:54 +09:00
Dan Balasescu
d0c7b49376
Merge branch 'master' into fix-carousel-root-selects-from-nothing
2020-03-23 11:34:04 +09:00
Dean Herbert
29009c85c0
Fix typo in comment
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-22 00:32:53 +09:00
Dean Herbert
9b60b535e5
Fix selection not occurring when switching from empty ruleset on first load
2020-03-20 15:01:26 +09:00
Dean Herbert
be4a97c289
Correctly bypass last selected when it is filtered
2020-03-20 13:01:24 +09:00
Dean Herbert
8f9e97b4cc
Fix carousel not remembering last selection correctly
2020-03-19 18:07:39 +09:00
unknown
2340142dc1
Merge branch 'master' of https://github.com/ppy/osu into linkify-metadata
2020-03-18 14:18:53 +08:00
smoogipoo
1c4296f5e7
Implement the new results screen
2020-03-17 17:43:16 +09:00
Dean Herbert
5e3668b2ea
Merge pull request #8260 from smoogipoo/add-workingbeatmap-timeout
...
Add beatmap loading timeout to prevent runaway loading scenarios
2020-03-17 11:17:35 +09:00
Dan Balasescu
e835f88c0c
Merge pull request #8255 from peppy/fix-carousel-scroll-while-import
...
Fix carousel scrolling being inoperable during beatmap import
2020-03-16 12:50:45 +09:00
Dan Balasescu
3e65f13c67
Merge branch 'master' into fix-carousel-scroll-while-import
2020-03-16 12:06:50 +09:00
Dean Herbert
9bb3a6c677
Merge branch 'master' into click-group-difficulty-icons
2020-03-16 12:01:09 +09:00
Dean Herbert
d6be8eec0c
Merge branch 'master' into click-disabled-difficulty-icons
2020-03-16 11:30:57 +09:00
Dan Balasescu
f390c1995d
Apply comment suggestions
...
Co-Authored-By: Dean Herbert <pe@ppy.sh>
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-16 11:29:28 +09:00
Dan Balasescu
bd05462a7f
Merge branch 'master' into carousel-selection-fallback-improvement
2020-03-16 10:53:10 +09:00
Dan Balasescu
25a35a1370
Merge branch 'master' into always-apply-ruleset-filter
2020-03-16 10:32:36 +09:00
Dean Herbert
340d362d69
Appease inspectcode
2020-03-15 03:51:30 +09:00
smoogipoo
c33ca6e99c
Decorate usages with exception management
2020-03-13 14:28:11 +09:00
Dean Herbert
ac70fcc544
Change logic to be more resilient by identifying user scroll events
2020-03-13 12:30:27 +09:00
Dean Herbert
5f8d180b5e
Fix carousel scrolling being inoperable during beatmap import
2020-03-13 11:51:26 +09:00
Dean Herbert
04f1da04db
Remove incorrect xmldoc from SelectBeatmap function
2020-03-13 10:52:08 +09:00
Dean Herbert
3f8b454ff4
Reword comment to match new filtering behaviour
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-13 10:01:28 +09:00
Dean Herbert
ca9cfbe51d
Move selection fallback logic out of BeatmapCarousel to SongSelect
2020-03-12 18:42:08 +09:00
Dean Herbert
6e11c3014c
Allow grouped difficulty icons to be clicked
2020-03-12 18:42:08 +09:00
Dean Herbert
ce5d01ed19
Allow filtered difficulty icons to be clicked
2020-03-12 18:42:08 +09:00
Dean Herbert
fc058f8896
Remove unnecessary this. prefix
2020-03-12 18:03:18 +09:00
Dean Herbert
933a8ffc8a
Add test coverage
2020-03-12 17:10:51 +09:00
Dean Herbert
28ac5af91c
Fix beatmap carousel tests loading beatmap manager beatmaps in test browser
2020-03-12 16:53:23 +09:00
Dean Herbert
63edcddaf1
Apply ruleset filter in all cases (even when bypassing filter for selection purposes)
2020-03-12 15:06:26 +09:00
Dan Balasescu
e6685c88fc
Merge pull request #8205 from peppy/always-scroll-to-selection
...
Fix changing ruleset at song select not scrolling the current selection back into view
2020-03-11 14:38:57 +09:00
Dan Balasescu
f8f8e3628f
Merge branch 'master' into always-scroll-to-selection
2020-03-11 13:38:28 +09:00
Dan Balasescu
9119e32f63
Merge branch 'master' into better-filter-bypass
2020-03-11 13:37:55 +09:00
Dean Herbert
ed837d3115
Use framework extension method for FromHex
2020-03-11 10:18:41 +09:00
Dean Herbert
a2d3f20409
Merge branch 'master' into better-filter-bypass
2020-03-11 02:55:14 +09:00