1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 10:47:24 +08:00
Commit Graph

24807 Commits

Author SHA1 Message Date
Dean Herbert
f53ce951dc Remove DefaultScoreCounter animation for the time being
May add this back in the future, but for now it's causing issues as it
operates on `this`. The default skin may be changing quite a bit in the
near future, so we can decide what to do about animation at that point
in time.
2021-05-11 18:39:14 +09:00
Dean Herbert
117d6d731d Move cross-component layout dependencies for legacy skin to LegacySkin 2021-05-11 18:39:14 +09:00
Dean Herbert
4c4d75e6f9 Remove AccuracyCounter sizing dependency in HUDOverlay 2021-05-11 18:39:14 +09:00
Dean Herbert
2396ba42a6 Change HealthDisplay to be a CompositeDrawable 2021-05-11 18:39:14 +09:00
Dean Herbert
bf65547eec Allow some serialised components to not be mutable by the user 2021-05-11 18:39:14 +09:00
Dean Herbert
81902ad6a6 Add the ability to revert all skin changes 2021-05-11 18:39:14 +09:00
Dean Herbert
4769a95b49 Fix encapsulation and remove target lookup overhead 2021-05-11 18:39:14 +09:00
Dean Herbert
c957293ec3 Load json from disk store at skin construction for now
This allows for easier mutation without worrying about changes being
re-read from disk unexpectedly.
2021-05-11 18:39:14 +09:00
Dean Herbert
1bb3c609ae Centralise implementation of cancel button logic 2021-05-11 18:39:14 +09:00
Dean Herbert
b248b2e5e3 Hook up full save/load flow 2021-05-11 18:39:14 +09:00
Dean Herbert
004798d61d Update Legacy components to not require skin in ctor 2021-05-11 18:39:14 +09:00
Dean Herbert
b54eb56169 Move new judgement binding to LoadComplete to ensure containers are loaded 2021-05-11 18:39:14 +09:00
Dean Herbert
6a88b8888b Add basic support for child serialisation 2021-05-11 18:39:14 +09:00
Dean Herbert
1742ee89e0 Fix incorrect xmldoc for DeleteFile 2021-05-11 18:39:14 +09:00
Dean Herbert
df72656aa1 Remove downwards dependency from HUDOverlay to HealthDisplay 2021-05-11 18:39:14 +09:00
Dean Herbert
95a497e9df Remove unused interface class for simplicity 2021-05-11 18:39:14 +09:00
Dean Herbert
95a8f21ab2 Add the concept of skinnable target containers and mark a basic one for HUD elements 2021-05-11 18:39:14 +09:00
Dean Herbert
67ea4a7e97 Read from skin config 2021-05-11 18:39:14 +09:00
Dean Herbert
b9ab9342fa Setup basics to allow extracting serializable content from skinnable Drawables 2021-05-11 18:39:14 +09:00
smoogipoo
10a4a5decb Merge branch 'master' into multiplayer-spectator-screen 2021-05-11 17:33:09 +09:00
Dan Balasescu
7d9cdd3bc2
Merge branch 'master' into skin-components-list 2021-05-11 17:27:48 +09:00
Joseph Madamba
4bee8c23f0 Fix idle tracker not accounting global actions 2021-05-10 21:40:29 -07:00
smoogipoo
0f00ee8640 Change failure text
Although this is not visible anywhere.
2021-05-11 11:35:08 +09:00
smoogipoo
8c9390dc75 Remove replay condition 2021-05-11 11:33:21 +09:00
smoogipoo
6db9e26d48 Fix score submission failures with autoplay 2021-05-11 11:28:09 +09:00
smoogipoo
32f7691349 Fix token failure preventing base.LoadAsyncComplete() 2021-05-11 11:24:35 +09:00
Bartłomiej Dach
f5aff780ca
Merge branch 'master' into text-flow-md 2021-05-10 22:34:20 +02:00
Dean Herbert
f1aa47f6df Update framework 2021-05-10 23:15:38 +09:00
Dean Herbert
6bb52ebcf8
Merge pull request #12570 from frenzibyte/corner-rotation-controls
Add rotation controls to editor selection box corners
2021-05-10 23:09:44 +09:00
Dean Herbert
1492ad750a
Merge pull request #12735 from smoogipoo/fix-toolbar-queuing-sounds
Fix toolbar queuing ruleset sounds
2021-05-10 23:05:49 +09:00
Gagah Pangeran Rosfatiputra
bca5bee72e
remove duplicate CreateSpriteText in OsuMarkdownTextFlowContainer 2021-05-10 19:28:32 +07:00
Dan Balasescu
e7355da201
Merge branch 'master' into osu-markdown 2021-05-10 20:02:04 +09:00
Dean Herbert
1b701adfef Add score/health processors to fill in default values 2021-05-10 18:15:39 +09:00
Dean Herbert
2ecd638f7f Merge branch 'master' into skin-components-list 2021-05-10 18:13:10 +09:00
smoogipoo
fa872858b5 Remove unnecessary check 2021-05-10 16:40:06 +09:00
Dean Herbert
97e72849af Fix regressed HitErrorDisplay behaviour (and localise binding to meter implementations) 2021-05-10 15:24:13 +09:00
Dan Balasescu
78952c07b0
Merge branch 'master' into remove-hud-overlay-unused-pieces 2021-05-10 14:39:32 +09:00
Dan Balasescu
5a6c7c30e0
Merge pull request #12707 from peppy/skin-components-bind-outwards-health
Update `HealthDisplay` components to use DI to attach data source
2021-05-10 14:39:17 +09:00
smoogipoo
332cb74cad Fix toolbar queuing ruleset sounds 2021-05-10 13:58:13 +09:00
Dean Herbert
149f2bcc1c
Merge pull request #12701 from ekrctb/framed-auto-generator
Factor out common logic of frame-based replay `AutoGenerator`
2021-05-10 13:43:53 +09:00
smoogipoo
35a7226cd8 Add newline 2021-05-10 13:41:04 +09:00
Dean Herbert
3c3500d070 Merge branch 'skin-components-bind-outwards-health' into remove-hud-overlay-unused-pieces 2021-05-10 12:23:18 +09:00
Dean Herbert
1bbbe80420 Fix missing instances of HealthProcessor caching 2021-05-10 12:22:24 +09:00
Dean Herbert
b274fdf20d Merge branch 'master' into skin-components-bind-outwards-health 2021-05-10 11:13:44 +09:00
Dan Balasescu
002622a92c
Merge pull request #12732 from Joehuu/ss-sort-by-source
Add ability to sort by source in song select
2021-05-10 10:10:56 +09:00
Susko3
ab6239fd5f change math for displaying volume "MAX" 2021-05-10 00:51:58 +02:00
Joseph Madamba
a71e52da4c Fix enum ordering after adding source 2021-05-09 15:39:59 -07:00
Joseph Madamba
a21718f1cd Move source case to a better spot 2021-05-09 14:26:45 -07:00
Joseph Madamba
8964d51de9 Add ability to sort by source in song select 2021-05-09 14:10:38 -07:00
Dean Herbert
2bcf1ed306
Merge pull request #12715 from Cublibre/fix-early-exit-crash
Fix InvalidOperationException when exiting a map at the end
2021-05-09 23:21:19 +09:00
Bartłomiej Dach
eb716455b7
Merge branch 'master' into skin-components-bind-outwards-accuracy 2021-05-09 12:13:18 +02:00
Andrei Zavatski
dde9fd28e6 Hide ShowMore button if there's nothing to load 2021-05-09 04:57:24 +03:00
Dean Herbert
0e91e6a155
Merge pull request #12724 from bdach/remove-current-from-legacyscorecounter
Remove vestigial `Current` reimplementation from `LegacyScoreCounter`
2021-05-09 05:01:53 +09:00
Dean Herbert
ea066cddc9
Merge pull request #12722 from bdach/fix-beatmap-listing-temporary-files
Fix temporary files from beatmap downloads not being cleaned up
2021-05-09 04:51:48 +09:00
Bartłomiej Dach
67cea6e762 Remove explicit binding to accuracy counter from overlay 2021-05-08 21:38:06 +02:00
Bartłomiej Dach
0bc6a026eb
Merge branch 'master' into skin-components-bind-outwards-accuracy 2021-05-08 21:08:53 +02:00
Bartłomiej Dach
c3bf6a0287 Remove weird vestigial Current reimplementation
Has no functional purpose anymore since the changes in the HUD element
data binding flow.
2021-05-08 21:01:37 +02:00
Bartłomiej Dach
dec5400c0a
Merge branch 'master' into skin-components-bind-outwards-score-display 2021-05-08 19:58:19 +02:00
Bartłomiej Dach
9e0ea494fd
Merge branch 'master' into skin-components-bind-outwards 2021-05-08 19:04:56 +02:00
Christine Chen
25312b3e88 Don't restart completion delegate on exit, revert exit behavior to lazer 2021-05-08 11:47:44 -04:00
Bartłomiej Dach
fe86ee629e Fix temp files from beatmap listing imports not being cleaned up
As reported in #12718, it turns out that temporary files from beatmap
set downloads performed via the beatmap listing overlay could remain in
the user's filesystem even after the download has concluded.

The reason for the issue is a failure in component integration.
In the case of online downloads, files are first downloaded to a
temporary directory (`C:/Temp` or `/tmp`), with a randomly generated
filename, which ends in an extension of `.tmp`.

On the other side, `ArchiveModelManager`s have a `ShouldDeleteArchive()`
method, which determines whether a file should be deleted after
importing. At the time of writing, in the case of beatmap imports the
file is only automatically cleaned up if the extension of the file is
equal to `.osz`, which was not the case for temporary files.

As it turns out, `APIDownloadRequest` has a facility for adjusting the
file's extension, via the protected `FileExtension` property. Therefore,
use it in the case of `DownloadBeatmapSetRequest` to specify `.osz`,
which then will make sure that the `ShouldDeleteArchive()` check in
`BeatmapManager` picks it up for clean-up.
2021-05-08 17:09:14 +02:00
Christine Chen
8c564a69ed Fix InvalidOperationException when exiting a map at the end 2021-05-07 21:11:03 -04: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
Dean Herbert
a1aeac5677 Remove remaining cruft from SkinnableAccuracyCounter 2021-05-07 18:12:18 +09:00
Dean Herbert
68de870986 Merge branch 'skin-components-bind-outwards-health' into remove-hud-overlay-unused-pieces 2021-05-07 18:11:14 +09:00
Dean Herbert
9fe6e1096a Remove cruft from SkinnableHealthDisplay 2021-05-07 18:11:08 +09:00
ekrctb
111b501ced Revert accidental removal of UTF-8 BOM 2021-05-07 18:04:38 +09:00
Dean Herbert
1cb10c2a22 Remove unnecessary binding logic from HUDOverlay 2021-05-07 17:51:46 +09:00
Dean Herbert
a7acecc52b Merge branch 'skin-components-bind-outwards-health' into remove-hud-overlay-unused-pieces 2021-05-07 17:51:41 +09:00
Dean Herbert
04d35826a3 Merge branch 'skin-components-bind-outwards-accuracy' into remove-hud-overlay-unused-pieces 2021-05-07 17:25:39 +09:00
Dean Herbert
755588258e Update HealthDisplay components to use DI to attach data source 2021-05-07 17:22:45 +09:00
Gagah Pangeran Rosfatiputra
22677cfeaf
add CreateBorder method in markdown table cell 2021-05-07 14:54:46 +07:00
Gagah Pangeran Rosfatiputra
d92e593ddd
extract out table head and body border into separate component 2021-05-07 14:47:46 +07:00
Gagah Pangeran Rosfatiputra
64e9c5e9ba
add return xmldoc in markdown unordered list 2021-05-07 14:41:27 +07:00
Gagah Pangeran Rosfatiputra
79a1d7b2b3
simplify CreateEmphasisedSpriteText 2021-05-07 14:40:01 +07:00
Gagah Pangeran Rosfatiputra
17b8963cf8
simplify CreateSpriteText in markdown table cell 2021-05-07 14:38:19 +07:00
Gagah Pangeran Rosfatiputra
3524cb7924
simplify CreateSpriteText in markdown heading 2021-05-07 14:36:35 +07:00
Dean Herbert
01eff7f316 Merge branch 'skin-components-bind-outwards' into skin-components-bind-outwards-score-display 2021-05-07 16:30:08 +09:00
Dean Herbert
93f10330e3 Merge branch 'skin-components-bind-outwards' into skin-components-bind-outwards-accuracy 2021-05-07 16:29:10 +09:00
Dean Herbert
ad398165a2 Update AccuracyCounter components to use DI to attach data source 2021-05-07 16:27:25 +09:00
Dean Herbert
17b93361d5
Merge branch 'master' into skin-components-bind-outwards 2021-05-07 16:20:24 +09:00
Dean Herbert
a2e4fb5b6b Update ScoreCounter components to bind outwards 2021-05-07 16:16:48 +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
Gagah Pangeran Rosfatiputra
5b003750f8
change CreateListItem method in OsuMarkdownContainer 2021-05-07 13:20:48 +07:00
Gagah Pangeran Rosfatiputra
9233248a0b
add OsuMarkdownUnorderedListItem 2021-05-07 13:20:20 +07:00
Gagah Pangeran Rosfatiputra
dfcf760b7b
add OsuMarkdownOrderedListItem 2021-05-07 13:20:06 +07:00
Gagah Pangeran Rosfatiputra
bdfe44ddca
change OsuMarkdownListItem to abstract class 2021-05-07 13:19:30 +07: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
ekrctb
207f7f1e56 Rename FramedAutoGenerator<T> -> AutoGenerator<T> 2021-05-07 00:31:12 +09:00
ekrctb
ea35b72436 Remove unused IAutoGenerator interface 2021-05-06 22:57:07 +09:00
ekrctb
9be36230f9 Introduce AutoGenerator subclass for frame based replay generation 2021-05-06 21:59:11 +09:00
Gagah Pangeran Rosfatiputra
92022f2cba
add Separator component in OsuMarkdownSeparator 2021-05-06 17:17:14 +07:00
Gagah Pangeran Rosfatiputra
7b43730fe6
add QuoteBackground in OsuMarkdownQuoteBlock 2021-05-06 17:13:46 +07:00
Gagah Pangeran Rosfatiputra
010f625870
use derived component in OsuMarkdownFencedCodeBlock 2021-05-06 17:05:41 +07:00
Gagah Pangeran Rosfatiputra
67f51959db
Merge branch 'master' into osu-markdown 2021-05-06 16:23:20 +07:00
Dean Herbert
fc04b88e1a
Merge pull request #12697 from peppy/update-framework
Update framework
2021-05-06 17:46:08 +09:00
Gagah Pangeran Rosfatiputra
ba634cbf11
change line spacing to 21
We use margin bottom in osu-web markdown paragraph[1] as reference for
this line spacing value.

The value from osu-web itself is 1.5em[2]. Because the base font size of
the paragraph is 14px[3][4], the actual value is 14 * 1.5 = 21px

[1] 376cac43a0/resources/assets/less/bem/osu-md.less (L230)
[2] 376cac43a0/resources/assets/less/variables.less (L58)
[3] 376cac43a0/resources/assets/less/bem/osu-md.less (L9)
[4] 376cac43a0/resources/assets/less/variables.less (L161)
2021-05-06 15:15:50 +07:00
Gagah Pangeran Rosfatiputra
e7c563fb67
simplify CreateTextFlow in quote block 2021-05-06 15:11:45 +07:00
Gagah Pangeran Rosfatiputra
b6560a616a
add comment for base font size heading 2021-05-06 15:00:12 +07:00
Dean Herbert
af75c9ac82 Update framework 2021-05-06 16:08:28 +09:00
Dean Herbert
ee23124bb1 Remove no-longer-used interface 2021-05-06 15:18:06 +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
Dean Herbert
aff32b0d19 Merge branch 'master' into skin-components-list 2021-05-06 14:17:33 +09:00
Gagah Pangeran Rosfatiputra
0d3ca8dde1
change font weight of table header 2021-05-06 08:43:38 +07:00
Gagah Pangeran Rosfatiputra
550e6c0fbb
change quote block margin padding to use vertical and horizontal 2021-05-06 08:28:37 +07:00
Gagah Pangeran Rosfatiputra
cfd28c51bb
change block quote backgroudn width
Reference : 376cac43a0/resources/assets/less/base.less (L7-L10)
2021-05-06 08:28:37 +07:00
Gagah Pangeran Rosfatiputra
4567abe3db
add xmldoc for GetTextMarker 2021-05-06 08:28:37 +07:00
Gagah Pangeran Rosfatiputra
9bb80492c5
add level and isOrdered parameter 2021-05-06 05:29:29 +07:00
Gagah Pangeran Rosfatiputra
99e0cc9bbe
rename CreateTextMarker to GetTextMarker 2021-05-06 05:15:32 +07:00
Gagah Pangeran Rosfatiputra
3ddf551b03
remove unused this 2021-05-06 05:13:54 +07:00
Gagah Pangeran Rosfatiputra
266d8d8282
move list item constant position 2021-05-06 05:13:39 +07:00
Salman Ahmed
2a67361dc0 OnOperation -> TriggerOperation 2021-05-05 21:50:16 +03: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
Salman Ahmed
1ac80d42f9
Merge branch 'master' into corner-rotation-controls 2021-05-04 23:53:23 +03: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