tsrk
f83a4f4952
refactor: tidy up attachement flow
...
TODO: find better naming and improve XMLDocs
2023-06-18 22:57:21 +02:00
tsrk
141f9efad5
style(KeyCounterController): remove reliance on Receptor
2023-06-18 21:26:16 +02:00
tsrk
1a8219adf6
style: guard event handler unsubscriptions
2023-06-18 20:20:56 +02:00
Ruki
9c6c6bf1ea
Merge branch 'master' into hud/kc-skinnable
2023-06-18 18:30:44 +02:00
Dean Herbert
425d3c23f5
Fix some code layout and NRT some classes
2023-06-19 01:03:43 +09:00
Bartłomiej Dach
9ba4bf5fb7
Merge branch 'master' into add-mod-search-option
2023-06-18 15:06:21 +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
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
Bartłomiej Dach
2976145150
Merge pull request #23937 from peppy/order-by-total-score-extension
...
Move `OrderByTotalScore()` to an extension method
2023-06-16 22:18:27 +02:00
Ruki
66f44452d2
Merge branch 'master' into hud/kc-skinnable
2023-06-16 17:30:33 +02:00
Bartłomiej Dach
28696f595f
Privatise setter
2023-06-16 16:24:07 +02:00
Dean Herbert
d965d39c44
Fix distance snap grid circles not correctly being centered on snap point
2023-06-16 17:21:32 +09:00
Dean Herbert
36954e55ad
Fix incorrect mapping when distance spacing is not 1.0x
2023-06-16 17:15:45 +09:00
Dean Herbert
003949ac4e
Merge branch 'master' into limited-distance-spacing
2023-06-16 16:56:22 +09:00
Dean Herbert
362aa4b376
Also move GetMaxAchievableCombo
2023-06-16 15:26:13 +09:00
Dean Herbert
ce41ef6e5d
Move OrderByTotalScore()
to an extension method
2023-06-16 15:24:30 +09:00
Dean Herbert
6f0c8c286b
Merge pull request #23906 from Joehuu/truncate-room-name
...
Truncate online play drawable room name text
2023-06-16 00:22:04 +09:00
Ruki
aba8219d06
Merge branch 'master' into hud/kc-skinnable
2023-06-15 15:48:43 +02:00
tsrk
fcdaf72915
style(KeyCounter): remove useless IsCounting
bindable
...
Counting logic has been moved to the `Trigger`
2023-06-15 12:40:47 +02:00
tsrk
184c793f56
style(KeyCounter): remove useless Content
override
2023-06-15 12:39:22 +02:00
tsrk
a61c1116f5
style: remove unused IAttachableSkinComponent on KCD
2023-06-15 12:27:37 +02:00
Salman Ahmed
39db17d2e9
Use better method to avoid rewinding to deleted beatmaps
2023-06-15 11:22:11 +03:00
Salman Ahmed
cabb4dfaa8
Merge branch 'master' into fix-rewind-bug
2023-06-15 10:59:15 +03:00
Salman Ahmed
2360219b55
Merge branch 'master' into fix-rewind-bug
2023-06-15 10:48:23 +03:00
Dan Balasescu
e78950a162
Merge pull request #23884 from peppy/argon-progress-visibility-light-background
...
Adjust argon progress display to work well on bright backgrounds
2023-06-15 15:50:53 +09:00
tsrk
42b740a175
Merge branch 'master' into hud/kc-skinnable
2023-06-14 22:19:45 +02:00
tsrk
e26aeea589
feat: make KeyCounterDisplay
skinnable
2023-06-14 21:15:12 +02:00
tsrk
c637fddf73
refactor: decouple Trigger logic from KeyCounterDisplay
...
This allows to keep a coeherent state regardless of the progress of the play
2023-06-14 21:13:35 +02:00
tsrk
e9ef270e46
refactor: move count logic in InputTrigger
...
This will allow us to keep track of the real count regardless of whether
the key counter has been placed mid-replay or not.
2023-06-14 19:39:28 +02:00
Salman Ahmed
24d8e336e2
Remove width limit on room status text in favour of cell distribution
2023-06-14 07:55:09 +03:00
Joseph Madamba
05bdc92426
Add right padding according to right detail shear
2023-06-13 14:00:56 -07:00
Joseph Madamba
2a3f2ff122
Truncate room name text
2023-06-13 13:56:29 -07:00
Joseph Madamba
df49a48d4d
Put left and right details inside GridContainer
2023-06-13 13:48:47 -07:00
Dean Herbert
f553efba8a
Fix playback controls in editor handling key repeat when they probably shouldn't
...
Closes https://github.com/ppy/osu/issues/23903 .
2023-06-14 02:30:15 +09:00
Joseph Madamba
0adb399ea8
Use anchor instead of FillFlowContainer
2023-06-13 00:09:58 -07:00
Joseph Madamba
a5c3c9a93f
Use FillFlowContainer
instead of GridContainer
for drawable room background gradient
2023-06-12 23:30:08 -07: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
Dean Herbert
a201339f9c
Fix background track restarting twice when exiting song select with no active selection
2023-06-12 17:12:38 +09:00
Dean Herbert
a1b17c4468
Adjust log output for global background changes to make more sense
2023-06-12 17:12:18 +09:00
Dean Herbert
855185ca85
Adjust argon song progress bar's background fill to always display
2023-06-12 16:43:28 +09:00
Dean Herbert
84670d4c90
Adjust argon graph to use a non-gray colour range
2023-06-12 16:22:40 +09:00
Cootz
036479dd9d
Merge branch 'master' into add-mod-search-option
2023-06-09 16:27:18 +03:00
Dean Herbert
c2663f27a1
Fix audio settings not displaying while watching a replay
2023-06-09 17:58:44 +09:00
Dean Herbert
78b2e6f3df
Add setting to limit distance snapping to current time
...
As discussed in https://github.com/ppy/osu/discussions/23815#discussioncomment-6124116 .
2023-06-09 15:54:33 +09:00
Dan Balasescu
3c51b5a53a
Merge pull request #23809 from peppy/crop-texture-uploads-song-select
...
Greatly improve song select performance by cropping beatmap backgrounds before display
2023-06-09 15:04:57 +09:00
Joseph Madamba
85fedbd025
Add tooltips to truncated text
2023-06-08 19:44:07 -07:00
Bartłomiej Dach
4b3b22f046
Merge branch 'master' into beat-divisor-better-defaults
2023-06-08 20:35:03 +02:00
Bartłomiej Dach
b66d1aa33d
Fix code quality inspection
2023-06-08 20:32:16 +02:00
Bartłomiej Dach
e6503c24c8
Merge branch 'master' into crop-texture-uploads-song-select
2023-06-08 12:24:16 +02:00
Bartłomiej Dach
281aae91ec
Merge pull request #23808 from peppy/working-beatmap-get-background
...
Refactor `IWorkingBeatmap.Background` to `GetBackground()`
2023-06-08 12:23:07 +02: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
Dean Herbert
a842f79ad4
Refactor IWorkingBeatmap.Background
to GetBackground()
2023-06-08 16:19:32 +09:00
Bartłomiej Dach
b3ce7f7b43
Merge branch 'master' into fix-section-container-scroll-attempt-2
2023-06-08 09:19:26 +02:00
Bartłomiej Dach
3c8f387a6c
Remove unused method
2023-06-07 23:38:06 +02:00
Bartłomiej Dach
d9281ac8c7
Remove unused virtual
spec
2023-06-07 23:38:06 +02:00
Bartłomiej Dach
9b665d2e1a
Merge branch 'master' into beat-snap-divisor-hotkeys
2023-06-07 23:38:03 +02:00
Dean Herbert
3a01498789
Use existing next/previous methods (and remove looping behaviour)
2023-06-08 01:01:29 +09:00
Bartłomiej Dach
1f4e79d79d
Merge pull request #23711 from timiimit/add-last-edit-time
...
Store timestamp of beatmap's last edit time in local database
2023-06-07 16:57:24 +02:00
Dean Herbert
2c89af608a
Add ability to cycle beat snap divisor using hotkeys
...
Defaults to Ctrl+Shift+Wheel (as per stable).
Closes #23785 .
2023-06-07 17:15:15 +09:00
Dean Herbert
7d49f5d7c6
Apply NRT to SectionsContainer
2023-06-07 16:32:29 +09:00
Salman Ahmed
62cb6a98ca
Remove redundant nullable suppression directives
2023-06-07 08:20:41 +03:00
Dean Herbert
247ac3a5fd
Merge pull request #23781 from bdach/fix-progress-bar-blink
...
Fix triangles song progress bar blinking during gameplay
2023-06-07 13:44:43 +09:00
Bartłomiej Dach
be59eb1116
Fix triangles song progress bar blinking during gameplay
...
Closes #23760 .
2023-06-06 18:36:25 +02:00
Dean Herbert
247fa088db
Add IHasNoTimedInputs
interface to scope change further
2023-06-06 22:22:42 +09:00
Dean Herbert
d1300f75c0
Merge branch 'master' into no-offset-calibration-with-relax
2023-06-06 22:22:08 +09:00
Dean Herbert
22f7fe1d79
Rename variable and ensure timestamp is updated even when not saving
2023-06-06 15:11:31 +09:00
Dean Herbert
3a50e0fb2f
Merge branch 'master' into add-last-edit-time
2023-06-06 15:07:20 +09:00
Dean Herbert
0c7ab8f971
Merge branch 'master' into hud/argon-kc-animations-poc
2023-06-06 14:43:08 +09:00
Dean Herbert
2f11bd5473
Adjust animations slightly
2023-06-06 14:42:42 +09:00
Dean Herbert
c54670aee1
Add comment explaining implementation
2023-06-06 13:30:56 +09:00
tsrk
6fc6729677
feat: integrate attachment flow in SkinComponentsContainer
2023-06-06 00:27:43 +02:00
tsrk
4c397085c5
refactor: improve attachement flow
...
This removes the hard reliance on individual classes and makes its usage easiser to ingreate anywhere
else.
2023-06-06 00:12:53 +02:00
tsrk
41b7eacc72
Merge branch 'master' into hud/argon-kc-animations-poc
2023-06-05 15:22:20 +02:00
Cootz
3ebc801484
Move (de)select all mods hotkeys handling to ModSelectOverlay
2023-06-05 13:49:07 +03:00
Joseph Madamba
4eb0f0261c
Fix song select beatmap panels not displaying correct background shown in web
2023-06-04 22:54:15 -07:00
Bartłomiej Dach
331e90f720
Merge branch 'master' into tidy-results-grid-usage
2023-06-03 19:45:23 +02:00
Bartłomiej Dach
602d5db3bb
Simplify column dimensions code
...
`dimensions` would always receive exactly one item, so might as well
inline it.
And yes, at this point the grid container is mostly a glorified
`FillFlowContainer { Direction = FlowDirection.Vertical }`, but I am not
touching that in this pull pending further decisions with respect to
direction.
2023-06-03 19:40:01 +02:00
Bartłomiej Dach
a9d4556647
Merge branch 'master' into update-multiplayer-room-diff-range
2023-06-03 16:50:09 +02:00
Bartłomiej Dach
8433813677
Merge branch 'master' into editor-timeline-fix
2023-06-01 21:18:08 +02:00
Bartłomiej Dach
c2d89a32a9
Adjust inline comment
2023-06-01 21:18:00 +02:00
Andrei Zavatski
03eb7c7830
Fix nullability
2023-06-01 21:21:01 +03:00
Andrei Zavatski
949fe32740
Use combined area of children as a mask instead
2023-06-01 15:32:17 +03:00
Dean Herbert
32207d4112
Remember the last used custom divisor when cycling divisor types
2023-06-01 17:11:49 +09:00
Dean Herbert
bcde2cbc73
Apply NRT to BeatDivisorControl
2023-06-01 16:58:14 +09:00
Dean Herbert
f52ed41f10
Use better defaults of 1/4 and 1/6 when cycling types
2023-06-01 16:28:03 +09:00
Dean Herbert
985604fab5
Return StatisticItem
s rather than StatisticRow
s from ruleset
...
There were no usages of more than one column being provided per row, so
it seemed like unnecessarily complexity. I'm currently trying to reduce
complexity so we can improve the layout of the results screen, which
currently has up to three levels of nested `GridContainer`s.
Of note, I can't add backwards compatibility because the method
signature has not changed in `Ruleset` (only the return type). If we do
want to keep compatibility with other rulesets, we could designate a new
name for the updated method.
2023-06-01 14:35:15 +09:00
Dean Herbert
dc595b83f1
Remove unused Dimension
specification from StatisticItem
2023-06-01 14:25:18 +09:00
timiimit
a58426dab6
Use LastEditTime
in Editor
2023-05-31 19:07:04 +02:00
Dean Herbert
812def124f
Merge pull request #23661 from peppy/fix-multiplayer-present-crash
...
Fix `OnResume` / `OnSuspending` potentially getting called before `OnEntering` on a sub screen
2023-05-31 19:43:30 +09:00
Bartłomiej Dach
62d1774407
Apply same comment & reworded condition to suspend too
2023-05-30 21:54:56 +02:00
Andrei Zavatski
d119447a10
Fix editor timeline hitobjects popping in
2023-05-30 16:41:42 +03:00
Dean Herbert
741ee84ed6
Add comment and use full conditional similar to extension method
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-05-30 18:38:28 +09:00
Dean Herbert
14a376c041
Merge branch 'master' into scorev2
2023-05-30 14:34:43 +09:00
Dean Herbert
1558723420
Merge branch 'master' into scorev2
2023-05-29 20:06:32 +09:00
Dean Herbert
1a6d9e9ff0
Apply NRT to GameplayLeaderboardScore
and change GetDisplayedScore
handling
...
I don't feel too confident with the default scoring function being
assigned in the constructor to a publicly settable delegate. This just
feels a bit more elegant, and handles the (likely-never-used) case where
we need to restore the default function.
An alternative would be to provide the function as a `ctor` argument,
but I believe that wasn't done here to allow using the
`ILeaderboardScore` interface.
2023-05-29 20:00:29 +09:00
Dean Herbert
fcd7a1d51a
Move GetDisplayScore
xmldoc to interface and remove getter
2023-05-29 19:41:53 +09:00
Dean Herbert
9a886125ad
Ensure GameplayScoreCounter
's display score is updated on ScoringMode
change
...
This isn't strictly required, but only because of a kind of hacky
behaviour where `HUDOverlay` will recreate all components on a scoring
mode change currently (see
8f6df5ea0f/osu.Game/Screens/Play/HUDOverlay.cs (L410-L418)
).
Best we do this just in case that happens to go away in the future.
2023-05-29 19:00:02 +09:00
Dean Herbert
22be045de3
Apply NRT to GameplayScoreCounter
2023-05-29 18:48:17 +09:00
Dean Herbert
b0501c4e5c
Actually use paused header
2023-05-29 10:24:59 +09:00
Robin Oger
cfa1280028
GameplayMenuOverlay.cs: add translatable strings for Retry count:
and Song progress:
...
This makes the assumption that languages will prefer having the number on the right
2023-05-27 12:47:05 +02:00
Robin Oger
a01577cba5
Adapt changes to fit master
2023-05-27 12:29:14 +02:00
Bartłomiej Dach
574ecf939c
Merge pull request #23647 from peppy/pause-screen-progress
...
Show current progress on pause screen
2023-05-26 19:36:30 +02:00
Dean Herbert
725734bc03
Merge pull request #23649 from peppy/keep-selection-buttons-on-screen
...
Ensure editor selection buttons remain on screen when selection is near edge
2023-05-26 20:51:45 +09:00
Dean Herbert
6b0e215246
Add (int)
flooring and handle potential NaN
value
2023-05-26 20:44:13 +09:00
Bartłomiej Dach
96fe7cbe54
Merge branch 'master' into sample-set-controls
2023-05-25 21:58:16 +02:00
Bartłomiej Dach
7d8f08c0ea
Fix ComposeBlueprintContainer
briefly assigning auto
bank
...
Seems to have had no consequence due to the way
`AutomaticBankAssignment` works (that flag is checked in
`PlacementBlueprint.UpdateTimeAndPosition()`, which runs essentially
every frame), but let's avoid putting it there at all ever.
2023-05-25 21:49:29 +02:00
Bartłomiej Dach
b9be886ae1
Merge branch 'master' into pause-screen-progress
2023-05-25 20:34:11 +02:00
Bartłomiej Dach
6425a33b45
Merge branch 'master' into beatmap-length-calcualtions
2023-05-25 17:44:15 +02:00
Bartłomiej Dach
b59f4aee99
Merge pull request #23660 from peppy/simplify-deselect
...
Fix crash when deleting dragged object in skin editor
2023-05-25 17:27:41 +02:00
Bartłomiej Dach
3ad5f8b9c9
Polish a few extreme edge cases
2023-05-25 16:39:54 +02:00
Dean Herbert
949de35664
Ensure selection is reset after immediately deleting objects
...
Closes https://github.com/ppy/osu/issues/23518 .
2023-05-25 23:20:32 +09:00
Bartłomiej Dach
beeca5a8dd
Use alternative layouting implementation
2023-05-25 16:17:44 +02:00
Dean Herbert
b3c2d120bf
Fix OnResume
/ OnSuspending
potentially getting called before OnEntering
on a sub screen
2023-05-25 20:39:11 +09:00
Dean Herbert
a6a380dd41
Merge branch 'master' into organize-room-pills
2023-05-25 19:57:28 +09:00
Dean Herbert
609c7227ee
Fix changes to font weight in a couple of combined implementations
2023-05-25 19:55:11 +09:00
Dean Herbert
57c63dbb29
Add xmldoc for GetDisplayScore
2023-05-25 19:24:15 +09:00
Dean Herbert
1049257b56
Simplify SelectionHandler
's DeselectAll
implementation
...
We are already doing other operations in this class directly on `SelectedItems`, so might as well change this one to match
2023-05-25 18:46:31 +09:00
Dean Herbert
1e14b02493
Fix bindable feedback loop
2023-05-25 17:58:38 +09:00
Dean Herbert
37c6e632d0
Switch to using new extension method for length calculations
2023-05-25 17:38:35 +09:00
Dean Herbert
cf9fda0cf2
Merge branch 'beatmap-length-calcualtions' into pause-screen-progress
2023-05-25 17:34:08 +09:00
Dean Herbert
058edb5d5f
Centralise beatmap playable duration and bounds lookups
2023-05-25 17:32:48 +09:00
Bartłomiej Dach
578a0e7494
Merge branch 'master' into beat-divisor-visual-improvements
2023-05-24 22:28:26 +02:00
Bartłomiej Dach
6ec4ecfdd7
Mention fallback default in GetDivisorForBeatIndex()
2023-05-24 22:17:51 +02:00
Bartłomiej Dach
133c954c93
Merge branch 'master' into pause-screen-progress
2023-05-24 21:57:26 +02:00
Bartłomiej Dach
8b6cd1310a
Merge branch 'master' into editor-escape-deselects
2023-05-24 20:18:44 +02:00
Bartłomiej Dach
cd3602406b
Remove unused using directive
2023-05-24 18:54:48 +02:00
Dean Herbert
b14b1072c2
Allow deselecting any selection in the editor using the Back
binding (escape key)
2023-05-24 19:24:14 +09:00
Dean Herbert
3b9e1e8a94
Ensure editor selection buttons remain on screen when selection is near edge
...
Addresses https://github.com/ppy/osu/discussions/23599 .
2023-05-24 19:16:53 +09:00
Dean Herbert
79c9a48ff7
Show song progress at pause/fail screen
2023-05-24 18:36:37 +09:00
Dean Herbert
456f3005d6
Apply nullability to GameplayMenuOverlay
and use TextFlowContainer
for text
2023-05-24 18:28:04 +09:00
Dean Herbert
8ada8b1c8c
Remove description line from pause/fail screen
...
These were in the designs but read pretty bad / evil. I can't think of
any text to go in their place that makes sense, so let's just nuke it.
2023-05-24 17:48:35 +09:00
Dean Herbert
3a05dffa50
Add "auto" bank selection during placement
2023-05-24 17:11:12 +09:00
Dean Herbert
fc22c75464
Don't use switch
for single case
statement
2023-05-24 16:14:05 +09:00
Dean Herbert
a9ba16a2be
Update to support non-control-point sample changes
2023-05-24 14:20:38 +09:00
Dean Herbert
298989ffd2
Merge branch 'master' into sample-set-controls
2023-05-24 14:03:04 +09:00
Dean Herbert
561b759bf9
Tidy up implementation and ensure non-solid ticks start at zero alpha
2023-05-24 13:49:29 +09:00
Dean Herbert
8f1f1955df
Merge pull request #66 from Gyoshi/beat-divisor-visual-improvements
...
Add ghost ticks to exhibit current divisor on `BeatDivisorControl`
2023-05-24 13:41:48 +09:00
Joseph Madamba
067328233c
Remove OsuScreen.ApplyLogoArrivingDefaults()
2023-05-23 13:17:43 -07:00
Gyoshi
7fe19d1992
Last
instead of Max
divisor to match code elsewhere
2023-05-23 18:45:49 +02:00
Gyoshi
c5ef3ae181
Code styling
2023-05-23 18:44:20 +02:00
Gyoshi
b5f8093941
Use RangePadding
to align mouse with slider
2023-05-23 18:16:14 +02:00
Gyoshi
7b1e8ede54
Small format
2023-05-23 15:11:27 +02:00
Gyoshi
1b32370c6a
Remove duplicate code by making GetDivisorForBeatIndex
method more general
2023-05-23 15:05:38 +02:00
Gyoshi
37a796306d
Small format & comment
2023-05-23 14:30:35 +02:00
Johannes vd Berg
ebda35c3c9
Add ghost ticks to exhibit current divisor on BeatDivisorControl
2023-05-23 12:57:25 +02:00
Dan Balasescu
7658536b5a
Fix CI issues
2023-05-23 19:32:19 +09:00
Dan Balasescu
fee3d43596
Merge branch 'master' into scorev2
2023-05-23 19:07:54 +09:00
Bartłomiej Dach
38b4bd8aef
Fix undo not behaving as expected sometimes
2023-05-22 22:45:39 +02:00
Bartłomiej Dach
e0b7539c2a
Fix sample changes not being applied in patcher
2023-05-22 22:45:23 +02:00
Bartłomiej Dach
f253d17a7f
Fix slider velocity changes not being applied in patcher
2023-05-22 22:19:10 +02:00
timiimit
9d14ea9d27
Merge branch 'ppy:master' into update-multiplayer-room-diff-range
2023-05-21 16:37:00 +02:00
timiimit
4441718437
Merge branch 'ppy:master' into organize-room-pills
2023-05-21 16:36:53 +02:00
Bartłomiej Dach
afdddb0195
Merge pull request #23582 from peppy/placement-blueprint-timeline-combo-fixes
...
Fix timeline blueprint display not showing correct combo number / colour during placement
2023-05-20 15:02:55 +02:00
Bartłomiej Dach
0e11adaaac
Merge pull request #23564 from peppy/fix-missing-sample-additions
...
Fix sample banks not transferring when adjusting via editor
2023-05-20 14:36:45 +02:00
Dan Balasescu
035d0d5c9c
Fix multiplayer leaderboard not working
2023-05-19 13:16:57 +09:00
Dan Balasescu
c33e4fe75e
Remove unnecessary override
2023-05-18 20:10:28 +09:00
Dan Balasescu
f3591f83a2
Remove ScoreManager.GetTotalScore()
2023-05-18 20:08:49 +09:00
Dan Balasescu
510b8e4c78
Remove ScoreManager.Mode, handle per-use
2023-05-18 20:08:49 +09:00
Dean Herbert
214d7e07fa
Add TODO regarding failing stack display code
2023-05-17 17:52:17 +09:00
Dean Herbert
9563d4f730
Fix weird purple tint on placement object in timeline
2023-05-17 17:26:19 +09:00
Dean Herbert
87ff28b022
Update beat divisor control to show ticks in more visually correct locations
...
As proposed in https://github.com/ppy/osu/discussions/23527 .
2023-05-17 16:34:12 +09:00
Dean Herbert
730bc3a961
Apply NRT and simplify some remaining code
2023-05-17 16:18:13 +09:00
Dean Herbert
e97d027230
Make OnlinePlayPill
class abstract
2023-05-17 16:13:03 +09: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
dc51d5ecf3
Rename GetSampleInfo
to better describe what method does
...
Also add full xmldoc
2023-05-17 14:07:48 +09:00
Dean Herbert
d9ae822966
Fix bank not correctly being assigned when adding sample additions in editor
2023-05-16 18:52:52 +09:00
timiimit
cc6e4df93e
Remove wrongly added back namepspace
2023-05-16 10:27:46 +02:00
timiimit
4ef74eb3f9
Fix RoomStatusPill
text colour
2023-05-16 10:22:52 +02:00
timiimit
81b7737660
Fix text colour of RoomSpecialCategoryPill
2023-05-16 10:20:16 +02:00
timiimit
a9991d9dd4
Remove another unused namespace
2023-05-16 10:14:14 +02:00
timiimit
40daa41a52
Fix naming & namespaces
2023-05-16 10:06:48 +02:00
timiimit
04893064f0
Make used pills inherit from a common one
2023-05-16 09:53:11 +02:00
timiimit
10d6f9ea5a
Create common online play pill
2023-05-16 09:52:26 +02:00
timiimit
0fd718478a
Merge branch 'master' into update-multiplayer-room-diff-range
2023-05-15 07:36:43 +02:00
Bartłomiej Dach
592fcafcd4
Merge pull request #23451 from timiimit/fix-default-progress-graph-flipping
...
Fix default progress graph not updating after flip
2023-05-14 19:19:10 +02:00
timiimit
fd80ffd52b
Fix display update condition
2023-05-14 12:09:15 +02:00
timiimit
18efdb0e4c
Make layout
readonly
2023-05-13 11:37:56 +02:00
timiimit
d81cdacb0d
Undo stupid changes
2023-05-13 11:28:05 +02:00
timiimit
4b544903cb
Optimize recalculateValues
2023-05-13 10:13:09 +02:00
timiimit
2cfc4eb515
Fix unconsidered height change
2023-05-13 10:12:46 +02:00
timiimit
80b6e014f1
More code style
2023-05-13 01:47:44 +02:00
timiimit
8cc0c5ad1c
Fix code style
2023-05-13 01:39:01 +02:00
timiimit
04f7def798
Remove useless comment
2023-05-13 01:31:12 +02:00
timiimit
21d7c62f30
Add optimized UpdateGraph
2023-05-13 01:29:11 +02:00
timiimit
159cacf9c7
Fix logic in recalculateValues()
2023-05-13 01:27:28 +02:00
timiimit
6180d0d620
Remove cached frame buffer
2023-05-12 15:00:46 +02:00
Dean Herbert
70e248b927
Force placement of in-progress object when changing tools in the editor
2023-05-12 16:06:01 +09:00
Dean Herbert
bdf8a78b42
Add the ability to adjust the beatmap tick rate in the editor
2023-05-09 20:53:20 +09:00
Dan Balasescu
3c3c812ed6
Initial implementation of ScoreV2
2023-05-09 19:33:33 +09:00
Dean Herbert
2085833a84
Fix missing delegate unsubscribe
2023-05-09 17:08:03 +09:00
Dean Herbert
944da06c10
Rename slider multiplier variable back for now
2023-05-09 16:58:19 +09:00
Dean Herbert
8c44d528e9
Use min/max values from stable
2023-05-08 13:52:16 +09:00
Dean Herbert
a6cb1f90e4
Change difficulty popover inspector display (yet again)
...
I think this makes the most sense of the iterations I've tested so far, albeit maybe being a touch too verbose.
2023-05-08 13:43:23 +09:00
Dean Herbert
a91edd68d9
Show post-multiplied velocity in main hit object inspector
2023-05-08 13:42:25 +09:00
Dean Herbert
451af9d1b5
Fix beatmap values not being updated due to a varying data type
2023-05-08 13:23:13 +09:00
Dean Herbert
d9dd35c020
Show base velocity in slider adjustment popover
2023-05-08 13:13:09 +09:00
Dean Herbert
31de4de720
Remove median/mode slider velocity display
...
The intention was to give an idea of what the most common velocity of
the beatmap is, but in hindsight, because the "base" velocity is being
set elsewhere this doesn't make sense. It will/should be 1.0x.
Showing this range is still valuable, though.
2023-05-08 13:13:09 +09:00
Dean Herbert
b109ee74a6
Add "base velocity" adjustment to difficulty setup screen
2023-05-08 13:13:09 +09:00
Bartłomiej Dach
65b4b198a4
Merge branch 'master' into export
2023-05-06 20:12:53 +02:00
tsrk
e9d7cd7a79
feat(ArgonKeyCounter): flash key name
2023-05-06 19:08:30 +01:00
Bartłomiej Dach
e808a47811
Fix delegate leak
2023-05-05 20:33:27 +02:00
Bartłomiej Dach
f536238554
Use shorter copy
2023-05-05 20:30:50 +02:00
Bartłomiej Dach
34b19dd6f4
Merge branch 'master' into slider-velocity-inspector
2023-05-05 20:20:16 +02:00
Dean Herbert
b7a287869a
Add display of beatmap slider velocity when adjusting
2023-05-05 15:57:38 +09:00
Dean Herbert
cc70d89bf9
Move editor inspector classes out of ruleset namespace
2023-05-05 15:57:38 +09:00
Dean Herbert
560f71ef53
Adjust BlurredIcon
expansion ratio to fix glow getting cut off at lower resolutions
...
Closes https://github.com/ppy/osu/issues/23210 .
Ballparked the fix to work down to the lowest resolution we support. The
previous number (`2.5f`) was also likely ballparked so the fix seems in
line with expectations.
I don't want to put too much thought into this because the design of
this screen is likely going to change in the mean time anyway.
2023-05-05 14:29:04 +09:00
tsrk
74e7a958bb
feat(ArgonKeyCounter): make animation
...
Currently WIP. Do not consider this final.
2023-05-05 05:31:06 +01:00
Bartłomiej Dach
fa3f42ba75
Merge pull request #23386 from peppy/fix-osu-logo-input-handling
...
Extend input handling of osu! logo to full border area
2023-05-03 17:48:51 +02:00
cdwcgt
4549a865d9
Merge branch 'master' into export
2023-05-04 00:18:01 +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
Dean Herbert
5757eb7529
Update a few more instances of 0.96f
scale constants
2023-05-03 18:20:12 +09:00
Dean Herbert
453143813f
Extend input handling of osu! logo to full border area
...
This is the easiest way to make this happen. It does mean the pink area
is being drawn behind the white border, but I haven't found a scenario
where this is noticeable.
Closes #4217 .
2023-05-03 14:57:57 +09:00
Dean Herbert
6b017ac05f
Merge pull request #23308 from OliBomby/sample-control-points
...
Remove SampleControlPoint and DifficultyControlPoint from HitObject
2023-05-03 14:21:51 +09:00
Dean Herbert
8a536c1cdb
Fix non-block namespace usage
2023-05-02 15:09:24 +09:00
OliBomby
1dc34ee25d
fix infinite repeat count when adjusting length of 0 length slider
2023-05-01 15:48:54 +02:00
OliBomby
608fa3cc73
Merge remote-tracking branch 'upstream/master' into sample-control-points
2023-04-30 19:47:03 +02:00
Cootz
607a04ae73
Fix the issue
2023-04-29 10:29:33 +09:00
OliBomby
c44f71a737
remove all regular usage of DifficultyControlPoint
2023-04-26 17:55:38 +02:00
OliBomby
87ca0f5335
Update SamplePointPiece.cs
2023-04-26 13:45:58 +02:00
Bartłomiej Dach
5ec8ecb11b
Merge pull request #23309 from peppy/key-counters-fix
...
Fix key counters counting during break time
2023-04-25 21:15:12 +02:00
OliBomby
e4b64bdc3e
clean up code stuff
2023-04-25 19:06:29 +02:00
OliBomby
755ad25dbe
clean code
2023-04-25 18:27:20 +02:00
OliBomby
c23a7b014e
add missing }
2023-04-25 18:17:07 +02:00
OliBomby
065464d90c
Fixed DifficultyPointPiece
2023-04-25 18:12:53 +02:00
Dean Herbert
14af2063e5
Merge pull request #23247 from peppy/round-editor-rotation
...
Always round editor rotation to integer values
2023-04-25 21:43:44 +09:00
Dean Herbert
6b4032e34b
Add missing binding of IsCounting
with contained counters
2023-04-25 21:37:19 +09:00
Dean Herbert
0a861ffcee
Restructure key counters to use a common flow
2023-04-25 21:37:19 +09:00
Dean Herbert
7630958633
Stop using Drawable.Name
to convey actual UI information
2023-04-25 20:24:36 +09:00
Dean Herbert
dd2c289ce9
Remove pointless default value
2023-04-25 20:22:12 +09:00
Dean Herbert
d8b4db3a13
Merge branch 'master' into gameplay/argon-key-counter_le-retour
2023-04-25 19:54:31 +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
Dean Herbert
9f4b1f0f24
Always round editor rotation to integer values
2023-04-20 14:30:01 +09: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
Dean Herbert
52bb7891f7
Merge branch 'master' into fix-count-not-updating-when-deleting
2023-04-11 09:04:02 +09: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
Bartłomiej Dach
73bd0feef5
Fix incorrectly implemented localisation
2023-04-10 15:03:33 +02:00
Bartłomiej Dach
6fec476147
Simplify snap implementation
2023-04-10 14:55:30 +02:00
Joseph Madamba
7f5b99c91b
Fix song select beatmap difficulty count not updating when deleting
2023-04-09 22:12:51 -07:00
cdwcgt
ce6a87b4a3
Merge remote-tracking branch 'upstream/master' into export
2023-04-09 15:02:47 +09:00
Dean Herbert
8d2e852ffd
Fix overbearing key down handling
2023-04-08 22:30:36 +09:00
Dean Herbert
a1fc4def1d
Remove redundant method override
2023-04-08 22:18:07 +09:00
Micha Lehmann
3c4a25e53f
Fix tooltip text not resetting when ending an editor rotation
2023-04-08 14:28:52 +02:00
Micha Lehmann
580d5745c0
Add "(snapped)" to the tooltip when snap-rotating in the editor
2023-04-08 14:15:49 +02:00
Dean Herbert
f72dd86b42
Fix code quality issues and avoid updating bindable twice per operation
2023-04-08 10:40:36 +09:00
Micha Lehmann
c827c2810b
Improve editor selection rotation value wrapping
...
This fixes two issues the previous algorithm had:
1. A half-turn rotation used to show up as -180°.
2. Rotating more than 180° in one drag event would overwhelm it
and cause the value to go outside its range.
This comes at the cost of a negligible performance hit,
since a division (modulo) is performed instead of just addition/subtraction.
2023-04-08 01:30:29 +02:00
Micha Lehmann
f1de560d57
Snap editor selection rotation when holding shift
2023-04-08 01:30:29 +02:00
Dean Herbert
0c71fa1bbd
Merge branch 'master' into gameplay/argon-key-counter_le-retour
2023-04-06 23:39:57 +09:00
Dean Herbert
e6872629f3
Merge pull request #22868 from peppy/no-epilepsy-warning-storyboard-disable
...
Don't show epilepsy warning when storyboards are disabled
2023-04-06 12:32:38 +09:00
tsrk
809b817e8e
Merge branch 'master' into gameplay/argon-key-counter_le-retour
2023-04-05 22:57:36 +02:00
Bartłomiej Dach
ba753a8aac
Merge branch 'master' into update-skinnable-sound-before-playing
2023-04-05 22:56:25 +02:00
Bartłomiej Dach
6df7614b9d
Add tests for suppressing epilepsy warning when storyboard disabled
2023-04-05 20:56:50 +02:00
Bartłomiej Dach
432f698697
Merge branch 'master' into gameplay/key-counter-abstraction
2023-04-05 19:45:14 +02:00
Bartłomiej Dach
8cc425774b
Merge branch 'master' into fix-replay-fail-on-exit
2023-04-03 21:23:23 +02:00
Dean Herbert
b0c09df259
Merge branch 'master' into gameplay/key-counter-abstraction
2023-04-03 15:33:35 +09:00
Dean Herbert
4b294278d6
Merge branch 'master' into fix-ruleset-shader-caching
2023-03-31 20:04:55 +09:00
Dean Herbert
796cd9c916
Rewrite comment explaining early return on checkScoreCompleted
given new usages
2023-03-31 02:36:17 +09:00
Dean Herbert
b25a59fd14
Rename scoreCompleted
-> checkScoreCompleted
to reflect the fact it doesn't always succeed
2023-03-31 02:30:04 +09:00
Dean Herbert
4dd0c2c7a5
Add assert ensuring we don't ever get to the results screen with an F rank
...
Intentionally an assertion as I want tests to fail, but I don't want
this to cause crashes for an end user if it does happen to occur.
2023-03-29 14:11:58 +09:00
Dean Herbert
a8bb2e33ac
Ensure all preconditions are checked before progressing to results screen after storyboard ends
2023-03-29 14:00:11 +09:00
Dean Herbert
aad540629f
Remove duplicate load rule from ShaderPrecompiler
2023-03-29 12:36:56 +09:00
Dean Herbert
5dfac02b11
Preload triangle shader on startup
2023-03-28 14:15:38 +09:00
Joseph Madamba
8b30c67580
Fix incorrect song select matching label by showing both beatmap and difficulty count for less ambiguity
2023-03-26 18:08:28 -07:00
Joseph Madamba
3e0bbb2432
Fix select beatmap button not highlighting when creating a multiplayer room using keyboard
2023-03-26 16:03:21 -07:00
Dean Herbert
c65a79614d
Don't show offset calibration controls when "relax" mod is active
...
Closes https://github.com/ppy/osu/issues/22892 .
2023-03-22 15:45:04 +09:00
Dean Herbert
425be20e46
Fix song select search textbox font size incorrectly having increased
2023-03-22 14:17:39 +09:00
Bartłomiej Dach
9ff9cd3b7f
Merge branch 'master' into skin-editor-cyclic-selection
2023-03-21 19:49:55 +01:00
Dean Herbert
e31a90e043
Don't cycle selection when more than one items are selected
2023-03-21 21:31:10 +09:00
Dean Herbert
5cb8160eee
Merge pull request #22773 from peppy/show-song-select-visible-beatmap-count
...
Show count of visible beatmaps at song select
2023-03-21 18:22:29 +09:00
Bartłomiej Dach
ea8da69263
Fix importing beatmaps not changing count of visible beatmaps
...
Reproduction steps:
1. Go to song select
2. Open beatmap listing
3. Import a beatmap that would fit the current filter criteria
4. The count of visible beatmaps does not change
Fixed by updating the count on `BeatmapSetsChanged` too.
2023-03-20 20:53:53 +01:00
Bartłomiej Dach
695ee39b87
Privatise setter
2023-03-20 20:30:54 +01:00
Cootz
556964eae0
Merge branch 'master' into BitmapUpdatesOnScore
2023-03-16 12:16:42 +03:00
Dean Herbert
3b62f87b64
Ensure Player
does not fail a score on exit if a replay is currently loaded
2023-03-16 17:14:20 +09:00
Dean Herbert
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
Terochi
edc6314634
Drank some coffee and figured out the fix
2023-03-15 10:49:59 +01:00
Dean Herbert
5f9b13a775
Rename Add
/AddRange
methods as they are no longer conflicting with Container
2023-03-15 18:02:41 +09:00
Dean Herbert
9e444af380
Use object initialisers and fix order of initialisation vs add
2023-03-15 18:02:26 +09:00
Terochi
b0f1a69523
Update the pauseLoop sample instantly on skin change
2023-03-15 09:05:34 +01:00
Dean Herbert
1cf870d956
Add test coverage and fix fail case where a drag selection ends incorrectly with cyclic selection
2023-03-15 15:16:48 +09:00
Terochi
1d5e596615
Update FailAnimation
to use SkinnableSound
2023-03-14 20:44:30 +01:00
Dean Herbert
6546f5968a
Merge branch 'master' into skin-editor-cyclic-selection
2023-03-14 20:43:56 +09:00
Dean Herbert
b46fc14e56
Merge pull request #22848 from Rovearix/Fix-Dragging-Preventing-Beatmap-Loading
...
Prevent LoadingLayer from blocking loading
2023-03-14 20:42:10 +09:00
Dean Herbert
4cea29402b
Don't show epilepsy warning when storyboards are disabled
...
I have more thoughts on this warning in general (which will likely see
it removed or moved in the future) but this seems like a quick QOL fix
for now.
As mentioned in https://github.com/ppy/osu/discussions/22861 .
2023-03-14 18:32:26 +09:00
Rovearix
9ac9287dbd
Switched the implementation to set the blockInput flag for the BeatmapMetadataDisplay's LoadingLayer. This prevents the UIEvents from being being handled in this case without modifying the class
2023-03-13 08:07:55 -04:00
Derrick Timmermans
febdca4547
Fix argon progress bar fill being oversized
2023-03-12 02:08:00 +01:00
Dan Balasescu
e327993d11
Merge pull request #22527 from Terochi/replay-length-extension
...
Replay recording extension until results screen transition
2023-03-11 15:41:32 +09:00
tsrk
d806b85a30
revert: make counters
an IEnumerable
again
...
As suggested by bdach as this would make the last two commits useless
Refs: 5d15426
2023-03-09 10:25:03 +00:00
Dean Herbert
4f7be332f3
Revert isDraggingBlueprint
to field
2023-03-08 19:24:03 +09:00
Dean Herbert
245c3c025c
Refactor endClickSelection
to reduce nesting
2023-03-08 19:23:32 +09:00
tsrk
5d15426c27
refactor: make Counters
return a Container
2023-03-08 01:52:12 +00:00
tsrk
5b0db94a24
docs: add XMLDoc for methods in KCD
2023-03-08 00:58:54 +00:00
tsrk
44297a7d0a
refactor: make KCD a CompositeDrawable
2023-03-08 00:47:16 +00:00