1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-30 04:07:25 +08:00
Commit Graph

37196 Commits

Author SHA1 Message Date
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
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
Dean Herbert
7040743249 Add search keywords for screen scaling sub-settings 2023-01-22 13:47:31 +09: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
Joseph Madamba
da03abc812 Fix comment editor text boxes not having sound feedback 2023-01-21 17:32:42 -08: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
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
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
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
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
ansel
18baf3dd5d Log delete failure 2023-01-18 17:30:34 +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
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