1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-20 22:12:54 +08:00
Commit Graph

37406 Commits

Author SHA1 Message Date
Dean Herbert
efe57f29e0
Merge pull request #22382 from JDECOMBE/beatmapSelectionBlur
Add ability to disable background blur at song select
2023-01-25 17:34:35 +09:00
Dean Herbert
67e9de43be
Merge pull request #22386 from EVAST9919/triangles-og-shhader
Use `TriangleBorder` shader in `Triangles` background
2023-01-25 17:25:18 +09:00
Dean Herbert
d15f8c2f3a Fix beatmaps with multiple osb files potentially reading the storyboard from the wrong one
In stable, the storyboard filename is fixed. In lazer, we were always
looking for the first `.osb` in the database. In the case a beatmap
archive housed more than one `.osb` files, this may load the incorrect
one.

Using `GetDisplayString` here feels like it could potentially go wrong
in the future, so I'm open to hard-coding this locally (or using string
manipulation to remove the ` [creator_name]` portion of the beatmap's
filename). Open to opinions on that.

Fixes storyboard playback in https://osu.ppy.sh/beatmapsets/1913687#osu/3947758
2023-01-25 17:11:15 +09:00
Dean Herbert
5c888e0c68
Merge branch 'master' into beatmapSelectionBlur 2023-01-25 16:37:19 +09:00
Dean Herbert
59ee6922b1
Merge pull request #22399 from bdach/user-profile/update-cover
Update appearance of profile cover area to match web
2023-01-25 16:35:44 +09:00
Dean Herbert
01e280eb6b Add classic default for song select blur setting 2023-01-25 16:32:00 +09:00
Dean Herbert
e333e12b2e Fix typo in settings enum (seriously) 2023-01-25 16:32:00 +09:00
Dean Herbert
3faab66f39 Merge branch 'master' into beatmapSelectionBlur 2023-01-25 16:32:00 +09:00
Dean Herbert
1a9ed1ac3f Remove unnecessary IgnoreUserSettings value change 2023-01-25 16:28:06 +09:00
Dean Herbert
f81dea4166 Remove now unused localisation string 2023-01-25 16:24:52 +09:00
Dean Herbert
7bb6337d2e Fix nullability (thanks bdach for patch) 2023-01-25 14:43:46 +09:00
Dean Herbert
8caf960f9a Revert weird nullable changes to Skin.cs 2023-01-25 14:43:46 +09:00
Dean Herbert
0a9b20d5d5 Split lookup store into own file / class 2023-01-25 14:43:46 +09:00
Dean Herbert
c1a5c16973 Reduce maximum texture size to a more commonly-supported 8192 2023-01-25 14:43:46 +09:00
Dean Herbert
d000a4ed28 Make sure to dispose of the original texture upload as we are replacing it 2023-01-25 14:43:46 +09:00
Dean Herbert
598c6fcbad Add basic support for stupidly long hold note skin textures 2023-01-25 14:43:46 +09:00
Dean Herbert
6bf7773532 Increase duration of expansion transition 2023-01-25 14:28:25 +09:00
Dean Herbert
3e91dd2a16 Update spacing along with expanded state 2023-01-25 14:28:25 +09:00
Dean Herbert
6efab635d8
Merge branch 'master' into fix-copy-difficulty-moving-collections 2023-01-25 14:11:32 +09:00
Dean Herbert
392ff2ffea Reword comment regarding hash transfer to make more sense 2023-01-25 14:11:02 +09:00
Dean Herbert
741ca96853 Make transferCollections argument to private method explicitly required 2023-01-25 14:09:13 +09:00
Dean Herbert
739ec8d81d
Add argument hint for nondescript bool
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-01-25 14:04:30 +09:00
Bartłomiej Dach
f2df36e6a5
Persist cover visibility to user settings
Follows web precedent, wherein the setting is saved to local storage.
2023-01-24 23:30:12 +01:00
Bartłomiej Dach
33e91cf512
Implement cover toggling 2023-01-24 23:06:49 +01:00
Bartłomiej Dach
e74176e5bd
Add cover toggle button 2023-01-24 23:06:46 +01:00
Bartłomiej Dach
ef7812412b
Update top header container appearance 2023-01-24 23:06:44 +01:00
Bartłomiej Dach
ff22a91d52
Move user cover lower down 2023-01-24 23:06:37 +01:00
Bartłomiej Dach
edb9c76edf
Merge pull request #22385 from peppy/touchscreen-settings-keyword
Fix touch input handler settings not matching search for "touchscreen"
2023-01-24 20:50:53 +01:00
Bartłomiej Dach
054938be02
Merge pull request #22387 from peppy/beatmap-leaderboard-cancel-request-eagerly
Fix beatmap leaderboard potentially showing incorrect leaderboard
2023-01-24 19:49:11 +01:00
Jérémiah DÉCOMBE
acb42f7d12 reusing gameplay background blur loc song select background blur 2023-01-24 10:18:00 +01:00
Dean Herbert
b9291cb116 Change some order and assert for positive visibility before scheduling an operation in changelog overlay 2023-01-24 17:59:25 +09:00
Jérémiah DÉCOMBE
e0a7559d85 variable naming + loc 2023-01-24 09:55:08 +01:00
Joseph Madamba
c6bf755e68 Remove IsPresent override from ChangelogOverlay 2023-01-24 00:22:29 -08:00
Joseph Madamba
df895c4fd6 Always make settings footer build display clickable 2023-01-24 00:21:39 -08:00
Jérémiah DÉCOMBE
7ca2a431e6 changing song select background blur setting to boolean 2023-01-24 09:19:53 +01:00
Jérémiah DÉCOMBE
d783998c81 using BindValueChanged and IsCurrentScreen for setting binding 2023-01-24 09:09:05 +01:00
Dean Herbert
a966d6c330
Merge pull request #18402 from ggliv/mod-accuracy-challenge
Add accuracy challenge mod
2023-01-24 16:00:55 +09:00
Gabe Livengood
b46ef67a14 increase min minimum accuracy to 60% 2023-01-24 00:31:46 -05:00
Dean Herbert
bb15ee50e0 Fix beatmap leaderboard potentially showing incorrect leaderboard 2023-01-24 13:52:59 +09:00
Andrei Zavatski
04c96355cb Use TriangleBorder shader to draw triangles 2023-01-24 07:38:42 +03:00
Dean Herbert
fc558278cc Fix touch input handler settings not matching search for "touchscreen" 2023-01-24 13:37:12 +09:00
Jeremiah DECOMBE
c1876aac88 removing parameter name abbreviations 2023-01-24 00:36:38 +01:00
Jeremiah DECOMBE
b573e42cc2 BeatmapSelectionBackgroundBlurLevel renamed to SongSelectBackgroundBlurLevel 2023-01-24 00:08:11 +01:00
naoey
e6de167adb
Revert split and make collections boolean internal to BeatmapManager 2023-01-24 07:27:26 +09:00
Jeremiah DECOMBE
26adc28943 missing blank line between methods 2023-01-23 23:15:37 +01:00
Jeremiah DECOMBE
f13a5465ba variable naming and loc modifications 2023-01-23 23:07:50 +01:00
Bartłomiej Dach
7483967157
Merge branch 'master' into SliderEnd-Snap 2023-01-23 21:33:16 +01:00
Bartłomiej Dach
1f40b2daf6
Clean up xmldocs 2023-01-23 21:22:18 +01:00
Bartłomiej Dach
9f2ed853eb
Merge pull request #22371 from peppy/more-settings-keywords
Add more keywords to settings based on feedback
2023-01-23 20:19:53 +01:00
Jérémiah DÉCOMBE
6daa364779 adding setting to adjust blur of the background of the song select screen 2023-01-23 13:53:31 +01:00
Dean Herbert
432e0a6a37
Merge branch 'master' into level-badge-colour 2023-01-23 15:46:15 +09:00
Dean Herbert
9c2494383f Rename fetch method to be non-plural to match all others 2023-01-23 15:43:52 +09:00
Dean Herbert
e3932c077b
Merge pull request #22032 from frenzibyte/fix-potential-difficulty-failure-alt
Fix advanced statistics display potentially performing invalid difficulty calculation
2023-01-23 15:39:47 +09:00
cdwcgt
5afb733fb2
change IssueTemplatePreviewTimeConflict's text 2023-01-23 15:26:28 +09:00
Dean Herbert
7ebd31d42f Add more keywords to settings based on feedback 2023-01-23 15:14:16 +09:00
Dean Herbert
2ed9fe3747 Add support for externally specified keywords in SettingsButtons 2023-01-23 15:10:26 +09:00
Dean Herbert
73f083a316 Refactor how additional points are provided to avoid confusion 2023-01-23 14:13:46 +09:00
Susko3
f8537c1cbe Delegate file deletion to ImportTask to allow overriding it 2023-01-22 22:19:04 +01:00
Dean Herbert
f87bb589a2
Merge pull request #22340 from EXtremeExploit/groups-modes
Add modes text to groups tooltip
2023-01-23 01:10:25 +09:00
Bartłomiej Dach
e1acf85bb3
Merge branch 'master' into groups-modes 2023-01-22 10:09:34 +01:00
Bartłomiej Dach
9bde1ef9bf
Privatise setter 2023-01-22 10:09:08 +01:00
Bartłomiej Dach
b98da506c1
Fix code quality inspection 2023-01-22 10:07:47 +01:00
Bartłomiej Dach
31e7d7333b
Merge branch 'master' into fix-fail-sample-playing-after-leaving-dialog 2023-01-22 09:35:37 +01:00
Bartłomiej Dach
06aa3f7798
Rename Stop{SampleAndRemoveFilters -> }()
Now that just one method for stopping samples is left, let's just
repurpose st as the general "stop global effects" method rather than
have it there with a hyperspecific name. It also has good symmetry, as
there already was a `Start()` method in the class.
2023-01-22 09:29:22 +01:00
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
cdwcgt
e5eab72aeb
add check for preview time setting 2023-01-19 01:08:37 +09: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