h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 00:45:43 +08:00
Code Issues Releases Wiki Activity
62,119 Commits 3 Branches 661 Tags 368 MiB
89eeff515b
Commit Graph

13427 Commits

Author SHA1 Message Date
Dean Herbert
d74b1e148d Make ScoreInfo.BeatmapInfo nullable 2023-07-04 14:50:34 +09:00
Bartłomiej Dach
21f758947d
Merge branch 'master' into availability-fixes 2023-07-02 20:38:37 +02:00
Bartłomiej Dach
9eec1337b3
Use slightly different condition for better UX 2023-07-01 21:39:08 +02:00
Bartłomiej Dach
183777f8df
Fix edge cases where selection buttons go outside playfield bounds 
Addresses
https://github.com/ppy/osu/discussions/23599#discussioncomment-6300885.
 2023-07-01 21:27:17 +02:00
Dean Herbert
5f880397a9 Increase the minimum size of the scroll bar 
Allows easier targetting when there is a lot of content in the scroll view

As discussed in https://github.com/ppy/osu/discussions/24095#discussioncomment-6332398.
 2023-07-02 00:04:56 +09:00
Bartłomiej Dach
e4e08c0f5f
Fix selection handlers eating hotkey presses they didn't handle 2023-06-28 20:48:22 +02:00
Dean Herbert
3883c28b15 Add visual display in participants list when availability is still being established 2023-06-28 16:02:46 +09:00
Dean Herbert
91354b1570 Avoid performing any actions when BeatmapAvailability is updated to Unknown 2023-06-28 16:01:54 +09:00
Dean Herbert
29376ffcc0 Trigger state change when flipping via hotkey in the editor 
This will trigger a change even if nothing happens. But I think that's
okay (not easy to avoid) because the change handler should be aware that
nothing changed, if anything.

Closes https://github.com/ppy/osu/issues/24065.
 2023-06-28 13:52:51 +09:00
Dean Herbert
1d4380cfd0
Merge pull request #24058 from peppy/full-term-exact-match 
Add support for matching full terms at song select using suffixed `!`
 2023-06-28 12:14:15 +09:00
Dean Herbert
076f41be12
Merge pull request #24059 from peppy/add-editor-rotate-hotkeys 
Add support for `Ctrl` + `<` / `>` to rotate selection in editor
 2023-06-28 12:03:34 +09:00
Bartłomiej Dach
9be2d9d62e
Fix hotkey presses generating unnecessary undo history 
The buttons don't check whether the operation they correspond to is
possible to perform in the current state of the selection box, so not
checking `Can{Reverse,Rotate}` causes superfluous undo states to be
added without any real changes if an attempt is made to reverse or
rotate a selection that cannot be reversed or rotated.
 2023-06-27 22:25:04 +02:00
Bartłomiej Dach
17ed45d07c
Mention hotkeys in button tooltips 2023-06-27 22:04:15 +02:00
Bartłomiej Dach
54280f06be
Switch to == true 2023-06-27 22:02:15 +02:00
Bartłomiej Dach
ad3a470eaf
Enable NRT in SelectionBox 2023-06-27 22:01:44 +02:00
Bartłomiej Dach
eb6bdb5a38
Merge pull request #23926 from ItsShamed/hud/kc-skinnable 
Make key counter skinnable
 2023-06-27 21:57:41 +02:00
Bartłomiej Dach
bf99fc61b8
Trim full phrase filters in a more precise manner 2023-06-27 21:50:36 +02:00
Bartłomiej Dach
e3d97b37f1
Rename MatchMode.{None -> Substring} 2023-06-27 21:28:37 +02:00
Bartłomiej Dach
06654dc618
Merge branch 'master' into full-term-exact-match 2023-06-27 21:27:39 +02:00
Bartłomiej Dach
af66ccbfdf
Merge branch 'master' into hud/kc-skinnable 2023-06-27 20:35:47 +02:00
Dean Herbert
c6d952abe3 Add support for Ctrl + < / > to rotate selection in editor 
As discussed in https://github.com/ppy/osu/discussions/24048.
 2023-06-27 17:01:41 +09:00
Dean Herbert
7ddbf4eaa7 Add a visual effect when keyboard shortcuts are used to trigger selection box buttons 2023-06-27 17:01:13 +09:00
Dean Herbert
41890cfc65 Change JudgementCountController to a Component and remove handling overrides 2023-06-27 16:39:21 +09:00
Dean Herbert
8bd6f7a46a Rename ClicksPerSecondCalculator to ClicksPerSecondController 2023-06-27 16:38:46 +09:00
Dean Herbert
de23a4691e Change JudgementCountController to a Component 2023-06-27 16:38:15 +09:00
Dean Herbert
113b570bd4 Move controllers above skinnable elements in initialisation order 2023-06-27 16:37:23 +09:00
Dean Herbert
e21583ff1b Refactor InputCountController to not require being added to foreign body via Attach 
I've made the flow match `ClicksPerSecondCalculator` as close as
possible. Hopefully this reads better.
 2023-06-27 16:36:00 +09:00
Dean Herbert
c423f77d53 Add support for matching full terms using suffixed ! 2023-06-27 15:34:33 +09:00
Dean Herbert
702266198b Add missing "title=" search support at song select 2023-06-27 15:21:13 +09:00
Bartłomiej Dach
9c30b1d3e0
Merge branch 'master' into exact-match-song-select 2023-06-26 22:33:50 +02:00
Bartłomiej Dach
4cb122dad4
Escape user input before embedding into regex 2023-06-26 22:27:48 +02:00
Bartłomiej Dach
8a7a42b7ec
Remove weird nullable enable and double licence header 2023-06-26 22:19:52 +02:00
timiimit
e1cbcabe0b
Fix skip not always triggering in multiplayer 2023-06-26 21:26:41 +02:00
Bartłomiej Dach
7200855d46
Rename Judgement{Tally -> CountController} 2023-06-26 19:30:04 +02:00
Bartłomiej Dach
8d91580dc1
Rename {KeyCounter -> InputCount}Controller 2023-06-26 19:27:42 +02:00
Bartłomiej Dach
4ac48e4cd8
Group input handling members together 2023-06-26 19:25:52 +02:00
Bartłomiej Dach
ff562e2dd7
Remove redundant guard 
In this particular case guarding with `.IsNull()` makes no sense, as the
`Trigger` is supplied in constructor and cannot feasibly be null. Doing
that only makes sense in scenarios where BDL / dependency injection is
involved.
 2023-06-26 19:25:52 +02:00
Bartłomiej Dach
dbd76c1193
Fix attempting to add key counter controller to hierarchy in multiple places 2023-06-26 19:02:49 +02:00
Dean Herbert
a74547c43c Add exact match support at song select 2023-06-26 18:26:44 +09:00
Dean Herbert
14c95f4584 Apply NRT to FilterCriteria 2023-06-26 17:54:11 +09:00
Dean Herbert
44c08f3944 Add xmldoc for KeyCounterController 2023-06-26 16:47:33 +09:00
Dean Herbert
c8e081c2b6 Remove unused interface 2023-06-26 16:32:19 +09:00
Dean Herbert
ec20942830 Actuall add composite component to hierarchy 2023-06-26 16:24:36 +09:00
Dean Herbert
0c869367e1
Merge branch 'master' into hud/kc-skinnable 2023-06-26 15:53:16 +09:00
Dean Herbert
b240ce295b Rename class and key to better match expectations 2023-06-26 13:38:34 +09:00
Bastian Pedersen
a7153478d6 Use newly create localised strings for buttons 2023-06-25 21:03:07 +02:00
tsrk
350d722c8d
Merge branch 'master' into hud/kc-skinnable 2023-06-25 15:42:08 +02:00
tsrk
a7088ffe22
revert: bring back old attachment flow 
As discussed, this would bring more problems that anything.

Refs: 4c39708, f83a4f4
 2023-06-25 15:21:55 +02:00
Dean Herbert
3d1a8aeb54 Use more understandable cancel button text 2023-06-25 21:25:16 +09:00
Bartłomiej Dach
a7202721ff
Merge branch 'master' into no-confirmation-on-update-restart 2023-06-25 13:35:21 +02:00
Bartłomiej Dach
e273c223a8
Fix some more missed CI inspections 2023-06-24 17:11:38 +02:00
Bartłomiej Dach
e3a89a6273
Fix remaining obvious CI inspections 2023-06-24 16:07:01 +02:00
Dean Herbert
df5b389629 Manual fixes to reduce warnings to zero 2023-06-24 01:52:53 +09:00
Dean Herbert
0ab0c52ad5 Automated pass 2023-06-24 01:00:03 +09:00
Dean Herbert
1dc7c05c12
Merge branch 'master' into no-confirmation-on-update-restart 2023-06-23 15:33:01 +09:00
Dean Herbert
f66b787b12 Show ongoing operations in exit confirmation dialog 
Also changes the button to a dangerous button, forcing user acknowledgement
 2023-06-23 15:20:19 +09:00
Dean Herbert
693b7c9906 Reorganise resolved fields in MainMenu 2023-06-23 15:19:47 +09:00
Dean Herbert
20aedc82ac Remove unused code 2023-06-23 14:47:32 +09:00
Dean Herbert
6df617d536 Rename ExitConfirmOverlay to be more explicit about purpose 2023-06-23 14:46:38 +09:00
Dean Herbert
11a97e1bb8 Move confirmation bypass implementation to MainMenu to allow for more correct logic 2023-06-23 14:42:56 +09:00
Bartłomiej Dach
0ce4d17e30
Merge pull request #23888 from peppy/fix-intro-playing-twice 
Fix music sometimes restarting twice if exiting song select with no beatmap selected
 2023-06-22 22:49:15 +02:00
Bartłomiej Dach
a753c89dea
Merge pull request #23974 from peppy/fix-multiplayer-present-beatmap 
Fix presenting beatmaps while in a multiplayer room not working
 2023-06-22 22:48:48 +02:00
Bartłomiej Dach
65d4506ef2
Merge branch 'master' into save-replay-hotkey 2023-06-22 18:51:30 +02:00
Dean Herbert
07a00e8afd
Fix typo in comment 
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2023-06-22 00:02:02 +09:00
Dean Herbert
7b4cbea362
Allow nullable to fix test usages 
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2023-06-22 00:01:48 +09:00
Dean Herbert
59b1f08d53 Don't require exit confirmation when there are no ongoing operations that could be interrupted 2023-06-21 19:06:28 +09:00
Dean Herbert
655491ae2d Fix potential null ref in ResultsScreen 2023-06-21 17:50:06 +09:00
Dean Herbert
1907beb0c9 Add FireAndForget to stray Task.Run 2023-06-21 17:48:55 +09:00
Dean Herbert
9ca772421d Improve and combine logic that exists in two classes 2023-06-21 17:48:12 +09:00
Dean Herbert
2e02b4a85b Apply more correct fix for double-playing menu track 2023-06-20 18:35:51 +09:00
Dean Herbert
0a81170bca Merge branch 'master' into fix-intro-playing-twice 2023-06-20 18:34:22 +09:00
Dean Herbert
10ed3787a0 Don't show song select screen when local user doesn't have permission to add an item 2023-06-20 18:27:19 +09:00
Dean Herbert
dc1b4a39aa Fix presenting beatmaps while in a multiplayer room not working 2023-06-20 18:23:59 +09:00
Dean Herbert
4bd121d3b8 Also add hotkey to export replays 2023-06-20 16:54:37 +09:00
Dean Herbert
1e0e29847f Apply NRT and hotkey support to save replay button at results screen 2023-06-20 16:29:15 +09:00
Dean Herbert
69526f25bb Add hotkey to save replay 
Defaults to `F2` aka stable.
 2023-06-19 20:45:29 +09:00
Dean Herbert
84fc6e92db Fix slightly incorrect calculations 2023-06-19 20:23:46 +09:00
Dean Herbert
4314f9f46a Merge branch 'master' into fix-distance-snap-grid-centering 2023-06-19 20:22:09 +09:00
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 StatisticItems rather than StatisticRows 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