Commit Graph

31479 Commits

Author SHA1 Message Date
31d6c75f40 Merge branch 'master' into realm-property-watching 2022-03-07 13:53:17 +09:00
b90a5864b1 Merge pull request #17138 from peppy/disallow-icon-interaction
Disallow interaction with carousel set difficulty icons unless selected
2022-03-07 13:00:18 +09:00
da29947ecd Disallow interaction with carousel set difficulty icons unless selected
I kinda liked this flow, but from multiple reports from users it
definitely seems in the way. We can revisit after the new design is
applied to song select.

Note that this means the tooltips also don't display. If it is preferred
that they should (arguable from a UX perspective, since I'd expect to be
able to click at that point) then the issue can be addressed using a
slightly different path (a few more lines - nothing too complex).
2022-03-07 11:34:08 +09:00
bd1adaf245 Merge pull request #17115 from frenzibyte/manual-channel-scroll
Refactor channel scrolling container to handle non-user scrolls
2022-03-07 11:26:23 +09:00
ba83db0229 Merge pull request #17134 from bdach/mod-overlay/popup-screen-title
Implement popup screen title component
2022-03-07 11:03:38 +09:00
e5a6564034 Merge branch 'master' into fix-storyboard-sample-rate 2022-03-07 03:12:40 +03:00
d9be65ea39 Remove no longer necessary CancelUserScroll method 2022-03-06 23:58:06 +03:00
60334046e4 Revert UserTrackingScrollContainer changes 2022-03-06 23:57:51 +03:00
a13a087f5d Add xmldoc to trackNewContent to explain its purpose 2022-03-06 23:51:27 +03:00
9ec0e74813 Move scrolling to UpdateAfterChildren to avoid scheduling
At least that's what I believe "let FillFlow update to new size" means.
2022-03-06 23:50:58 +03:00
9bc1f3f014 Further refactor and simplify ChannelScrollContainer 2022-03-06 23:34:12 +03:00
54275813b5 Use text flow container in popup screen title 2022-03-06 20:41:31 +01:00
df0617f34c Implement popup screen title component 2022-03-06 16:09:18 +01:00
e1eeb9c6bb Allow tabbing between textboxes in sample point popover 2022-03-06 01:43:56 +01:00
634821e49f Use the term "programmatically" instead 2022-03-06 00:01:45 +03:00
5b3ffb12b7 Refactor channel scrolling container to handle manual scrolls resiliently 2022-03-05 23:27:07 +03:00
06512e8bd9 Use const for minimum height specification in final usage location
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-03-06 01:01:22 +09:00
f8ef352306 Don't consider judgements beneath the minimum height as being applicable
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-03-06 01:00:47 +09:00
08b3bc222d Revert "Fix potential crash in tests when attempting to lookup key bindings in cases the lookup is not available"
This reverts commit 8115a4bb8f.

Commit was cherrypicked out to a separate pull on a different merge
base, then reverted in that pull, so it should be reverted here too.
2022-03-05 16:42:51 +01:00
e4b4c3c5c4 Merge branch 'master' into offset-ui-improvements 2022-03-05 16:10:18 +01:00
6264dd266d Merge pull request #17087 from peppy/combine-time-slider-implementation
Centralise implementation of slider bars which display millisecond time values
2022-03-05 23:48:26 +09:00
faddc20dca Merge pull request #17073 from peppy/add-offset-adjust-tooltip-text
Add tooltip text for offset adjustment slider
2022-03-05 23:28:24 +09:00
346cec3577 Merge branch 'add-offset-adjust-tooltip-text' into combine-time-slider-implementation 2022-03-05 14:58:56 +01:00
ce51ce49cf Revert changes to GetTooltipText and use TooltipText override directly 2022-03-05 22:46:13 +09:00
38abfbf4d1 Merge branch 'master' into add-display-choice-dropdown 2022-03-05 14:39:59 +01:00
1e34aca984 Rename method to better fit purpose 2022-03-05 14:38:15 +01:00
524b8e02ef Revert "Update all usages of OsuSlider.TooltipText overrides to instead implement GetTooltipText"
This reverts commit abba49fd8f.
2022-03-05 22:37:36 +09:00
bbc2b36117 Merge branch 'master' into add-offset-adjust-tooltip-text 2022-03-05 22:37:04 +09:00
c132fc19e7 Update resources 2022-03-04 22:59:33 +09:00
19a940482f Merge pull request #17100 from nekodex/cursor-tap-volume
Reduce 'cursor-tap' sample playback volume on MouseUp
2022-03-04 22:17:59 +09:00
d6e78e7d95 Merge pull request #17068 from peppy/fix-hit-distribution-rounding
Fix hit distribution graph midpoint rounding not looking great around zero
2022-03-04 22:16:30 +09:00
1e246bf560 Reduce 'cursor-tap' sample playback volume on MouseUp 2022-03-04 20:14:14 +09:00
6673e456c5 Merge pull request #17090 from miniriley2012/wiki-locale-fix
Fix wiki links containing locale not loading when opened from chat.
2022-03-04 19:36:14 +09:00
70219f511c Merge branch 'master' into fix-apply-offset-from-non-zero 2022-03-04 12:14:01 +03:00
1c40fcb79e Reorder math to be easier to pass
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2022-03-04 17:54:04 +09:00
3fdc7ed9d2 Remove brackets surrounding one-line statements 2022-03-04 10:14:19 +03:00
5d337e41cf Merge branch 'master' into fix-profile-badge-cancellation 2022-03-04 10:07:09 +03:00
129c290ca0 Dispose cancellation token source on disposal 2022-03-04 10:01:07 +03:00
76c293b9e9 Fix cancellation token source recreated on every medal 2022-03-04 10:00:56 +03:00
8491bab77c Replace string locale with Language 2022-03-04 00:57:13 -06:00
5a164e4520 Hide adjustment when no adjustment is applied 2022-03-04 15:19:55 +09:00
e9e92b991e Fix calibrating offset from previous non-zero offset not applying adjustment correctly 2022-03-04 15:09:44 +09:00
8c7b1e0aa8 Only construct the adjustment portion of bars when required 2022-03-04 15:01:54 +09:00
2785218b79 Only apply animation if the bar is going to be larger than the minimum height 2022-03-04 14:59:53 +09:00
81a49057ec Fix wiki links containing locale not loading when opened from chat. 2022-03-03 23:38:51 -06:00
540d7d0e2c Add the ability to set and show an offset value on timing distribution graph 2022-03-04 14:36:15 +09:00
95044bbbac Merge branch 'master' into fix-storyboard-sample-rate 2022-03-04 08:17:40 +03:00
d3e04fe594 Colour centre bin in distribution graph differently 2022-03-04 14:09:27 +09:00
c063a73742 Fix autosize weirdness by specifying a constant size for the x axis 2022-03-04 14:05:42 +09:00
010fa7ed01 Allow an offset to be shown on the timing distribution graph 2022-03-04 14:05:42 +09:00