1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:07:44 +08:00
Commit Graph

39115 Commits

Author SHA1 Message Date
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
Dan Balasescu
0c5c09597c Store old total score as LegacyTotalScore 2023-06-27 14:59:40 +09:00
Bartłomiej Dach
40ceb4dfac
Fix incorrect indent size 2023-06-26 22:40:25 +02: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
Bartłomiej Dach
cc45ec4fff
Mark IHasRecordingHandler.Recorder nullable 2023-06-26 18:52:05 +02:00
Dan Balasescu
a9c65d200a Initial conversion of scores 2023-06-26 22:19:01 +09:00
Dan Balasescu
8e79510793 Add migration for total score conversion 2023-06-26 21:53:21 +09: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
084354a8dc Split out interfaces from RulesetInputManager and improve xmldoc 2023-06-26 16:34:57 +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
3a2dd0e7dd Move argon key counter to right to match stable expectations 2023-06-26 16:22:38 +09:00
Dean Herbert
52fdeeb491 Improve positioning and positioning code clarity for argon / triangles implementations 2023-06-26 16:20:51 +09:00
Dean Herbert
ba7f472247 Split padding out into constant to fix weird looking math 2023-06-26 16:05:57 +09:00
Dean Herbert
0c869367e1
Merge branch 'master' into hud/kc-skinnable 2023-06-26 15:53:16 +09:00
Dan Balasescu
e1d723a2cc Merge branch 'master' into diffcalc-total-scorev1 2023-06-26 14:32:14 +09:00
Bastian Pedersen
506829d9a5
Merge branch 'master' into localise-multiplayer-countdown-buttons 2023-06-26 07:28:05 +02:00
Dean Herbert
b240ce295b Rename class and key to better match expectations 2023-06-26 13:38:34 +09:00
Dean Herbert
1abce098b4 Apply nullability to login form related classes 2023-06-26 13:26:07 +09:00
Dean Herbert
372cef3c0a Merge branch 'master' into ui-login-spacing-fix 2023-06-26 13:24:26 +09:00
Dean Herbert
ac0c988d49 Fix weirdly named test method and add xmldoc 2023-06-26 13:21:29 +09:00
Dean Herbert
8d2dccbda5 Remove pointless zero opacity specification 2023-06-26 13:19:07 +09:00
Dean Herbert
55ab27c5b6
Merge pull request #24022 from frenzibyte/fix-open-user-profile-argument
Fix `OpenUserProfile` links having multiple argument types
2023-06-26 13:13:05 +09:00
Joseph Madamba
5477ef6bfb
Remove unused usings 2023-06-25 12:58:51 -07:00
Joseph Madamba
ccc4d16096
Remove most custom styling of user dropdown 2023-06-25 12:46:00 -07:00
Joseph Madamba
6ebc2581c2
Normalise login overlay padding/spacing 2023-06-25 12:26:01 -07:00
Joseph Madamba
671f84e32b
Remove unnecessary container 2023-06-25 12:15:03 -07:00
Joseph Madamba
4582faee79
Refactor login panel to not inherit FillFlowContainer 2023-06-25 12:06:02 -07:00
Bastian Pedersen
a7153478d6 Use newly create localised strings for buttons 2023-06-25 21:03:07 +02:00
Bastian Pedersen
59fa46bbdd Create localisation string class for multiplayer countdown buttons 2023-06-25 21:02:51 +02:00
Joseph Madamba
4a3b8c405e
Fix login error text adding unnecessary spacing 2023-06-25 11:57:17 -07:00
Joseph Madamba
442fda3598
Remove using aliases 2023-06-25 11:39:33 -07:00
Joseph Madamba
1058f434d7
Update login overlay background to conform to other overlays 2023-06-25 11:39:32 -07:00
Joseph Madamba
25c9bf4061
Improve and refactor LoginPanel test scene to use LoginOverlay 2023-06-25 11:39:32 -07:00
Joseph Madamba
f87ac3f405
Merge remote-tracking branch 'upstream/master' into pr/23331 2023-06-25 10:01:32 -07: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
Bartłomiej Dach
4215ca313f
Add missing using 2023-06-25 14:36:21 +02:00
Dean Herbert
3d1a8aeb54 Use more understandable cancel button text 2023-06-25 21:25:16 +09:00
Dean Herbert
95e8dd2e8e
Don't attempt to access notifications before loaded
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-06-25 21:25:07 +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
25842105ce
Merge pull request #23976 from peppy/gameplay-sample-trigger-source-correctness
Adjust `GameplaySampleTriggerSource` to only switch samples when close enough to the next hit object
2023-06-25 08:23:55 +02:00
Dean Herbert
922fe927ac Update resources 2023-06-25 15:18:56 +09:00
Dean Herbert
5806153cfd Update framework 2023-06-25 12:00:14 +09:00
Bartłomiej Dach
d7ae430ec2
Merge branch 'master' into framework-update 2023-06-24 18:47:52 +02:00
Dean Herbert
ca402c4d2f Update framework 2023-06-25 00:38:19 +09:00
Salman Ahmed
9a5f033a0f Change OpenUserProfile argument type to always use IUser 2023-06-24 18:12:35 +03:00
Bartłomiej Dach
e273c223a8
Fix some more missed CI inspections 2023-06-24 17:11:38 +02:00
Bartłomiej Dach
df2dcf85b4
Fix wrong disable 2023-06-24 17:07:42 +02:00
Bartłomiej Dach
e3a89a6273
Fix remaining obvious CI inspections 2023-06-24 16:07:01 +02:00
Bartłomiej Dach
2c1a44da89
Revert nullability enable in BeatmapBackground
Due to varying expectations in handling of `Beatmap`. Some places allow
or expect null and some don't. Needs to be looked at closer separately.
2023-06-24 15:40:06 +02:00
Bartłomiej Dach
66ef199fa4
Revert nullability enable in Score (and related changes)
Causes several knock-on inspections in `OsuGame` et al. Probably best
addressed in a separate pass, because treatment is mixed at best (some
places nullcheck, some expect non-null).
2023-06-24 15:35:07 +02:00
Bartłomiej Dach
8fdd599b39
Match field NRT annotation in ctor argument 2023-06-24 15:17:14 +02:00
Bartłomiej Dach
1f2f522a1e
Mark override as null-accepting
`ModelBackedDrawable<T>.CreateDrawable()` is R#-annotated to accept
a potentially null model. Apply nullability there too for better reading
experience.
2023-06-24 15:07:04 +02:00
Bartłomiej Dach
354e85a2e1
Trim redundant BDL nullability spec 2023-06-24 14:35:23 +02:00
Dean Herbert
2bda63c2c8 Merge branch 'master' into mass-nrt 2023-06-24 09:59:15 +09:00
Dean Herbert
58e6b3782b Fix a couple of remaining issues 2023-06-24 09:58:36 +09:00
Bartłomiej Dach
23aa1752c3
Merge pull request #24009 from peppy/fix-touch-input-controls-floating-fruits
Change "floating fruits" mod to only apply adjustments to the playfield
2023-06-23 23:26:20 +02:00
Salman Ahmed
ff17685bc3 Fix OpenUserProfile links having multiple argument types 2023-06-23 22:38:16 +03:00
Salman Ahmed
c5771912db
Merge branch 'master' into tournament-chatcolor 2023-06-23 22:23:33 +03:00
Salman Ahmed
7a771609f9 Reword and fix typo 2023-06-23 22:20:25 +03:00
Dan Balasescu
5fadadc3d0 Merge branch 'master' into diffcalc-total-scorev1 2023-06-24 02:46:15 +09:00
Dean Herbert
df5b389629 Manual fixes to reduce warnings to zero 2023-06-24 01:52:53 +09:00
Dan Balasescu
06565871d6 Add flag to disable computing legacy scoring values 2023-06-24 01:03:18 +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
7fa07805b0 Expose all notifications from INotificationOverlay
Also fixes `HasOngoingOperations` not actually working.
2023-06-23 15:19:21 +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
Dean Herbert
08b3c0cce0 Change "floating fruits" mod to only apply adjustments to the playfield
Avoids things like touch screen inputs also being flipped.

Note that these adjustments can't be applied directly to the playfield
due to how playfields are used in various rulesets (basically relying on
the `PlayfieldAdjustContainer` to get things in the right place).

Closes #24000.
2023-06-23 14:18:43 +09:00
Dean Herbert
343271751a Add Schedule to ensure correct thread for UI code 2023-06-23 14:07:33 +09:00
Dean Herbert
ce1579f2fe Bind to API.State instead of API.User 2023-06-23 14:05:02 +09:00
Dean Herbert
64b726d5ec Fix nested logic not being completely correct (favouring already-passed rather than near-future) 2023-06-23 13:48:13 +09:00
Bartłomiej Dach
c06b825d9b
Merge branch 'master' into comment-logged-out 2023-06-22 23:19:00 +02:00
Bartłomiej Dach
1672608a87
Document why things were done in DummyAPIAccess 2023-06-22 23:08:30 +02:00
Bartłomiej Dach
786deec296
Rename and xmldoc members 2023-06-22 23:00:52 +02: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
Liam DeVoe
21bed336c6 adjust DummyAPIAccess to more closely match APIAccess
wrt logging in and out
2023-06-22 16:01:12 -04:00
Bartłomiej Dach
a11b3a67fb
Merge branch 'master' into skin-editor-beatmap-skin-disable 2023-06-22 20:30:51 +02:00
Bartłomiej Dach
aea5eb37dc
Remove unused using directive 2023-06-22 20:24:44 +02:00
Bartłomiej Dach
79606317ab
Remove redundant parentheses 2023-06-22 20:02:10 +02:00
Bartłomiej Dach
65d4506ef2
Merge branch 'master' into save-replay-hotkey 2023-06-22 18:51:30 +02:00
Bartłomiej Dach
28dc5640a3
Merge pull request #23972 from peppy/notifications-during-pause
Allow notifications while the game is paused (or in break time)
2023-06-22 18:31:39 +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
c3f772f0da Add method to queue a restart after app is exited (when supported) 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
4ff5275208 Make IGameplayClock optional in GameplaySampleTriggerSource to ease testing 2023-06-21 17:33:42 +09:00
Dean Herbert
cb0f642ad7 Change skin editor flow to always save on toggle
This also moves the beatmap skin disable toggle to on toggle, in line
with review feedback.

I've decided to always apply the disable, not just on the `Player`
screen. It should be assumed that if a user is in the skin editor they
are never going to need access to this anyway.
2023-06-21 16:14:47 +09:00
Dean Herbert
366dd96875 Use bindable lease instead of reimplementing the same thing locally 2023-06-21 16:09:54 +09:00
Liam DeVoe
cc764afe3e use two separate buttons for posting / login 2023-06-21 00:58:43 -04:00
Liam DeVoe
8460873e61 move commitButton.Text update to appropriate method 2023-06-21 00:37:54 -04:00
Dean Herbert
cb07f2399f Apply NRT to GameplaySampleTriggerSource 2023-06-20 21:03:55 +09:00
Dean Herbert
04dad6c6e8 Use IGameplayClock to ensure our clock source is correct 2023-06-20 20:47:56 +09:00
Dean Herbert
0e86102681 Fix nested lookups 2023-06-20 20:45:02 +09:00
Dean Herbert
786d5a394b Add back optimisation and increase time allowance slightly 2023-06-20 20:30:07 +09:00
Dean Herbert
555ce7684b Adjust GameplaySampleTriggerSource to only switch samples when close enough to the next hit object
Closes #23963.

To simplify things, I've removed the optimisation of using
`AliveObject`s because it would break the way this whole lookup works.
2023-06-20 20:06:07 +09:00
Dean Herbert
d7b486e2ac Disable beatmap skinning when entering the skin editor 2023-06-20 19:18:17 +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
ff8350bac6 Update framework 2023-06-20 17:43:52 +09:00
Dean Herbert
7b69b92eab Allow notifications while the game is paused (or in break time)
RFC. This is to allow notifications to show at the pause screen
(specifically for #23967, where exports are now happening).

Not sure about the break time part of this, but might be fine? The
toasts are immediately flushed before break time ends.
2023-06-20 16:57:35 +09:00
Dean Herbert
4bd121d3b8 Also add hotkey to export replays 2023-06-20 16:54:37 +09:00
Dean Herbert
7c5813c05a Fix OsuAnimatedButton not flashing when triggered via code 2023-06-20 16:34:22 +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
Liam DeVoe
60eedbafd1 rename GetTextBoxPlaceholder to GetPlaceholderText 2023-06-19 22:05:18 -04:00
Liam DeVoe
f7dde53f9b use runOnceImmediately instead of duplicating logic 2023-06-19 18:20:16 -04:00
Liam DeVoe
591277e0f9 extract button text properties to methods, show login overlay on click 2023-06-19 18:10:37 -04:00
Liam DeVoe
d5d494f07b resolve protected API in comments superclass 2023-06-19 17:36:40 -04:00
Liam DeVoe
4a9543092a disable posting comments when logged out 2023-06-19 17:08:04 -04:00
Bartłomiej Dach
c467e6ba1f
Merge pull request #23969 from Joehuu/fix-beatmap-info-bpm
Fix beatmap info not showing individual difficulty bpm
2023-06-19 22:57:17 +02:00
Joseph Madamba
362fe62b4b
Fix beatmap info not showing individual difficulty bpm 2023-06-19 11:05:29 -07:00
Bartłomiej Dach
ecc5915ab3
Merge branch 'master' into fix-distance-snap-grid-centering 2023-06-19 18:45:06 +02:00
Dan Balasescu
bfa449e47a Adjust attribute data 2023-06-19 21:38:13 +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
Dean Herbert
aa96fefae2 Merge branch 'master' into snap-colour-mod 2023-06-19 20:01:36 +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
Bartłomiej Dach
ee08ed414c
Document DrawableChatUsername members 2023-06-18 18:46:49 +02:00
Bartłomiej Dach
a2a9823d84
Rename constant 2023-06-18 18:46:49 +02:00
Bartłomiej Dach
dad32817ee
Improve UsernameColour documentation 2023-06-18 18:46:49 +02:00
Bartłomiej Dach
bd174b5193
Revert to non-bindable AccentColour
Not necessary for now, so let's not incur unnecessary overheads.
2023-06-18 18:46:49 +02:00
Ruki
9c6c6bf1ea
Merge branch 'master' into hud/kc-skinnable 2023-06-18 18:30:44 +02: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