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

37333 Commits

Author SHA1 Message Date
Bartłomiej Dach
9e4e85e3e3
Inline StopSample() into StopSampleAndRemoveFilters()
The first method no longer has any callers except for the second one.
2023-01-22 09:26:01 +01:00
Bartłomiej Dach
0edfd24410
Remove unnecessary sample stop in Restart()
It is unnecessary, as a successful restart will exit the current player
screen, and `OnExiting()` has another `StopSampleAndRemoveFilters()`
call, which means that in the restart flow the sample was actually
getting stopped twice.

Standard exit flow is fine, it only stopped the sample once.
2023-01-22 09:24:12 +01:00
Bartłomiej Dach
88d58e8476
Merge pull request #22337 from Joehuu/fix-comment-editor-sounds
Fix comment editor text boxes not having sound feedback
2023-01-22 09:10:20 +01:00
Bartłomiej Dach
b66279c5d7
Merge pull request #22341 from peppy/screen-scaling-keywords
Add search keywords for screen scaling sub-settings
2023-01-22 08:56:14 +01:00
Matheus Filipe dos Santos Reinert
db0b69db6b
Merge branch 'master' into fix-fail-sample-playing-after-leaving-dialog 2023-01-22 02:12:07 -03:00
Dean Herbert
7040743249 Add search keywords for screen scaling sub-settings 2023-01-22 13:47:31 +09:00
Matheus Filipe dos Santos Reinert
5b1a23c697 Replace RemoveFilters call with StopSampleAndRemoveFilters 2023-01-22 01:44:16 -03:00
Matheus Filipe dos Santos Reinert
2e1ba6ef49 Create StopSampleAndRemoveFilters method and change RemoveFilters to private 2023-01-22 01:43:40 -03:00
EXtremeExploit
2f3971b6fb
Move code to already existing if block 2023-01-22 01:40:00 -03:00
EXtremeExploit
8c208da324
Cleanup 2023-01-22 01:39:01 -03:00
EXtremeExploit
05f77d2cab
Add modes text to groups tooltip 2023-01-22 01:36:53 -03:00
Matheus Filipe dos Santos Reinert
a746cbc6ed Fix failSample still playing after player left FailOverlay 2023-01-22 01:14:33 -03:00
Joseph Madamba
da03abc812 Fix comment editor text boxes not having sound feedback 2023-01-21 17:32:42 -08:00
naoey
1c1c9915bb
Split saving new and existing beatmaps into separate flows 2023-01-22 10:27:33 +09:00
Bartłomiej Dach
718cbf9382
Fix SegmentedGraph draw node calculating segment colours in unsafe manner
The `SegmentedGraph`'s draw node would call `getSegmentColour()`
on the drawable, which would query the `DrawColourInfo` and
`tierColours` properties of the drawable. This is a cross-thread access
and as such completely unsafe, as due to being cross-thread it can die
on invalidations or out-of-bounds accesses.

Fix by transferring everything to the draw node first before attempting
to draw. `SegmentedGraph.TierColours` setter already correctly
invalidates the draw node via `graphNeedsUpdate`, so no further
intervention was required there.

Closes #22326.
2023-01-21 23:19:34 +01:00
naoey
a1b5c9d910
Don't transfer MD5 hashes in collections when copying beatmaps
Fixes #22306.

Changes beatmap saving so that by default it does not transfer
the hashes in collections, and only transfers them when saving the same
difficulty in the editor.

Issue seems to have been introduced in https://github.com/ppy/osu/pull/20641.
2023-01-22 01:14:18 +09:00
Salman Ahmed
c48af79588 Fix test browsers on longer working after framework update 2023-01-21 14:49:47 +03:00
Dean Herbert
19450bfe12 Update framework 2023-01-20 23:23:25 +09:00
Dean Herbert
2ce32e3209 Refactor update logic to be easier to follow 2023-01-19 19:27:05 +09:00
mk56-spn
b22363ed8c Fix JudgementCounterDisplay.cs max judgement always showing upon changing display mode 2023-01-19 10:31:02 +01:00
Dean Herbert
4916a742d5 Immediately focus the textbox when clicking to reply to a comment 2023-01-19 16:08:27 +09:00
Dean Herbert
81e6c3792c Remove unused method 2023-01-19 16:03:46 +09:00
Dean Herbert
56ce8504ae Merge branch 'master' into comment-reply 2023-01-19 16:01:47 +09:00
Dean Herbert
07af18b8a7 Remove ReplyCommentEditor into its own class 2023-01-19 16:01:37 +09:00
Dean Herbert
db8084570d
Merge pull request #22285 from bdach/segmented-graph-tint
Apply draw colour to segmented graph
2023-01-19 13:36:19 +09:00
Dean Herbert
e58abf7d1a
Merge pull request #22284 from bdach/judgement-counter-broken
Fix "show max judgement" setting not applying initially on judgement counter display
2023-01-19 09:09:06 +09:00
Bartłomiej Dach
a0fe71c706
Use alternative segment colour computation method 2023-01-19 00:08:32 +01:00
Bartłomiej Dach
b62ff8d644
Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-18 23:52:12 +01:00
Bartłomiej Dach
b8b7442eb8
Make SongProgressInfo.ShowProgress init-only (and remove duplicate init) 2023-01-18 23:35:40 +01:00
Bartłomiej Dach
903c37bf32
Apply draw colour to segmented graph segments 2023-01-18 23:17:57 +01:00
Wleter
f8d8a627b8 change property name 2023-01-18 22:00:39 +01:00
Bartłomiej Dach
769f8c6190
Fix ShowMaxJudgement callback conflicting with JudgementCounter.Pop{In,Out}
Both `JudgementCounterDisplay` (via the `ShowMaxJudgement` callback)
and the `JudgementCounter.Pop{In,Out}` methods were operating on the
alpha of the `JudgementCounter`. This meant that if the counter display
was created with max judgement initially hidden, it would be hidden
by the `ShowMaxJudgement` callback first, but then _unhidden_
by `PopIn()`.
2023-01-18 21:46:28 +01:00
Wleter
40e99069fc fix typos and newlines 2023-01-18 21:43:09 +01:00
Wleter
ab78dd0436 add collection of selection points. 2023-01-18 21:34:23 +01:00
ansel
77bc4fbf70 Integrate editor into comment 2023-01-18 20:50:07 +03:00
ansel
0d91277ea5 Add ability to change number on replies button 2023-01-18 20:49:30 +03:00
ansel
c74500b4b4 Add reply editor 2023-01-18 20:49:07 +03:00
Bartłomiej Dach
761298cd8e
Merge pull request #22275 from peppy/fix-legacy-old-judgement-animation
Fix legacy judgement animation not matching perfectly
2023-01-18 18:27:13 +01:00
Gabe Livengood
150195b887 use extension method to check accuracy impact 2023-01-18 12:24:41 -05:00
Gabe Livengood
e0f3fa1af6 remove this in ruleset assignment 2023-01-18 12:22:27 -05:00
Bartłomiej Dach
4a6f6300c5
Merge branch 'master' into fix-carousel-sort-change-after-play 2023-01-18 17:15:20 +01:00
Bartłomiej Dach
7ba448b13c
Update comment to match implementation 2023-01-18 17:12:57 +01:00
ansel
0f2ca5d5ed Expose method for drawable comment creation 2023-01-18 18:10:35 +03:00
Wleter
c9375c056e revert back name change 2023-01-18 15:54:24 +01:00
ansel
18baf3dd5d Log delete failure 2023-01-18 17:30:34 +03:00
StanR
24ed84aad0 Add tiered level badge colouring 2023-01-18 16:25:11 +03:00
Salman Ahmed
12fc5da143
Merge branch 'master' into frame-stable-cache 2023-01-18 14:16:46 +03:00
Dean Herbert
3b27774561 Remove OnlineID sort consideration 2023-01-18 19:21:02 +09:00
Dean Herbert
4ef940653b Fix legacy judgement animation not matching perfectly
This will be the final attempt to get it right. I was seemingly drunk
last time I wrote the logic.

Closes #21892.
2023-01-18 19:03:04 +09:00
Dean Herbert
43a037c189
Merge pull request #21620 from mk56-spn/JudgementCounter
Add a judgement counter to skin components
2023-01-18 18:43:49 +09:00
Dean Herbert
522bb8bcca Use ComputeAccuracy to get imminent accuracy 2023-01-18 18:08:58 +09:00
Dean Herbert
ecb4727aec Fix formatting issues 2023-01-18 17:33:14 +09:00
Dean Herbert
4cfb059170 Merge branch 'frame-stable-cache' into skin/argon-song-progress-cleaner 2023-01-18 17:21:08 +09:00
Dean Herbert
04705504c5 Move cache to more appropriate location 2023-01-18 17:19:57 +09:00
Dean Herbert
67b40dd234 Adjust the seek effect to feel better 2023-01-18 17:09:39 +09:00
Dean Herbert
01558a9199 Tidy up height logic and allow hovering above bar for easier interaction 2023-01-18 17:09:29 +09:00
Dean Herbert
f3677ab33d Simplify depth change logic 2023-01-18 16:38:21 +09:00
Dean Herbert
7d0388c55c Cache IFrameStableClock in Player for easier access
Allows directly referencing rather than going through `DrawableRuleset`.
Helps with testing and implementation of the new song progress display
(#22144).
2023-01-18 16:31:58 +09:00
Dean Herbert
42e9b2b48c Tidy up clock logic in all SongProgress classes 2023-01-18 16:29:42 +09:00
Dean Herbert
8bfd853889 Fix missing comment 2023-01-18 16:11:14 +09:00
Dean Herbert
bfb75730a9 Prefix subclasses of DefaultSongProgress with Default 2023-01-18 15:45:16 +09:00
Dean Herbert
1e5dd9165a Adjust SkinnableTestScene to give more breathing room to RelativeSize components 2023-01-18 15:37:46 +09:00
Dean Herbert
7266d8e10d Move "show difficulty graph" settings back to respective implementations to avoid legacy version showing it 2023-01-18 15:31:55 +09:00
Dean Herbert
5a272b4bd6
Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-18 15:25:02 +09:00
Dean Herbert
742a026077 Add comment mentioning why reference clock fallback logic is required 2023-01-18 15:24:35 +09:00
Dean Herbert
e8770b84cd Remove no longer necessary interface type 2023-01-18 15:23:55 +09:00
Dean Herbert
5429979049 Combine common code into SongProgress base class 2023-01-18 15:23:55 +09:00
Dean Herbert
afc12e0b83 Tidy up ISongProgressBar interface 2023-01-18 14:43:20 +09:00
Dean Herbert
f7c4199a77
Merge pull request #22262 from Joehuu/chat-mention-user
Add ability to easily mention users in chat by right clicking username
2023-01-18 13:30:02 +09:00
Dean Herbert
736ff419c0
Merge pull request #22261 from peppy/fix-bad-operation
Fix song select potentially operating on `Carousel` before it is fully loaded
2023-01-18 12:06:33 +09:00
Dean Herbert
4ad79a8a0a Move IsLoaded check inside BeatmapCarousel 2023-01-18 12:00:47 +09:00
Dean Herbert
0a47dc733f
Merge pull request #22268 from Feodor0090/comments-margin
Reduce padding for too nested comments
2023-01-18 11:45:41 +09:00
ansel
ca3be71381 Track comment's nesting and reduce padding for too nested 2023-01-18 02:11:07 +03:00
ansel
12544c16ea Remove canBeNull 2023-01-18 02:10:02 +03:00
Joseph Madamba
dfea42fd16 Add space after username mention 2023-01-17 14:13:50 -08:00
Joseph Madamba
254c881ded Also check null for bindable channel value 2023-01-17 14:12:48 -08:00
Bartłomiej Dach
f7c942ac10
Move user stats into detail header container 2023-01-17 22:32:24 +01:00
Bartłomiej Dach
7a475d9cf8
Move out stats from top header container 2023-01-17 22:32:15 +01:00
Bartłomiej Dach
350cce1315
Move contents of detail header to separate component 2023-01-17 22:32:12 +01:00
Bartłomiej Dach
f5459909f9
Merge branch 'master' into comment-editor-3 2023-01-17 21:31:08 +01:00
Bartłomiej Dach
3640342805
Add logging on comment post failure 2023-01-17 21:30:46 +01:00
Wleter
788033e1b8 fix unnecessary newline 2023-01-17 21:13:54 +01:00
Bartłomiej Dach
6f11fbdeed
Merge branch 'master' into fix-carousel-sort-change-after-play 2023-01-17 20:46:06 +01:00
Wleter
b8e6a2d87b filter currentEndPointPositions 2023-01-17 20:41:49 +01:00
Joseph Madamba
97bd76efc6 Add ability to easily mention users in chat by right clicking username 2023-01-17 10:01:07 -08:00
tsrk
f1989ba24d
quality: remove unused Darken bindable boolean 2023-01-17 17:26:05 +00:00
Dean Herbert
8e1002b744 Fix song select potentially operating on Carousel before it is fully loaded
Should fix test failures like
https://github.com/ppy/osu/actions/runs/3939620830/jobs/6739690253.
2023-01-18 01:56:18 +09:00
Gabe Livengood
0b1e5c0f53 lambdaify function 2023-01-17 10:23:57 -05:00
tsrk
d91aa341e5
refactor(ArgonSongProgress): reorder layering and make density graph visible for past time 2023-01-17 13:16:56 +00:00
Dean Herbert
26cd70f2bf Always use production (non-experimental) endpoints for tournament client 2023-01-17 18:46:06 +09:00
Dean Herbert
14649160e1 Adjust transform delay to make things feel more snappy 2023-01-17 18:39:21 +09:00
Dean Herbert
81aa7feeb5 Fix using FadeTo on a visibility container 2023-01-17 18:39:21 +09:00
Dean Herbert
48959c0212 Start name not visible to avoid pop out when hidden on startup 2023-01-17 18:35:19 +09:00
Dean Herbert
7d1fd24ab4 Start all counters hidden to fix pop out animation when some portions are hidden 2023-01-17 18:31:25 +09:00
Dean Herbert
448abf897a Tidy up direction assignment 2023-01-17 18:31:08 +09:00
Dean Herbert
ca17993769 Don't use OverlayContainer (what) 2023-01-17 18:30:50 +09:00
Dean Herbert
181473c5fc Rename flow to better match its purpose 2023-01-17 18:28:08 +09:00
Dean Herbert
35ad66eef9 Give flow container a type to avoid locally casting in every location 2023-01-17 18:27:33 +09:00
Dean Herbert
09c7ab3af6 Rename exposed settings to make more sense 2023-01-17 18:27:15 +09:00
Dean Herbert
f923dc5009 Use framework Direction instead of local enum
It should be stable enough to use.
2023-01-17 18:27:15 +09:00
Dean Herbert
0a7d6948ca Nest model class 2023-01-17 18:19:04 +09:00
Dean Herbert
b62b5714e8 Fix TierColours assignment 2023-01-17 18:07:11 +09:00
Dean Herbert
65bd2e74fd Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-17 18:00:42 +09:00
MK56
a55ce9b586
Merge branch 'master' into JudgementCounter 2023-01-17 09:55:45 +01:00
Dean Herbert
53e7873f6c
Merge branch 'master' into fix-pause-gameplay-action-not-closing 2023-01-17 17:41:16 +09:00
Dean Herbert
a1152fa0db
Merge pull request #22147 from Feodor0090/forbid-negative-snap
Forbid negative time snap in editor
2023-01-17 17:35:45 +09:00
Joseph Madamba
da0eb9b0cb Simplify TriggerClicks in gameplay menu overlays 2023-01-17 00:34:52 -08:00
Dean Herbert
c799375ae0
Merge pull request #20709 from Domilz/toolbar-localisation
Localise toolbar home button and ruleset description tooltips
2023-01-17 17:28:34 +09:00
Dean Herbert
23ea77cb74 Use ScoreProcessor to fetch accuracy rather than calculating manually 2023-01-17 17:03:04 +09:00
Dean Herbert
70cb23bbc9
Merge branch 'master' into mod-accuracy-challenge 2023-01-17 16:46:54 +09:00
Dean Herbert
a9ac28b504 Add fallback sorts to CarouselBeatmapSet to ensure stable sorting 2023-01-17 16:40:25 +09:00
Joseph Madamba
8f7cb18217 Use TriggerClick() instead of calling BackButton action for pause gameplay 2023-01-16 23:36:28 -08:00
Joseph Madamba
08c570849f Simplify container logic 2023-01-16 23:24:47 -08:00
Dean Herbert
9acf22b2b1
Merge branch 'master' into song_select_nullability 2023-01-17 15:29:37 +09:00
Dean Herbert
ef35493864 Avoid need for weird null check by reordering initialisation process 2023-01-17 15:27:21 +09:00
Dean Herbert
a02556d2fa Move hover logic to SettingsToolboxGroup to avoid expanded state clash 2023-01-17 14:43:22 +09:00
Dean Herbert
6a0bf89401 Merge branch 'master' into replay-menu-expanded-state-memory 2023-01-17 14:30:23 +09:00
Dean Herbert
776b6fa2e1
Merge pull request #22203 from bdach/fix-new-diff-creation-fail
Fix difficulty creation flow failing for some ruleset combinations
2023-01-17 14:08:34 +09:00
Dean Herbert
1f47def3c4
Merge branch 'master' into skin-editor-loc 2023-01-17 11:53:08 +09:00
Bartłomiej Dach
0c5a436754
Merge pull request #22241 from stanriders/refactor-levelbadge
Refactor `LevelBadge` to use `LevelInfo`
2023-01-16 23:33:03 +01:00
Bartłomiej Dach
f79037cefb
Move to LoadComplete() better 2023-01-16 21:47:31 +01:00
StanR
3f75506552 Move binding to LoadComplete 2023-01-16 23:42:07 +03:00
StanR
c5d09c0e2c
Rename variable
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-01-16 23:36:50 +03:00
StanR
6207a96a29 Refactor LevelBadge to use LevelInfo 2023-01-16 23:24:09 +03:00
ansel
133b9b79d7 Do not touch "currently editing" line 2023-01-16 22:52:17 +03:00
Bartłomiej Dach
bf58fe21ce
Merge branch 'master' into beatmap-set-converted-beatmaps 2023-01-16 20:46:41 +01:00
ansel
17aeb0ec19 Localise editor's UI 2023-01-16 19:55:28 +03:00
ansel
6eb5508404 Localise menu bar 2023-01-16 19:39:50 +03:00
ansel
26f3b1dbfe Localise "revert to default" tooltip 2023-01-16 19:37:47 +03:00
Dean Herbert
4224907f08
Merge pull request #22208 from Feodor0090/editor-loc
Localise most visible parts of editor
2023-01-16 23:05:17 +09:00
Dean Herbert
988544073c
Merge branch 'master' into ruleset-settings-loc 2023-01-16 13:29:15 +09:00
Dean Herbert
d19b35bd5f Rename ambiguous translation keys 2023-01-16 13:18:49 +09:00
Joseph Madamba
6a847faea9 Make home string keys more specific 2023-01-15 15:23:26 -08:00
Joseph Madamba
0ff143d4c8 Add argument for play some ruleset string 2023-01-15 15:23:26 -08:00
Joseph Madamba
ae49e724e4 Move converted beatmap icons logic locally 2023-01-15 15:09:25 -08:00
Joseph Madamba
b733f46c6f Apply NRT to BeatmapPicker 2023-01-15 15:09:25 -08:00
Joseph Madamba
27671f0401 Merge remote-tracking branch 'upstream/master' into pr/20709 2023-01-15 15:08:11 -08:00
Joseph Madamba
85c1932851 Mark Converts as nullable 2023-01-15 12:46:41 -08:00
ansel
6f84641596 Localise osu!mania settings 2023-01-15 23:30:20 +03:00
ansel
9ce7c51b14 Localise osu! settings 2023-01-15 23:29:58 +03:00
ansel
00acea59fc Move some strings to common 2023-01-15 19:37:40 +03:00
mk56-spn
9a29c9ae26 remove hacky method to check if carousel is null 2023-01-15 15:32:53 +01:00
Dean Herbert
c5775aa452
Merge branch 'master' into song_select_nullability 2023-01-15 22:44:13 +09:00
Dean Herbert
4cf4a66858 Make MusicController a required dependency of SongSelect 2023-01-15 22:43:30 +09:00
Dean Herbert
f7af5a8115 Revert some formatting changes 2023-01-15 22:39:00 +09:00
Salman Ahmed
13c1b8f5a4 Fix intermittent failure in tests with restarting player instances 2023-01-15 16:06:06 +03:00
ansel
5d2e09137c Remove text padding in editor menu for now 2023-01-15 14:40:53 +03:00
ansel
8777d5349b Use existing strings 2023-01-15 14:39:34 +03:00
Joseph Madamba
627d1725c3 Fix kudosu wiki link from user profile not linking to in-game overlay 2023-01-14 19:56:51 -08:00
ansel
87650044bb Localise create/save dialog 2023-01-15 01:50:47 +03:00