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

2382 Commits

Author SHA1 Message Date
Bartłomiej Dach
902bb84ca8
Merge branch 'master' into fix-wave-overlay-sound-on-switch 2021-06-11 22:05:08 +02:00
Dean Herbert
121df57dca Fix focused overlays playing their "appear" sound when not necessarily changing state 2021-06-12 00:26:33 +09:00
Dean Herbert
e098cac1cf Minor code reformatting / moving 2021-06-11 23:49:14 +09:00
Dean Herbert
5887b4a27c Update stand-alone usage of hover/select sounds in DrawableOsuMenuItem 2021-06-11 23:46:42 +09:00
Jamie Taylor
0b95d07390
Change 'default' hover/click samples into 'button' samples and make 'soft' the new 'default' 2021-06-11 20:47:57 +09:00
Jamie Taylor
4f80a3b66d
Add fallback-to-default logic for HoverSounds and HoverClickSounds 2021-06-11 20:14:35 +09:00
Jamie Taylor
15d3b4444d
Rename HoverSounds and HoverClickSounds samples 2021-06-11 19:34:54 +09:00
Bartłomiej Dach
417aaacc53 Add test coverage for romanised data transfer 2021-06-10 22:18:39 +02:00
Bartłomiej Dach
e41a5a0fcd Add romanised author & title fields 2021-06-10 22:17:45 +02:00
Dean Herbert
9a3ca09501
Merge pull request #13384 from bdach/fixed-label-width
Align label widths of editor setup screen controls
2021-06-10 14:55:49 +09:00
Gagah Pangeran Rosfatiputra
28d7b06908
create OsuMarkdownImage 2021-06-10 09:38:07 +07:00
Bartłomiej Dach
023015f9a6 Merge branch 'master' into fix-skin-background-regression 2021-06-09 08:09:21 +02:00
Dean Herbert
f41e34ae2c Remove more obsoleted members 2021-06-09 14:10:48 +09:00
Bartłomiej Dach
97204b6f27 Reduce unnecessary background changes via IEquatable implementation 2021-06-08 22:37:18 +02:00
Bartłomiej Dach
5bf4dd6358 Move skin background to separate file 2021-06-08 21:57:08 +02:00
Bartłomiej Dach
88266eac63 Add option to fix label width of a LabelledDrawable 2021-06-08 16:57:32 +02:00
Dean Herbert
e8d4147773 Add missing null handling for never Markdig version 2021-06-07 16:08:44 +09:00
Dean Herbert
840f084dc4
Merge pull request #13303 from LeNitrous/mainmenu-storyboard-backgrounds
Add storyboards as a main menu background source
2021-06-04 19:50:40 +09:00
Dean Herbert
19a44d65c5 Tidy up code 2021-06-04 15:18:16 +09:00
Nathan Alo
996c156106 apply suggestions
- apply 0 alpha to beatmap background if storyboard replaces it
- use an AudioContainer to mute all samples coming from the storyboard
2021-06-04 13:56:10 +08:00
Nathan Alo
d7d0dde5d2 use created storyboard to check for drawables instead 2021-06-03 13:56:14 +08:00
Nathan Alo
62b07fb9ce apply suggestions
- Replace the sprite with a solid black box when a storyboard requests it.
- Create a new storyboard instance and exclude the fail layer as well as strip all samples from it
- Do not attempt in creating the storyboard when it isn't needed
2021-06-03 13:27:00 +08:00
Nathan Alo
d00fb21188 prevent scaling container from creating a storyboard background 2021-06-03 13:24:21 +08:00
Dean Herbert
a62dd7cca0 Revert "refactor BeatmapBackgroundWithStoryboard to reduce overhead"
This reverts commit 277545bb06.
2021-06-03 12:33:16 +09:00
Nathan Alo
277545bb06 refactor BeatmapBackgroundWithStoryboard to reduce overhead
This avoids loading the sprite if its not needed and instead of hiding it, it is removed when the storyboard replaces the background or there is a video.

This also only initializes DrawableStoryboard if there are any elements in any layer.
2021-06-02 20:27:12 +08:00
Nathan Alo
3c3ef13632 remove fade 2021-06-02 16:28:22 +08:00
Nathan Alo
e66f6e8f91 fix inspect code issues and cleanup code 2021-06-02 16:12:41 +08:00
Nathan Alo
dec18ef826 implement BeatmapBackgroundWithStoryboard 2021-06-02 15:50:58 +08:00
Dan Balasescu
47019196f6
Merge branch 'master' into fix-relative-link-resolution 2021-06-02 14:55:38 +09:00
Dean Herbert
ac761bb075 Use string.Empty instead of arbitrary string 2021-06-02 14:43:35 +09:00
Dean Herbert
3668f1861f Fix one more null issue 2021-06-01 17:10:09 +09:00
Dean Herbert
145e42928b Fix remaining null checks 2021-06-01 16:49:05 +09:00
Gagah Pangeran Rosfatiputra
b4dd935538
add corner radius and padding 2021-06-01 14:14:12 +07:00
Gagah Pangeran Rosfatiputra
5108dadfbc
use inline code in markdown text flow 2021-06-01 14:03:57 +07:00
Gagah Pangeran Rosfatiputra
1babb05fc7
add OsuMarkdownInlineCode 2021-06-01 14:03:31 +07:00
Dean Herbert
3ff97f787a Localise all URL generation for now to avoid weird Schedule logic 2021-06-01 13:56:59 +09:00
Gagah Pangeran Rosfatiputra
e02739a136
remove unused colour provider 2021-05-26 13:57:35 +07:00
Gagah Pangeran Rosfatiputra
04f16c0783
Set DocumentUrl inside CreateChildDependencies
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-05-26 13:55:16 +07:00
Dean Herbert
200592114f Make protected variables private 2021-05-26 14:13:02 +09:00
Gagah Pangeran Rosfatiputra
728258d93a
add website root url as document url 2021-05-25 00:29:59 +07:00
Gagah Pangeran Rosfatiputra
02cdd0b2de
use drawable link compiler in markdown link 2021-05-24 19:10:37 +07:00
Dean Herbert
b0a113a36b Merge branch 'master' into localisation-proof-of-concept 2021-05-21 17:57:54 +09:00
Dean Herbert
0f4b502fdf Add missing xmldoc 2021-05-20 20:09:22 +09:00
Dean Herbert
df5970fab4 Create base implementations of the two most common TernaryStateMenuItems 2021-05-20 19:34:53 +09:00
Dan Balasescu
ce7c503e6e
Merge branch 'master' into playlist-unicode 2021-05-17 11:47:10 +09:00
Dean Herbert
1bb3c609ae Centralise implementation of cancel button logic 2021-05-11 18:39:14 +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
smoogipoo
cd25d76dbe Merge branch 'master' into localisation-proof-of-concept 2021-05-08 18:11:07 +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
a2e4fb5b6b Update ScoreCounter components to bind outwards 2021-05-07 16:16:48 +09: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
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
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
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
Bartłomiej Dach
3cac837acf
Merge branch 'master' into skin-bindables 2021-05-05 20:16:27 +02:00
Gagah Pangeran Rosfatiputra
63381ff4f2
change heading font weight
h1 and h2 : Semi Bold (600)
- 376cac43a0/resources/assets/less/bem/osu-md.less (L111)
- 376cac43a0/resources/assets/less/bem/osu-md.less (L135)

The rest of heading : Bold (700)
- 376cac43a0/resources/assets/less/bem/osu-md.less (L97)
2021-05-04 09:34:21 +07:00
Gagah Pangeran Rosfatiputra
bfc328c5ab
change font weight for bold text 2021-05-04 09:09:51 +07:00
Dean Herbert
f36684a070 Guard against non-threadsafe transformation logic in ScalingContainer- 2021-05-03 15:17:04 +09:00
Dean Herbert
3dd4b7b746 Fix use of non-existent word in OsuFocusedOverlayContainer xmldoc 2021-05-03 15:08:34 +09:00
Gagah Pangeran Rosfatiputra
3e7df3bf02
change heading font size
Heading 1 : 30px
- 31579d45aa/resources/assets/less/base.less (L12-L16)

Heading 2 : 26px
- 31579d45aa/resources/assets/less/bem/osu-md.less (L133-L134)
- 31579d45aa/resources/assets/less/variables.less (L169)

Heading 3 : 20px
- 31579d45aa/resources/assets/less/bem/osu-md.less (L147-L148)
- 31579d45aa/resources/assets/less/variables.less (L170)
- 31579d45aa/resources/assets/less/variables.less (L154)

Heading 4 : 18px
- 31579d45aa/resources/assets/less/bem/osu-md.less (L160-L161)
- 31579d45aa/resources/assets/less/variables.less (L171)
- 31579d45aa/resources/assets/less/variables.less (L153)

Heading 5 : 16px
- 31579d45aa/resources/assets/less/bem/osu-md.less (L174-L175)
- 31579d45aa/resources/assets/less/variables.less (L172)
- 31579d45aa/resources/assets/less/variables.less (L152)

Heading 6 : 14px
- 31579d45aa/resources/assets/less/bem/osu-md.less (L183-L184)
- 31579d45aa/resources/assets/less/variables.less (L173)
- 31579d45aa/resources/assets/less/variables.less (L150)
2021-05-03 09:35:59 +07:00
Gagah Pangeran Rosfatiputra
b497785416
add OsuMarkdownHeading 2021-05-03 09:35:55 +07:00
Gagah Pangeran Rosfatiputra
8a2926c0b5
change default font size to 14
Reference :
- 31579d45aa/resources/assets/less/bem/osu-md.less (L9)
- 31579d45aa/resources/assets/less/variables.less (L161)
2021-05-03 09:18:45 +07:00
Gagah Pangeran Rosfatiputra
18bfcd7b22
add hover colour to OsuMarkdownLinkText 2021-05-02 22:41:11 +07:00
Gagah Pangeran Rosfatiputra
88aaa9b332
add inline code colour
Reference : 31579d45aa/resources/assets/less/bem/osu-md.less (L12-L17)
2021-05-02 22:35:30 +07:00
Gagah Pangeran Rosfatiputra
fc4fa4f696
use ListBlock IsOrdered to determine ordered or unordered list 2021-04-30 11:48:37 +07:00
Gagah Pangeran Rosfatiputra
11d0f12455
change create text marker to virtual 2021-04-30 11:36:51 +07:00
Gagah Pangeran Rosfatiputra
cf53a05dfd
change marker size and position for ordered list 2021-04-30 10:59:23 +07:00
Gagah Pangeran Rosfatiputra
e6579352f9
add left padding for ordered list
In osu-md.less, this rule style[1] removes padding left in ordered list.
But in this rule style[2], pseudo element `::before` is used as marker
or counter and has minimal width 30px. So we use this as left padding
size.

[1] 5b0e3ac3ff/resources/assets/less/bem/osu-md.less (L196-L200)
[2] 5b0e3ac3ff/resources/assets/less/bem/osu-md.less (L210-L219)
2021-04-30 10:56:41 +07:00
Gagah Pangeran Rosfatiputra
c0d9f9f8c6
use order number as marker for ordered list 2021-04-30 10:48:12 +07:00
Gagah Pangeran Rosfatiputra
2a3479f30d
add order in OsuMarkdownListItem for ordered list 2021-04-30 10:47:51 +07:00
Gagah Pangeran Rosfatiputra
781064ba96
create list marker based on its level 2021-04-30 10:40:06 +07:00
Gagah Pangeran Rosfatiputra
f676526cf4
add level in OsuMarkdownListItem 2021-04-30 10:39:48 +07:00
Gagah Pangeran Rosfatiputra
e3cc4561ab
add bullet marker in OsuMarkdownListItem 2021-04-30 10:35:40 +07:00
Gagah Pangeran Rosfatiputra
010c51e6ed
change OsuMarkdownListItem to composite drawable 2021-04-30 10:12:43 +07:00
Gagah Pangeran Rosfatiputra
1e8b3f3a8c
handle list padding in OsuMarkdownListItem
Reference : 5b0e3ac3ff/resources/assets/less/bem/osu-md.less (L193-L194)
2021-04-30 09:47:25 +07:00
Gagah Pangeran Rosfatiputra
a24a279404
use OsuMarkdownListItem for ListItemBlock 2021-04-30 09:43:21 +07:00
Gagah Pangeran Rosfatiputra
820408757a
add OsuMarkdownListItem 2021-04-30 09:43:05 +07:00
Dean Herbert
141d3af302 Add the ability to temporarily disable user scaling on a ScalingContainer 2021-04-29 17:19:47 +09:00
Gagah Pangeran Rosfatiputra
c09067c3d5
add OsuMarkdownTable 2021-04-28 10:53:12 +07:00
Gagah Pangeran Rosfatiputra
2252d308c8
add OsuMarkdownTableCell
Reference :
d56352aeef/resources/assets/less/bem/osu-md.less (L254-L277)
2021-04-28 10:53:00 +07:00
Gagah Pangeran Rosfatiputra
736eace00a
add OsuMarkdownQuoteBlock
Reference:
d56352aeef/resources/assets/less/base.less (L7-L10)
2021-04-28 10:11:29 +07:00
Gagah Pangeran Rosfatiputra
6a921af085
add OsuMarkdownSeparator
Reference
d56352aeef/resources/assets/less/bem/osu-md.less (L19-L21)
2021-04-28 09:23:05 +07:00
Gagah Pangeran Rosfatiputra
6959f2a8cc
add OsuMarkdownFencedCodeBlock
Reference :
d56352aeef/resources/assets/less/bem/osu-md.less (L41-L45)
2021-04-27 16:01:32 +07:00
Gagah Pangeran Rosfatiputra
6cccbabad8
override CreateTextFlow in OsuMarkdownContainer 2021-04-27 14:19:16 +07:00
Gagah Pangeran Rosfatiputra
c686c5224b
add OsuMarkdownTextFlowContainer 2021-04-27 14:17:51 +07:00
Gagah Pangeran Rosfatiputra
aa07482cbb
Add OsuMarkdownLinkText
Color from
d56352aeef/resources/assets/less/functions.less (L159-L165)
2021-04-27 14:15:19 +07:00
Gagah Pangeran Rosfatiputra
b75b9a97ed
add OsuMarkdownContainer
All of the markdown file in osu-wiki have YAML frontmatter. This YAML is
parsed as common markdown paragraph. So we add `UseYamlFrontMatter()` in
markdown pipeline builder to parse YAML as `YamlFrontMatterBlock`.
2021-04-27 14:09:58 +07:00
Dean Herbert
db524e2395 Add localisation support to DialogButton's text 2021-04-20 17:06:12 +09:00
Bartłomiej Dach
2a7ef1f80f Use more general type 2021-04-19 19:27:35 +02:00
Bartłomiej Dach
d5829fe638 Merge branch 'master' into playlist-unicode 2021-04-19 19:24:04 +02:00
Bartłomiej Dach
0825fc57a9 Move foreground colour helper into OsuColour 2021-04-19 18:24:48 +02:00
Bartłomiej Dach
97573fb11d Merge branch 'master' into combo-colours-display 2021-04-19 18:21:57 +02:00
smoogipoo
ef3801b5dd Add helper method supporting RomanisableString 2021-04-19 15:29:26 +09:00
Dean Herbert
f9f514ffec Add basic xmldoc to show how the two colour classes interact 2021-04-19 12:37:56 +09:00
Joseph Madamba
89940e7bb9 Fix download button check icon not scaling on mouse down 2021-04-18 19:05:33 -07:00
Bartłomiej Dach
577755ee19 Add placeholder when no colours are visible
Will be removed once combo colours are mutable.
2021-04-18 20:46:42 +02:00
Bartłomiej Dach
0cd1aa8c1c Add support for custom colour prefixes 2021-04-18 20:44:55 +02:00
Bartłomiej Dach
a8027d87b6 Fix unreadable colour hex code text due to low contrast
Logic is shared with the timeline blueprints which also have the same
problem of displaying text on top of a combo colour.

Slightly modified the formula. Seems to yield better results on a
subjective check.
2021-04-18 20:44:55 +02:00
Bartłomiej Dach
1b2c43b92c Add basic structure of colour palette 2021-04-18 19:29:04 +02:00
PercyDan54
488001d570
Support SpriteText for LinkFlowContainer 2021-04-18 20:58:08 +08:00
Dean Herbert
ff2a37b7f4 Add new colours for editor designs 2021-04-14 20:10:50 +09:00
Dean Herbert
7654df94f6
Merge pull request #12395 from frenzibyte/fix-cinema-ignore-settings
Fix beatmap background displayed if storyboard is hidden on "Cinema" mod
2021-04-14 14:31:03 +09:00
Dean Herbert
2c1f20a38f Merge branch 'master' into fix-editor-alt-scroll 2021-04-13 19:36:25 +09:00
Salman Ahmed
36510309d1 Merge EnableUserDim and IgnoreUserSettings to one bindable 2021-04-13 10:58:56 +03:00
Dean Herbert
b5954a55ad Remove empty <returns> xmldoc 2021-04-12 17:46:14 +09:00
Dean Herbert
0eab9daf13 Update existing overlay containers to not block scroll input 2021-04-12 16:41:36 +09:00
Dean Herbert
dfe3240b45
Merge pull request #12353 from nekodex/songselect-hoversamples
Add a hover sample type for SongSelect buttons
2021-04-10 01:45:47 +09:00
Jamie Taylor
ffacd38e57 Reduce the randomised pitch range of hover sounds 2021-04-09 23:03:14 +09:00
Jamie Taylor
8a0da06e89 Add a hover sample type for SongSelect buttons 2021-04-09 23:00:40 +09:00
Dean Herbert
26d6f96c4e Fix LabelledTextBox not correctly forwarding focus to its underlying TextBox component 2021-03-17 16:56:58 +09:00
Dean Herbert
b1cd01ceb8 Apply ConfigureAwait changes to game side 2021-03-08 14:36:35 +09:00
Dean Herbert
8004652d27
Merge branch 'master' into optimised-has-flag-checks 2021-02-25 21:24:39 +09:00
smoogipoo
dff1d80f39 Update HasFlag usages to HasFlagFast 2021-02-25 15:38:56 +09:00
Dean Herbert
a362382d38 Add back more correct null checks 2021-02-25 14:06:21 +09:00
Dean Herbert
1fd76ea3fb Apply changes to UI components overriding functions with changing signatures 2021-02-22 19:01:42 +09:00
smoogipoo
d3f0c0730d Merge branch 'master' into non-concurrent-sample-playback 2021-02-12 17:22:15 +09:00
Dean Herbert
a073376920 Show URLs in tooltips when custom text has replaced the link 2021-02-12 15:32:31 +09:00
Dean Herbert
a2035a2e84 Stop hover sounds from playing when dragging (scrolling) 2021-02-12 12:22:35 +09:00
Dean Herbert
970039b7e3 Split out hover sample debounce logic so it can be more easily used in other places 2021-02-12 12:14:49 +09:00
Dean Herbert
3990738dbb
Merge pull request #11734 from nekodex/fix-checkbox-sound
Prevent the default on-click sample from playing for OsuCheckbox
2021-02-11 16:02:37 +09:00
Jamie Taylor
c8899aff92 Prevent the default on-click sample from playing for OsuCheckbox 2021-02-11 14:36:41 +09:00
Dean Herbert
cbdc189ab2 Merge branch 'new-overlay-sounds' into update-resources 2021-02-11 14:20:23 +09:00
Dean Herbert
26c9a60b0d Merge branch 'hover-pitch-randomisation' into update-resources 2021-02-11 14:20:22 +09:00
Dean Herbert
625eb78a11 Simplify with an early exit for null sample 2021-02-10 17:59:52 +09:00
Jamie Taylor
4e2ab0bad2 Use a separate sample set for Toolbar buttons 2021-02-10 17:48:36 +09:00
Jamie Taylor
73ab1b2b21 Add pitch randomisation to HoverSounds on-hover sample playback 2021-02-10 17:42:24 +09:00
Jamie Taylor
806324b196 Allow overriding of Overlay pop-in and pop-out samples 2021-02-10 15:44:05 +09:00
Dean Herbert
4bc324f040 Rename parameter to make more sense 2021-02-05 15:29:32 +09:00