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

35333 Commits

Author SHA1 Message Date
Dean Herbert
64cf6b9014 Compare with decoupled clock directly to avoid including offsets 2022-09-09 14:35:35 +09:00
Dean Herbert
c6c59f050c
Merge pull request #20195 from cdwcgt/SkinEditorShortcut
Add arrow shortcuts to skin editor
2022-09-09 14:17:08 +09:00
Dean Herbert
20ffbc4676 Fix beat sync stopping after returning to menu from a failed play
Closes #20193.

Explanation is inline comment.
2022-09-09 14:13:03 +09:00
Dan Balasescu
08d0c08750 Fix async exception by using difficulty calculator directly 2022-09-09 13:57:01 +09:00
Dan Balasescu
ba2ef424d4 Turn score ids into ulongs 2022-09-09 11:46:06 +09:00
Dan Balasescu
3b932b46ca Fix entire TPL thread potentially being consumed during gameplay 2022-09-09 10:00:52 +09:00
Dan Balasescu
731d3f3b63 Add MaximumStatistics upgrade for databased scores 2022-09-09 09:56:08 +09:00
Dean Herbert
f1fa442287
Merge pull request #19599 from ItsShamed/kps
Add clicks/second counter to HUD
2022-09-09 01:50:12 +09:00
cdwcgt
d1e27e8a69
add arrow short cut for skin editor
basically from `ComposeBlueprintContainer` because they have the same logic
2022-09-08 23:14:34 +08:00
Dean Herbert
6945c43e0d
Merge pull request #20178 from smoogipoo/fix-match-creation-beatmap-select
Fix several weird scenarios with online play song selection
2022-09-08 23:07:09 +09:00
Dean Herbert
45239fc737 Update TrueGameplayRate accessing 2022-09-08 23:03:15 +09:00
Dean Herbert
d4afc3629c
Merge branch 'master' into kps 2022-09-08 23:00:36 +09:00
Dan Balasescu
3c8ee1a20a
Merge pull request #20179 from peppy/update-framework
Update framework
2022-09-08 22:14:16 +09:00
Dan Balasescu
9aab502adc
Merge pull request #20157 from peppy/true-gameplay-rate
Refactor `TrueGameplayRate` to account for only gameplay adjustments, no matter what
2022-09-08 19:54:32 +09:00
Dan Balasescu
4fc03998a1
Merge pull request #20189 from peppy/fix-playlist-item-download-button-visibility
Fix playlist items showing download button briefly during initial display
2022-09-08 19:47:35 +09:00
Dean Herbert
8de896a393 Update framework 2022-09-08 19:21:15 +09:00
Dean Herbert
096d1c3ff3
Merge pull request #20143 from acid-chicken/feat/stats/colored-td
Show judgement colours in hit distribution graph
2022-09-08 19:15:40 +09:00
Dean Herbert
13d9b2188b
Merge pull request #20145 from smoogipoo/multiple-countdowns
Implement support for multiple active countdowns in multiplayer
2022-09-08 19:15:30 +09:00
Dean Herbert
a98c6b2c1f Add comment metioning why we need to use DrawableRuleset lookup 2022-09-08 19:14:23 +09:00
Dean Herbert
6729bb3e1a Change FrameStableClock to inherit IGameplayClock 2022-09-08 18:24:18 +09:00
Dean Herbert
5c2fb3e434 Simplify calculation method 2022-09-08 18:22:53 +09:00
Dean Herbert
0de220c45c Change IsExclusive default value to true 2022-09-08 17:54:29 +09:00
Dean Herbert
d463bd2f3f
Merge pull request #20130 from Exanc/master
Display 0 stars instead of infinity for the minimum star slider
2022-09-08 17:51:32 +09:00
Dean Herbert
c6521e4c72 Rename ordering helper method 2022-09-08 17:50:27 +09:00
Dan Balasescu
76eae73fa4 Revert unintended change 2022-09-08 17:41:23 +09:00
Dan Balasescu
c61c596c1f Expose as readonly IAggregateAudioAdjustment 2022-09-08 17:37:02 +09:00
Dan Balasescu
b559d4ecdf Rename GameplayAdjustments -> AdjustmentsFromMods 2022-09-08 17:14:06 +09:00
Dean Herbert
ed81297611 Fix playlist items showing download button briefly during initial local presence checks 2022-09-08 17:10:45 +09:00
Dan Balasescu
b0b4da533a Expose gameplay adjustments via MultiSpectatorPlayer instead 2022-09-08 16:59:20 +09:00
Dean Herbert
d523a2ac33 Rename default value field and make private 2022-09-08 15:53:08 +09:00
Dean Herbert
9ead5e59d3 Fix incorrectly displaying minimum value in placeholder messaging 2022-09-08 15:51:15 +09:00
Dean Herbert
3b116a1a47 Fix mods not being set on BeginPlayingInternal 2022-09-08 13:17:27 +09:00
Salman Ahmed
50923b6e5b Move track assignment below 2022-09-08 00:25:55 +03:00
Dean Herbert
68ea5a765f Update framework 2022-09-07 23:56:45 +09:00
Acid Chicken (硫酸鶏)
267465df18
chore(osu.Game): combine Osu.Colour.{Draw,Text}ForHitResult into OsuColour.ForHitResult 2022-09-07 23:34:46 +09:00
Acid Chicken (硫酸鶏)
54f0bb797e
refactor(osu.Game): remove nullable optouts in HitResult.cs 2022-09-07 23:32:45 +09:00
Acid Chicken (硫酸鶏)
b560b6f745
refactor(osu.Game): arrange the code for the timing distribution graph 2022-09-07 23:29:10 +09:00
Dan Balasescu
83c0cb1acc Fix beatmap set to null after exiting song select 2022-09-07 21:34:29 +09:00
Dan Balasescu
fcea244537 Remove initial selection from OnlinePlaySongSelect
This stuff never really worked anyway - every case except with an
already created multiplayer room was broken anyway.
2022-09-07 21:34:29 +09:00
Dan Balasescu
208bd0f391 Give OnlinePlaySongSelect a reference PlaylistItem 2022-09-07 21:34:29 +09:00
Dean Herbert
6a03b4e0de
Merge branch 'master' into true-gameplay-rate 2022-09-07 20:01:03 +09:00
Dean Herbert
770c1ade2f Add test coverage of track rate adjusting during multi spectator 2022-09-07 20:00:24 +09:00
Dan Balasescu
cb9bae1f5c Enable NRT 2022-09-07 19:54:55 +09:00
Dean Herbert
e6b449fe0b Fix case of zero rate calculating a zero true gameplay rate 2022-09-07 19:23:44 +09:00
Dean Herbert
1be3b74ff3 Fix multiplayer spectator not getting gameplay adjustments applied 2022-09-07 19:12:34 +09:00
Dean Herbert
fa15502384 Move full track adjustment flow inside MasterGameplayClockContainer 2022-09-07 19:12:16 +09:00
Dean Herbert
75d0deef72 Apply proposed changes to remove inheritance from MasterGameplayClockContainer 2022-09-07 17:49:05 +09:00
Dan Balasescu
f8e37af2e0
Merge pull request #20171 from peppy/beatmap-carousel-nrt
Fix missing null checks on `selectedBeatmap` fields in `BeatmapCarousel`
2022-09-07 17:15:00 +09:00
Dean Herbert
68c27522e7
Merge pull request #20158 from smoogipoo/taiko-geki-katu
Decode taiko Geki/Katu from legacy scores into `LargeBonus`
2022-09-07 17:06:42 +09:00
Dean Herbert
99ef0c95fe Simplify children assignment 2022-09-07 16:51:51 +09:00
Dean Herbert
5b758afd09
Merge branch 'master' into taiko-geki-katu 2022-09-07 16:22:47 +09:00
Dean Herbert
824e68dab3 Fix VectorScale set to 0 still showing some sprites in storyboard
This implementation was matching the [framework side implementation of
scale](16d1c2d335/osu.Framework/Graphics/Drawable.cs (L973-L976))
but I don't think it's required here.

I'm still not sure if the framework implementation is correct, but
removing it locally does seem to fix broken storyboard cases.

Closes https://github.com/ppy/osu/issues/20155.
2022-09-07 15:39:19 +09:00
Dan Balasescu
dc71abdf56
Merge pull request #20144 from peppy/fix-notification-overlay-presence
Fix completion toasts sometimes not displaying
2022-09-07 14:55:33 +09:00
Dean Herbert
f3bda4e040 Fix weird edge case of nullability in CarouselRoot
A bit unfortunately, but it's what we get for having ctor level bindings..
2022-09-07 14:27:25 +09:00
Dean Herbert
e18b524f8e Fix missing null checks on selectedBeatmap fields in BeatmapCarousel 2022-09-07 14:12:35 +09:00
Dean Herbert
241d33d415 Apply NRT to BeatmapCarousel 2022-09-07 14:07:53 +09:00
Jamie Taylor
cb1d886c9c
Add audio feedback for Esc/Back clearing text from a FocusedTextBox 2022-09-07 13:17:04 +09:00
Acid Chicken (硫酸鶏)
3003fc1061
refactor(osu.Game): improve code quality 2022-09-07 02:29:15 +09:00
Salman Ahmed
90207b6032
Merge branch 'master' into feature/EditorDeleteDiff 2022-09-06 18:48:06 +03:00
Dan Balasescu
7c0e99c5a8 Decode Geki/Katu from legacy taiko scores into LargeBonus 2022-09-07 00:12:34 +09:00
Dean Herbert
66c44f5913 Delegate interface to valid target 2022-09-06 22:26:46 +09:00
Dean Herbert
bc1212f4e6 Change NonGameplayAdjustments to GameplayAdjustments and convert TrueGameplayRate to extension method 2022-09-06 22:26:46 +09:00
Dean Herbert
db15bd56e8 Invalidate working beatmap cache when calling DeleteDifficultyImmediately rather than in editor code 2022-09-06 18:12:47 +09:00
Dean Herbert
579e7e1f17 Fix deleting a difficulty not updating the beatmap set hash 2022-09-06 18:12:47 +09:00
Dean Herbert
a3de5f808e Fix typo in LoopStartTime addition 2022-09-06 17:46:03 +09:00
Dean Herbert
6e52dbb266 Update IsDisplayingToasts to check the flow count directly 2022-09-06 17:30:24 +09:00
Dean Herbert
677708c5e4 Rewrite logic using a list 2022-09-06 16:58:51 +09:00
Dean Herbert
d667f46830 Refactor alpha check to not overwrite sourced overrides with values from later commands 2022-09-06 16:41:32 +09:00
Dean Herbert
bea42d2862 Handle earliest-alpha-start-time logic in StoryboardSprite itself 2022-09-06 16:16:58 +09:00
Dean Herbert
a5e57b083c Remove EarliestDisplayTime's input to CommandStartTime 2022-09-06 16:16:58 +09:00
Dean Herbert
9e3228aa65 Fix completion notification not being posted if completion occurs during NotificationOverlay load 2022-09-06 04:07:49 +09:00
Acid Chicken (硫酸鶏)
b109e5de6c
chore(osu.Game): align height of bars on timing distribution graph to basalHeight first and combine their transitions into each one 2022-09-06 00:04:10 +09:00
Dean Herbert
44b456e216 Use gameplay clock's TrueGameplayRate in FrameStabilityContainer? 2022-09-05 23:38:22 +09:00
Dean Herbert
266eb758aa Use new flow to calcaulate TrueGameplayRate 2022-09-05 23:37:49 +09:00
Dean Herbert
7084aeee05 Add method flow to reset applied adjustments 2022-09-05 23:22:38 +09:00
Dean Herbert
e33486a766 Implement IAdjustableAudioComponent in MasterGameplayClockContainer 2022-09-05 23:20:02 +09:00
Dean Herbert
6296c971f8
Merge pull request #20136 from smoogipoo/fix-cancellation-perf
Improve performance when cancelling import with debugger attached
2022-09-05 22:03:50 +09:00
Dan Balasescu
b2f30fbf8c Add countdown exclusivity 2022-09-05 20:13:23 +09:00
Dean Herbert
510972e3ad Avoid reference counting by using height calculation for IsPresent instead
The reference counting was to guarantee performance (zero allocations)
when the notification overlay was not required, but adds extra
complexity.

Instead, the toast tray now uses its ongoing height calculation as a
metric for presence.
2022-09-05 19:38:09 +09:00
Dean Herbert
0514c96191 Fix incorrect count tracking when notification is manually disposed 2022-09-05 19:26:40 +09:00
Dean Herbert
229e1a8ef7 Fix notification overlay being present when it doesn't need to 2022-09-05 19:13:58 +09:00
Dean Herbert
f754686521 Remove necessity of AlwaysPresent for ProgressUpdate completion posting 2022-09-05 19:13:58 +09:00
Dan Balasescu
2923c10cd8 Rewrite rooms to store multiple active countdowns
Update test to the new structure
2022-09-05 19:03:26 +09:00
Dean Herbert
0d4ee6bd80 Centralise ability to fetch all toast tray notifications (including animating ones) 2022-09-05 18:42:20 +09:00
Dean Herbert
eca7b8f988 Fix completion notifications not always showing as toasts 2022-09-05 18:39:11 +09:00
Dean Herbert
4fa6707bf0 Set all progress notifications to non-important 2022-09-05 18:29:35 +09:00
Dan Balasescu
87e26e34b8
Merge pull request #20141 from peppy/fix-editor-timeline-sv-display
Fix incorrect slider length in timeline when non-default velocity is inherited from previous object
2022-09-05 17:51:25 +09:00
Dean Herbert
2bec8b82b3 Fix textbox sample playback potentially crashing if called before load 2022-09-05 16:26:41 +09:00
Dean Herbert
57954bb8f5 Enable nullability on TimelineHitObjectBlueprint 2022-09-05 14:50:43 +09:00
Dan Balasescu
8cbd344330 Improve performance when cancelling import with debugger attached 2022-09-05 11:28:13 +09:00
Dan Balasescu
07d4a025b0
Merge pull request #20109 from frenzibyte/online-play-room-status-inconsistency
Fix room status dropdown placement inconsistent between multiplayer and playlists
2022-09-05 11:19:56 +09:00
Exanc
4ea7ca4c07 Slight tweak to the StarsSlider
- MinimumStarsSlider now shows "0" when at it's minimum
 - Modified and NoResultsPlaceholder the tooltip to stay consistent with the changes
2022-09-05 00:09:20 +02:00
Acid Chicken (硫酸鶏)
7e77c9e8b4
chore(osu.Game): only the first result should be white at zero position on HitEventTimingDistributionGraph 2022-09-05 04:44:27 +09:00
Acid Chicken (硫酸鶏)
b67fd3d880
chore(osu.Game): split transform duration of bars on HitTimingDistributionGraph 2022-09-05 03:45:51 +09:00
Acid Chicken (硫酸鶏)
0af6b3dc0f
chore(osu.Game): colorize bars by OD on HitEventTimingDistributionGraph 2022-09-05 02:02:38 +09:00
Acid Chicken (硫酸鶏)
074d2a7a3a
chore(osu.Game): provide ordering index for HitResult 2022-09-05 02:01:44 +09:00
Acid Chicken (硫酸鶏)
5f0832ead7
refactor(osu.Game): separate OsuColour.ForHitResult by usage 2022-09-05 01:58:57 +09:00
Salman Ahmed
ff4a051c05
Merge branch 'master' into remove-dispose-updates 2022-09-03 16:14:50 +03:00
Salman Ahmed
e8fa872f61 Fix room status dropdown position inconsistent on online-play screens 2022-09-03 16:14:21 +03:00
Salman Ahmed
778d767a12 Revert disposal on SectionsContainer properties 2022-09-03 15:02:57 +03:00
Dean Herbert
bc5340e33a
Merge branch 'master' into fix_progress_bar_info 2022-09-02 18:00:35 +09:00
Dean Herbert
4f18105e9d Ensure next beatmap selected matches the menu ordering 2022-09-02 17:57:00 +09:00
HiddenNode
7a8fa5c2e4 Fix filenames mismatch 2022-09-02 09:56:00 +01:00
Dean Herbert
840d1c4cd5 Disable delete difficulty menu item when only one difficulty is present 2022-09-02 17:14:48 +09:00
Dean Herbert
9fd8067e11 Tidy up dialog and deletion flow 2022-09-02 17:07:09 +09:00
Dean Herbert
605108c938 Refactor/rename deletion method to read better 2022-09-02 16:59:01 +09:00
Dean Herbert
b388428e1c
Merge branch 'master' into feature/EditorDeleteDiff 2022-09-02 16:48:38 +09:00
Dan Balasescu
b10026993a Don't serialise has_replay 2022-09-02 16:41:53 +09:00
Dean Herbert
8c50ccc48e Fix incorrect specification in SectionsContainer 2022-09-02 16:37:39 +09:00
Dean Herbert
d80151756c
Merge pull request #20070 from smoogipoo/replay-and-legacy-id
Add `has_replay` and `legacy_score_id` to `SoloScoreInfo`
2022-09-02 14:55:29 +09:00
Dean Herbert
23d5e8b286 Fix beat sync components stopping after beatmap change
Not an amazing fix, but it seems to work and would rather get this in
ASAP rather than trying to fix at a framework level.

Closes #20059.
2022-09-01 23:46:02 +09:00
Dean Herbert
7eaa4c5ccd Update new usages of Remove / RemoveInternal 2022-09-01 23:05:34 +09:00
Dean Herbert
c9dec473d3 Update virtual track logic to match framework changes 2022-09-01 23:05:07 +09:00
Dean Herbert
22c18d9a81 Update framework 2022-09-01 23:03:28 +09:00
Dean Herbert
6a35b233e5 Merge branch 'master' into remove-dispose-updates 2022-09-01 23:03:19 +09:00
Dan Balasescu
e1e46ad7aa
Merge pull request #20073 from peppy/fix-tournament-lookup
Fix tournament population failure when beatmap is not found on server
2022-09-01 22:44:53 +09:00
Dan Balasescu
8b2652702a
Merge pull request #20072 from peppy/fix-seasonal-background-sticking
Fix seasonal background not being unloaded when changing setting to "Never"
2022-09-01 22:44:43 +09:00
Dean Herbert
d3ae60ec6d Fix tournament population failure when beatmap is not found on server 2022-09-01 22:03:01 +09:00
Dean Herbert
8866250cff Fix seasonal background not being unloaded when changing setting to "Never"
Closes #20065.
2022-09-01 21:42:40 +09:00
Dan Balasescu
a277431266 Add has_replay and legacy_score_id to SoloScoreInfo 2022-09-01 21:10:38 +09:00
Dean Herbert
1524623624 Fix back-to-front filter logic
Was copied across from a place which was checking for `match` and
applied verbatim to a place that was `filter`. Which are polar
opposites.
2022-09-01 19:59:27 +09:00
Dean Herbert
db9970b72a
Merge pull request #20047 from smoogipoo/multiplayer-auto-skip
Add auto skip for multiplayer rooms
2022-09-01 18:47:47 +09:00
Dan Balasescu
d70208fcf1 Default to off 2022-09-01 14:14:22 +09:00
HiddenNode
4a630b5384 Implemented SizePreservingSpriteText 2022-08-31 22:05:06 +01:00
HiddenNode
eb02a9a144 Removed GrowToFItContainer 2022-08-31 22:04:28 +01:00
Dean Herbert
b83ce97d8b
Merge branch 'master' into textbox-invalid-sfx 2022-08-31 22:14:59 +09:00
Dean Herbert
50e8052f07 Update resources 2022-08-31 22:08:20 +09:00
Dan Balasescu
c852c54055 Consume auto skip setting during play 2022-08-31 20:24:15 +09:00
Dan Balasescu
b5ec7d06dd Add auto-skip setting
Default to auto skip
2022-08-31 20:24:06 +09:00
Dan Balasescu
837b19ab24
Merge pull request #19919 from khang06/nan-sv
Emulate osu!stable's NaN slider velocity behavior
2022-08-31 19:06:49 +09:00
Jamie Taylor
212d76a11f
Add audio feedback for invalid textbox input 2022-08-31 17:31:36 +09:00
Jamie Taylor
cc9dc604a0
Refactor feedback sample playback logic 2022-08-31 17:29:57 +09:00
Dan Balasescu
6cadcc206b
Merge pull request #20032 from peppy/toast-notification-tray
Add toast notification tray
2022-08-31 16:57:37 +09:00
Dan Balasescu
000412c50f
Merge pull request #20014 from peppy/fix-resume-skip-forward
Fix gameplay skipping forward during resume operation
2022-08-31 16:30:37 +09:00
Dan Balasescu
afe2862df4
Merge branch 'master' into toast-notification-tray 2022-08-31 16:07:11 +09:00
Dan Balasescu
ccc08b816c
Merge pull request #20030 from peppy/notification-design-update
Update notification overlay design
2022-08-31 16:06:59 +09:00
Dean Herbert
7337d4c1aa Merge branch 'master' into kps 2022-08-31 15:41:42 +09:00
Dan Balasescu
2bf74d2b38
Merge pull request #20039 from peppy/fix-skip-button-permanent-display
Fix skip button getting stuck on screen for certain beatmaps
2022-08-31 14:17:39 +09:00
Dean Herbert
cfc7c32aff
Merge pull request #20009 from frenzibyte/fix-back-to-front-comparison
Adjust weirdly back-to-front fallback comparison in `HitObjectOrderedSelectionContainer`
2022-08-31 14:14:10 +09:00
Dean Herbert
51346e0154 Fix skip button getting stuck on screen for certain beatmaps
Closes #20034.
2022-08-31 13:22:51 +09:00
Dan Balasescu
1908a2e394
Merge pull request #20025 from peppy/fix-results-sample-glitching
Fix audio glitching when showing results screen with many scores
2022-08-31 13:10:08 +09:00
Dan Balasescu
cb4fd08f27
Merge pull request #20031 from peppy/fix-replay-file-missing-crash
Fix crash when attempting to watch a replay when the storage file doesn't exist
2022-08-31 13:06:45 +09:00
Dean Herbert
8b9ccc66b7 Update ProgressNotification font spec to match other notifications 2022-08-31 12:49:28 +09:00
Dean Herbert
85442fe032 Adjust dismiss button background colour to avoid conflict with background 2022-08-31 12:48:30 +09:00
Dean Herbert
7c72c6b43f Fix unread count potentially missing notifications in a transforming state 2022-08-31 12:46:43 +09:00
Dean Herbert
0558dae917 Mark toasts as read when closing the overlay for added safety
I'm not sure how the read status will play out going forward so I'm just
adding this to keep things conforming for now.
2022-08-31 12:46:04 +09:00
Dean Herbert
3d93e0ded1
Merge branch 'master' into fix-resume-skip-forward 2022-08-31 12:16:15 +09:00
Dean Herbert
9eb615f942 Fix remaining test failures by strengthening PlayerLoader tests
- Click using `TriggerClick` as notifications move around quite a bit.
- Ensure any notifications from a previous test method are cleaned up.
2022-08-31 01:40:30 +09:00
Dean Herbert
31a9980686 Update remaining test expectations with new behaviour 2022-08-31 00:57:30 +09:00
Dean Herbert
a62ba9e0d9 Remove notification blocking behaviour of first run setup 2022-08-31 00:57:18 +09:00