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

898 Commits

Author SHA1 Message Date
Salman Ahmed
3f9fbb9318 Introduce the concept of ActiveMods in mod select overlay and rewrite once more 2024-02-26 22:25:06 +03:00
Salman Ahmed
2b73d816a7 Bring back mod setting tracker in BeatmapAttributesDisplay 2024-02-26 22:24:45 +03:00
Andrei Zavatski
081aa84718 Simplify last footer button selection 2024-02-25 10:36:15 +03:00
Andrei Zavatski
6d2187e079 Reduce allocations in ModSelectOverlay 2024-02-24 22:58:23 +03:00
Andrei Zavatski
3b53ed3c3a Reduce allocations in ModColumn 2024-02-24 22:44:58 +03:00
Salman Ahmed
d4bc3090e7 Fix incorrect conflict resolution 2024-02-23 18:42:07 +03:00
Salman Ahmed
618819ba9f Merge branch 'master' into freemod_mapinfo_fix 2024-02-23 18:34:41 +03:00
Salman Ahmed
c1db9d7819 Add test coverage 2024-02-23 18:16:44 +03:00
Salman Ahmed
fdc0636554 General code cleanup 2024-02-23 17:31:54 +03:00
Salman Ahmed
9ce07a96b2 Rewrite mods flow and remove RoomBeatmapAttributesDisplay 2024-02-23 17:30:13 +03:00
Salman Ahmed
323d7f8e2d Change BeatmapAttributesDisplay retrieval to proper method 2024-02-23 16:59:43 +03:00
Salman Ahmed
ae9c58be30 Remove "multiplayer" references from subclass and move to appropriate place 2024-02-23 16:50:33 +03:00
Bartłomiej Dach
6770b73e4e
Merge pull request #27192 from smoogipoo/mod-search-ignore-whitespace
Adjust search terms for mods
2024-02-22 11:41:31 +01:00
Bartłomiej Dach
84fdcd24ef
Remove description from mod search terms
Closes https://github.com/ppy/osu/issues/27111.
2024-02-22 11:02:08 +01:00
Bartłomiej Dach
81a9908c60
Extract common helper for BPM rounding 2024-02-22 10:27:37 +01:00
Givikap120
ed028e8d26 Update MultiplayerModSelectOverlay.cs 2024-02-20 13:13:13 +02:00
Givikap120
8199a49ee2 minor look changes 2024-02-20 13:11:19 +02:00
Givikap120
a4288e7ecc removed unnecessary changes 2024-02-20 13:00:59 +02:00
Givikap120
54ef397d56 Changed override method
now it overrides mods getter instead of calculate fuctions
2024-02-20 12:57:28 +02:00
maromalo
5a448ce02f Turn BPMDisplay to RollingCounter<int> 2024-02-18 19:59:56 -03:00
Givikap120
24171bd02b Update MultiplayerModSelectOverlay.cs 2024-02-18 03:34:02 +02:00
Givikap120
a6b63efe7d Fixed NVika code quality errors 2024-02-18 03:28:24 +02:00
Givikap120
9070e973d3 Update BeatmapAttributesDisplay.cs 2024-02-18 03:16:18 +02:00
Givikap120
4aaf016ee0 quality improvements 2024-02-18 03:15:53 +02:00
Givikap120
6fb3192648 Update BeatmapAttributesDisplay.cs 2024-02-18 03:14:36 +02:00
Givikap120
2df5787dc7 Packed changes into separate class 2024-02-18 03:13:57 +02:00
Givikap120
ed819fde15 Fixed bugs and added ranked status update 2024-02-17 23:01:31 +02:00
Givikap120
cd8ac6a722 Update BeatmapAttributesDisplay.cs 2024-02-17 22:12:15 +02:00
Dan Balasescu
0fff9d4937
Add non-whitespace search term for mods 2024-02-16 19:17:41 +09:00
Bartłomiej Dach
e4ef2bdeb9
Merge pull request #26734 from Joehuu/fix-edit-mod-preset-button-flow
Fix edit mod preset popover buttons overflowing on some languages
2024-02-05 16:10:37 +01:00
Bartłomiej Dach
966093f7ce
Transform score multiplier display to also show ranked state 2024-02-01 21:32:37 +01:00
Joseph Madamba
bb6c7a0a82 Fix edit mod preset popover buttons overflowing on some languages 2024-01-26 15:26:22 -08:00
Andrei Zavatski
da992ccc55 Implement per-axis triangles clamping 2024-01-23 04:54:27 +03:00
Andrei Zavatski
1393f52b2b Rename Masking to ClampToDrawable 2024-01-21 05:20:42 +03:00
Andrei Zavatski
e003ecb593 Change default masking value to true 2024-01-21 04:57:48 +03:00
Dean Herbert
a66ddc7813
Change rolling counters to use quicker easing types 2024-01-17 18:18:53 +09:00
Bartłomiej Dach
40f612435d
Merge pull request #26178 from felipemarins/mod-search-text-box-select-all
Make mod search box text be selected when a new mod is selected/deselected
2024-01-15 20:08:02 +01:00
Bartłomiej Dach
c46615839d
Only select all text in mod search text box if enter press selected anything 2024-01-15 19:09:50 +01:00
Felipe Marins
d8962ddff8 Select all when pressing enter instead of every mod selection change 2024-01-15 03:22:52 -03:00
Salman Ahmed
aebf246f62 Change select all mod buttons to check ValidForSelection instead of directly checking system mods 2024-01-13 09:43:50 +03:00
Salman Ahmed
c476843a83 Mark system mods as invalid for selection in mod select overlay 2024-01-13 09:43:20 +03:00
Salman Ahmed
4dc11c4c48 Update existing code to use helper method 2023-12-31 05:18:07 +03:00
CaffeeLake
bca0600482 Use 0.99x or 1.01x
Signed-off-by: CaffeeLake <PascalCoffeeLake@gmail.com>
2023-12-31 00:47:09 +09:00
Felipe Marins
dce9204731 Select search box text on ModSelectOverlay when mod selection changes 2023-12-28 00:10:44 -03:00
Gabriel Del Nero
14b37db3dd
Make ModDaycore sequential for ModHalfTime 2023-12-27 14:35:19 +01:00
Dean Herbert
c556475c2c
Revert to using a more manual approach to holding focus 2023-12-19 19:46:30 +09:00
Dean Herbert
51f4c7254c
Fix mod search textbox having focus while settings are visible
Stopped arrow key adjust on slider bars from working.

Also just felt wrong that you could type into an off-screen textbox.
2023-12-19 01:32:34 +09:00
Dean Herbert
4357bb1040
Change LeftContent autosize duration to match main content to reduce visual awkwards 2023-12-15 16:01:07 +09:00
Dean Herbert
b86f387fd3
Fix the width of vertical attribute display numbers
Not necessarily required to fix the issue at hand, but probably good
practice here.
2023-12-15 15:04:22 +09:00
Bartłomiej Dach
9e5b6b97ff
Fix AdjustedAttributesTooltip being broken by design
Fixes issue described in the following comment:
https://github.com/ppy/osu/pull/25759#issuecomment-1855954637

That is just not how the tooltip system is supposed to be used.

To name the individual sins:

- Caching and returning a tooltip instance like the classes that used
  tooltips is incorrect. The lifetime of tooltip instances is managed by
  the tooltip container. `GetCustomTooltip()` is called by it
  exclusively. It should return a fresh instance every time.

- Not putting actual data in `IHasCustomTooltip.TooltipContent` is
  wrong.

- Having `Tooltip.SetContent()` be a no-op is *grossly and flagrantly*
  wrong.

I'm not even sure which particular combination of the above
transgressions caused the issue as it presented itself, but at this time
I frankly do not care.
2023-12-14 16:15:56 +01:00
Givikap120
23c427cd3e Update AdjustedAttributesTooltip.cs 2023-12-14 14:38:01 +02:00
Givikap120
c2373bb37b change the order of attributes
+ simplifying the bug fix
2023-12-14 14:31:19 +02:00
Bartłomiej Dach
0ab6e18792
Automatically focus search text box on open depending on setting 2023-12-14 09:52:55 +01:00
Dean Herbert
5062c53e36
Refactor everything for sanity 2023-12-13 17:33:39 +09:00
Dean Herbert
9433180ffe
Fix various code quality and visual issues with AdjustedAttributesTooltip 2023-12-13 16:57:31 +09:00
Givikap120
f5b93121f1 Update AdjustedAttributesTooltip.cs 2023-12-10 00:51:50 +02:00
Givikap120
78cdedf34d Update BeatmapAttributesDisplay.cs 2023-12-10 00:42:02 +02:00
Givikap120
1d0c37e138 fixed test errors 2023-12-10 00:40:05 +02:00
Givikap120
93e3156868 slight format changes 2023-11-24 01:07:37 +02:00
Givikap120
c2a44cf118 Made custom tooltip 2023-11-23 23:30:18 +02:00
Dean Herbert
9172632b0b
Rename method and adjust xmldoc to be very explicit about how wrong this is 2023-11-17 17:04:20 +09:00
Givikap120
26d493986c Fixed precision and updated AdvancedStats 2023-11-12 18:05:18 +02:00
Dean Herbert
4df1eb1b37
Refactor logic and tooltip formatting 2023-11-12 16:19:55 +09:00
Dean Herbert
6bd5eda2a0
Merge branch 'master' into arod_rate_adjust 2023-11-12 15:49:07 +09:00
Givikap120
60c3e7250b fixed naming incconvinence 2023-11-10 15:13:40 +02:00
Bartłomiej Dach
7ba07ab530
Add protections against handling system mods in mod presets 2023-11-06 08:05:42 +01:00
Givikap120
820519c37d improved tooltip 2023-11-04 21:55:46 +02:00
Givikap120
440d57fb48 Basic rate-adjust tooltip 2023-11-04 17:47:02 +02:00
Givikap120
57170501cd Improve code quality 2023-11-04 17:25:09 +02:00
Bartłomiej Dach
ef555ed0cf
Fix test failures 2023-11-02 21:24:58 +01:00
Dean Herbert
5341a335a6
Bypass Parent nullability checks for now 2023-10-17 17:48:45 +09:00
Bartłomiej Dach
9a49f44db0
Use AsOrdered() when presenting mod presets too 2023-09-28 18:42:05 +02:00
Bartłomiej Dach
c0728f0b2e
Replace local sort with new utility method 2023-09-28 18:35:15 +02:00
Bartłomiej Dach
6aff1d4063
Merge branch 'master' into mod-select-difficulty-multiplier-animation 2023-09-14 16:23:30 +02:00
Bartłomiej Dach
94cdcfd7ce
Move collapsed bindable back to BeatmapAttributesDisplay for now
Better to have it only in one place that needs it, rather than have it
not work as expected when someone inherits
`ModFooterInformationDisplay`.
2023-09-14 14:56:58 +02:00
Bartłomiej Dach
44461b4eff
Merge branch 'master' into mod-select-diff-multiplier-visual-matching 2023-09-14 12:12:23 +02:00
Bartłomiej Dach
3f7b8dbe58
Merge branch 'master' into move-mod-select-diff-multiplier 2023-09-14 11:26:22 +02:00
Bartłomiej Dach
25dbd0a1d3
Rename variable to reflect new "beatmap attributes display" naming 2023-09-14 11:24:53 +02:00
Dean Herbert
7bf0a22112 Improve flash effect 2023-09-14 13:57:56 +09:00
Dean Herbert
32946413de Change display text from "difficulty" to "score" multiplier 2023-09-13 20:01:19 +09:00
Dean Herbert
3e1388c73f Add vertical animation when difficulty multiplier is changed 2023-09-13 19:57:48 +09:00
Dean Herbert
824a3e4adc Update DifficultyMultiplierDisplay to use new shared design 2023-09-13 19:56:31 +09:00
Dean Herbert
46d5aa59bf Split base design out of BeatmapAttributesDisplay 2023-09-13 19:33:30 +09:00
Dean Herbert
9a7d1ed98b Tidy up DifficultyMultiplierDisplay 2023-09-13 18:55:17 +09:00
Dean Herbert
35840bf671 Combine ModCounterDisplay and DifficultyMultiplierDisplay into one class 2023-09-13 18:51:56 +09:00
Dean Herbert
491d94c5ac Use local shear definition 2023-09-13 18:51:50 +09:00
Dean Herbert
41b0619533 Fix shear being included on wrong side of ModCounterDisplay 2023-09-13 18:19:42 +09:00
Dean Herbert
923c2a16ed Fix weird centering of multiplier "x" 2023-09-13 18:11:16 +09:00
Dean Herbert
21252c1c23 Fix animations 2023-09-13 18:06:50 +09:00
Dean Herbert
e241e41f2a Fix layout decision to account for new multiplier addition 2023-09-13 17:55:21 +09:00
Dean Herbert
49114430ed Move multiplier display to bottom of sceen to make visible while customising 2023-09-13 17:43:55 +09:00
Dean Herbert
be373391f8 Simplify multiplier display implementation 2023-09-13 17:43:41 +09:00
Dean Herbert
f5cee22db7 Collapse mod presets column slightly when not in use 2023-09-13 17:05:42 +09:00
Givikap120
1a70110a4e Added BeatmapAttributesDisplay support 2023-09-12 16:44:44 +03:00
Dean Herbert
7e3652284d Adjust various class naming and add some xmldoc 2023-09-12 17:15:16 +09:00
Dean Herbert
3da30485b2 Move shear spec to correct location 2023-09-12 17:06:45 +09:00
Dean Herbert
e40eaa7377 Improve collapse/expand animations
Especially when on a screen resolution where it would start collapsed.
2023-09-12 17:06:45 +09:00
Bartłomiej Dach
eebacfb982
Make mod effect preview uncollapse on hover 2023-09-11 10:59:19 +02:00
Bartłomiej Dach
d51396fdaf
Collapse mod effect preview when it's not wide enough to fit 2023-09-11 10:46:07 +02:00
Bartłomiej Dach
3deb6cb4ec
Fix z-order of mod preview panel 2023-09-11 10:19:02 +02:00
Bartłomiej Dach
0822e8b925
Fix preview panel not being marked nullable 2023-09-11 10:18:37 +02:00
Bartłomiej Dach
f9d4fbee56
Add collapsed state to effect preview panel 2023-09-11 10:16:24 +02:00
Bartłomiej Dach
ff6bf0bc2c
Fix slightly wrong binding setup 2023-09-11 10:16:09 +02:00
Bartłomiej Dach
97665e029b
Remove weird fade 2023-09-11 10:00:44 +02:00
Bartłomiej Dach
76bf82d900
Do not show mod effects on free mod select 2023-09-11 09:55:45 +02:00
Bartłomiej Dach
53c30dca64
Fix data flow being sometimes incorrect 2023-09-11 09:53:58 +02:00
Bartłomiej Dach
552230af9d
Refactor layout of display 2023-09-11 09:44:52 +02:00
Bartłomiej Dach
f591a30ea7
Refactor preview panel to be more self-contained 2023-09-11 09:19:34 +02:00
Bartłomiej Dach
c1a2b86f3f
Extract constants properly 2023-09-11 08:29:37 +02:00
Bartłomiej Dach
23c4a03848
Fix code inspections 2023-09-11 08:26:05 +02:00
Givikap120
507f9642cc Better counter formatization
Now CS and HP have 1 decimal point precision, while AR and OD is kept with 2 because of future support of rate-changed AR/OD
2023-09-08 22:15:30 +03:00
Givikap120
02e2b8546c fixed all stated problems 2023-09-08 20:32:55 +03:00
Givikap120
8281ed5173 Fixed "no animations" issue 2023-09-03 14:51:53 +03:00
Givikap120
0797926448 Update VerticalAttributeDisplay.cs 2023-09-03 12:19:03 +03:00
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
Givikap120
8a1fc7c340 Basic stuff (not working for now) 2023-08-26 01:20:41 +03:00
Dean Herbert
fc2fac577f Inverse and xmldoc ShearedToggleButton sample allowance bool 2023-08-18 17:05:25 +09:00
Jamie Taylor
d10d7b6ea4
Change some component samples to go better with overlay pop-in samples 2023-08-17 18:36:37 +09:00
Bartłomiej Dach
973e6ded2a
Update wrong comment, too 2023-07-26 21:56:04 +02:00
Bartłomiej Dach
992f78b158
Use more consistent way of closing overlay 2023-07-26 21:54:35 +02:00
Dean Herbert
8d5efc9612 Add back the ability to close mod select using enter key
I've seen this brought up a few times (with people thinking
the fact it's not working is a bug) so we'll need to keep this
behaviour for now.
2023-07-27 02:36:25 +09:00
Dean Herbert
18c5fc689f Don't expose such specific information from ModSelectOverlay 2023-07-20 12:58:13 +09:00
Dean Herbert
eb149942e5 Add ability to toggle all free mods quickly at multiplayer song select 2023-07-19 19:08:32 +09:00
Dean Herbert
db37de45ac Allow saving changes to presets in popover using "select" binding 2023-07-13 17:53:26 +09:00
Dean Herbert
f5c472c0fe Don't hide mod select overlay when pressing select binding with no search 2023-07-13 17:50:07 +09:00
Dean Herbert
a98a36872e Bring realm library up-to-date 2023-07-06 13:37:43 +09:00
Dean Herbert
0ab0c52ad5 Automated pass 2023-06-24 01:00:03 +09:00
Dean Herbert
db445660e7 Avoid resolving realm Live more than once 2023-06-19 01:06:45 +09:00
Dean Herbert
425d3c23f5 Fix some code layout and NRT some classes 2023-06-19 01:03:43 +09:00
Bartłomiej Dach
b4c1266fc5
Add TODO for future support of typical search shortcuts 2023-06-18 15:58:50 +02:00
Bartłomiej Dach
b87acfa66f
Dynamically change placeholder to convey how to activate search 2023-06-18 15:58:50 +02:00
Bartłomiej Dach
75300ca229
Switch search box to initially unfocused
Done primarily to keep mod hotkeys working without any behavioural
changes when mod select is opened.
2023-06-18 15:58:50 +02:00
Bartłomiej Dach
9ba4bf5fb7
Merge branch 'master' into add-mod-search-option 2023-06-18 15:06:21 +02:00
Bartłomiej Dach
d4c9eb013e
Fix bugged initial state of matching filter flag
Was preventing mod preset panels from refiltering correctly on ruleset
change due to the `matchingFilter == value` guard.
2023-06-18 14:51:52 +02:00
Bartłomiej Dach
a49af06e88
Reword comments in ModSelectOverlay 2023-06-18 14:34:33 +02:00
Bartłomiej Dach
28f929dc4d
Remove yet another redundant guard 2023-06-18 14:28:26 +02:00
Bartłomiej Dach
4c78144d10
Remove obvious comment 2023-06-18 14:04:00 +02:00
Bartłomiej Dach
64e96c6d82
Fix duplicate linq and reword comment 2023-06-18 14:03:26 +02:00
Bartłomiej Dach
a1015b4145
Remove duplicated xmldoc and move into relevant region 2023-06-18 13:59:36 +02:00
Bartłomiej Dach
1b4d7db1e6
Remove redundant guard
`Bindable` has one of those already.
2023-06-18 13:58:25 +02:00
Bartłomiej Dach
c7e8990576
Remove unused property 2023-06-18 13:58:25 +02:00
Bartłomiej Dach
62f01e4f40
Rename ModState members to better convey what's what 2023-06-18 13:58:25 +02: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
af3fbdbfbe
Merge pull request #23829 from Joehuu/truncating-text-tooltips
Add tooltips to truncated text
2023-06-12 23:43:31 +02:00
Cootz
aece548db1
Merge branch 'master' into add-mod-search-option 2023-06-12 13:09:09 +03:00
Dean Herbert
99f93f5185 Add comment mentioning why ShowTooltip is disabled in mod select panels 2023-06-12 15:31:22 +09:00