1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 17:57:38 +08:00
Commit Graph

24465 Commits

Author SHA1 Message Date
smoogipoo
cd25d76dbe Merge branch 'master' into localisation-proof-of-concept 2021-05-08 18:11:07 +09:00
Dean Herbert
495eb04e2f
Merge pull request #12488 from Denrage/add-missing-author-links
Add missing author links in Beatmap Details
2021-05-08 05:41:40 +09:00
Dean Herbert
5b2f786f97 Update framework 2021-05-07 19:16:00 +09:00
Salman Ahmed
fc2a527e9d Revert "Guard against potentially null track if ever"
This reverts commit b1134c3857.
2021-05-07 09:57:08 +03:00
Salman Ahmed
7c4e54a1d4 Unrevert null-colaescing/conditionals removal 2021-05-07 09:54:14 +03:00
Dean Herbert
165f443ab5 Merge branch 'master' into add-missing-author-links 2021-05-07 14:32:44 +09:00
Salman Ahmed
b1134c3857 Guard against potentially null track if ever 2021-05-07 08:30:50 +03:00
Salman Ahmed
37f44d2e37 Revert wrong not-null track changes
This reverts commit f9d99a9882.
This reverts commit 71547bece0.
2021-05-07 08:28:44 +03:00
Salman Ahmed
71547bece0 Remove any null-coalescing/conditionals in WorkingBeatmap.Track usages 2021-05-07 07:46:23 +03:00
Salman Ahmed
f9d99a9882 Mark WorkingBeatmap.Track as not null 2021-05-07 07:25:14 +03:00
Salman Ahmed
539643c72b Set loadable beatmap track to clock immediately in BDL
This reverts commit 84da247002.

Use loadable beatmap track for clock directly in BDL
2021-05-07 07:21:56 +03:00
Salman Ahmed
84da247002 Fix editor clock using the wrong beatmap track on creation 2021-05-07 05:32:55 +03:00
Dean Herbert
fc04b88e1a
Merge pull request #12697 from peppy/update-framework
Update framework
2021-05-06 17:46:08 +09:00
Dean Herbert
af75c9ac82 Update framework 2021-05-06 16:08:28 +09:00
Joseph Madamba
d4658c609b Fix warning text of bg source setting not being updated when user with supporter signs in/out 2021-05-05 22:54:35 -07:00
Bartłomiej Dach
3cac837acf
Merge branch 'master' into skin-bindables 2021-05-05 20:16:27 +02:00
Dean Herbert
cb8bda2248
Merge pull request #12503 from Denrage/split-BufferedWedgeInfo 2021-05-06 03:16:16 +09:00
Dean Herbert
cffeb8641f Make setters private for protected containers 2021-05-06 02:14:57 +09:00
Dean Herbert
fe9ade6754 Rename Container to DisplayedContent 2021-05-06 02:14:04 +09:00
Denrage
b6b9a69601 Removed unnecessary class for wrapping 2021-05-05 18:50:49 +02:00
Denrage
bb385f4255 Reverted difficulty and mod updates 2021-05-05 18:15:59 +02:00
Denrage
2797507758 Reorganized elements for readability 2021-05-05 17:56:07 +02:00
Denrage
88506a51dd reduced complexity 2021-05-05 17:51:29 +02:00
Denrage
5049e2fbf9 Refactored out changes in DifficultyColourBar 2021-05-05 15:28:33 +02:00
Dean Herbert
ed1ae4775f
Merge pull request #12432 from marlinabowring/play-storyboard-outro
Add support for playing storyboards beyond gameplay end time
2021-05-05 22:21:25 +09:00
Dean Herbert
4ef901d08d Remove unnecessary redirection property to Container.Info 2021-05-05 21:07:49 +09:00
Denrage
cf6ed7a7cf Refactored out changes in StarRatingDisplay 2021-05-05 13:13:37 +02:00
Dean Herbert
a2ad079b8a
Merge pull request #12675 from Joehuu/settings-item-notes 2021-05-05 18:11:16 +09:00
Dean Herbert
377af38d94 Remove unnecessary pixelSnapping parameter
This was only required because there was text being rendered to the
`BufferedContainer` content until now. Removing this should allow for
better resolution in the background display (due to using a better
minify scale mode).
2021-05-05 17:59:51 +09:00
Dean Herbert
805ef621e9
Merge branch 'master' into play-storyboard-outro 2021-05-05 17:51:16 +09:00
Dean Herbert
9ec3255c50 Fix SkipOverlay's FadeContent not getting correct state from parent 2021-05-05 17:50:25 +09:00
Dean Herbert
08a45e9fc2 Remove dead code 2021-05-05 16:26:41 +09:00
Dean Herbert
19ffcd00c2 Initialise warning text flow lazily as most items will not use it 2021-05-05 16:26:41 +09:00
Dean Herbert
1288f69fad Rename to WarningText 2021-05-05 16:16:49 +09:00
Dean Herbert
6178f38c95 Reword unlimited frame rate warning a bit 2021-05-05 16:15:06 +09:00
Dean Herbert
62fa638515
Merge pull request #12665 from frenzibyte/stable-frame-sort 2021-05-05 14:35:25 +09:00
Christine Chen
1472960319 Hide and disable skip outro overlay on rewind 2021-05-04 21:35:36 -04:00
Joseph Madamba
23b9d8c260
Fix alpha not being zero when string is set to empty and use inequality on supporter condition
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-05-04 14:02:12 -07:00
Bartłomiej Dach
4185053120
Merge branch 'master' into fix-selection-handler-visibility 2021-05-04 20:21:05 +02:00
Joseph Madamba
a584213002 Use vertical padding instead of relative height for default button 2021-05-04 09:32:38 -07:00
Joseph Madamba
0a64922738 Add supporter note to background source setting 2021-05-04 01:15:59 -07:00
Joseph Madamba
796bd8e47e Add existing setting notes from stable 2021-05-04 01:15:59 -07:00
Joseph Madamba
acc9258eb2 Implement notes for settings 2021-05-04 01:15:59 -07:00
Dean Herbert
18779b1d1e Cache last event time value to avoid super expensive LINQ 2021-05-04 16:48:13 +09:00
Dean Herbert
b380be7169 Add xmldoc for updateCompletionState 2021-05-04 16:43:51 +09:00
Dan Balasescu
f2f41545f8
Merge pull request #12667 from peppy/fix-editor-threading-failure
Remove unsafe access to Composer.HitObjects
2021-05-04 16:36:50 +09:00
Dean Herbert
4c7a4239f8 Fix AllowGameplayOverlays potentially not working for outro skip overlay 2021-05-04 16:36:07 +09:00
Dean Herbert
b30145de40 Specify explicit primitive type 2021-05-04 16:35:50 +09:00
Dean Herbert
ffc88db47a Implement Duration via the interface 2021-05-04 16:04:59 +09:00
Dean Herbert
bb9fa1a25e
Merge branch 'master' into play-storyboard-outro 2021-05-04 14:01:34 +09:00