Dean Herbert
|
0372e38f57
|
Add nullability assertion to appease CI
|
2022-12-11 13:00:12 +09:00 |
|
Dean Herbert
|
061f7d4857
|
Merge branch 'master' into osr-scoreinfo-data
|
2022-12-11 12:24:03 +09:00 |
|
Dan Balasescu
|
e9998f1690
|
Store maximum statistics to spectator state
|
2022-12-09 20:15:07 +09:00 |
|
Dan Balasescu
|
4a65f5c864
|
Add score token to spectator state
|
2022-12-09 19:09:51 +09:00 |
|
Dan Balasescu
|
3570fa8d93
|
Fix hub clients not reconnecting after connection error
|
2022-12-09 17:12:20 +09:00 |
|
dependabot[bot]
|
cdf76077b2
|
Bump Newtonsoft.Json from 13.0.1 to 13.0.2 in /osu.Game
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2)
---
updated-dependencies:
- dependency-name: Newtonsoft.Json
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-12-08 05:38:06 +00:00 |
|
Dean Herbert
|
f21e903a94
|
Update framework
|
2022-12-08 14:06:38 +09:00 |
|
Dan Balasescu
|
313f6e2f10
|
Merge pull request #21558 from peppy/fix-wrong-di
Fix incorrect resolution of `GameHost` in `LegacyImportManager`
|
2022-12-08 12:59:31 +09:00 |
|
Dan Balasescu
|
2406b8dfc8
|
Merge pull request #21557 from Joehuu/nominated-ranked-beatmaps
Display nominated ranked beatmaps in user profile
|
2022-12-08 11:40:24 +09:00 |
|
Dan Balasescu
|
e00c075482
|
Fix incorrectly modified first lazer version
|
2022-12-08 11:30:18 +09:00 |
|
Dean Herbert
|
f6e0aba53d
|
Merge pull request #21564 from Loreos7/master
Fix stale keybinding in "today's tip"
|
2022-12-08 11:23:09 +09:00 |
|
Bartłomiej Dach
|
5857471915
|
Merge branch 'master' into nominated-ranked-beatmaps
|
2022-12-07 23:54:25 +01:00 |
|
Bartłomiej Dach
|
3f4cab9ad1
|
Merge branch 'master' into fix-profile-beatmap-expand
|
2022-12-07 21:10:07 +01:00 |
|
Loreos7
|
0aeee8d6ab
|
fix typo in today's tip
|
2022-12-07 17:47:37 +03:00 |
|
Dean Herbert
|
819fd5f950
|
Fix incorrect resolution of GameHost in LegacyImportManager
|
2022-12-07 17:53:14 +09:00 |
|
Dean Herbert
|
62b0436bcf
|
Reverse depth of profile sections to allow for overflowing expanded beatmap cards
Closes #21554.
|
2022-12-07 16:38:17 +09:00 |
|
Joseph Madamba
|
56e94e49a3
|
Display nominated ranked beatmaps in user profile
|
2022-12-06 23:36:11 -08:00 |
|
Dean Herbert
|
0497e433b1
|
Change SectionsContainer to use flowing children for section update logic
|
2022-12-07 16:30:15 +09:00 |
|
Dean Herbert
|
c5e461e734
|
Update framework
|
2022-12-07 16:28:51 +09:00 |
|
Dean Herbert
|
e8766570c5
|
Update resources
|
2022-12-07 16:06:53 +09:00 |
|
Dean Herbert
|
d8d25c704f
|
Merge pull request #21551 from peppy/fix-latency-certifier-butons
Remove triangle effect from latency certifier buttons
|
2022-12-07 15:55:39 +09:00 |
|
Dean Herbert
|
70e0a04af8
|
Merge pull request #21541 from bdach/difficulty-bindable-regression
Fix extended values in difficulty adjust being truncated to 10 on beatmap change
|
2022-12-07 15:05:07 +09:00 |
|
Dean Herbert
|
eea7984ba9
|
Remove triangle effect from latency certifier buttons
|
2022-12-07 14:53:56 +09:00 |
|
Dan Balasescu
|
8709b1f2ea
|
Immediately send ack request when joining new channels
|
2022-12-07 14:24:20 +09:00 |
|
Dan Balasescu
|
df181acffe
|
Append lazer score data to .osr files
|
2022-12-07 12:12:32 +09:00 |
|
Bartłomiej Dach
|
81a42dc05d
|
Fix extended values in difficulty adjust being truncated to 10 on beatmap change
|
2022-12-06 23:25:48 +01:00 |
|
Dan Balasescu
|
e47f933cdc
|
Merge pull request #21520 from frenzibyte/fix-preview-track-disposal
Fix preview track disposal potentially leaving game track muted
|
2022-12-06 14:19:21 +09:00 |
|
Dan Balasescu
|
9ddc2f4804
|
Merge pull request #21523 from Feodor0090/rewind-click-fix
Perform rewind with right click only if cursor didn't leave the button
|
2022-12-06 13:38:20 +09:00 |
|
ansel
|
b66409bd37
|
Perform rewind with right click only if cursor didn't leave the button
|
2022-12-05 23:38:45 +03:00 |
|
Salman Ahmed
|
a457a2fbbf
|
Fix disposal of playing preview track not unmuting game track
|
2022-12-05 14:45:32 +03:00 |
|
Dan Balasescu
|
9e64f8dab1
|
Fix loss of precision when computing accuracy
|
2022-12-05 19:08:50 +09:00 |
|
Dean Herbert
|
c288873365
|
Merge pull request #21502 from EVAST9919/smooth-progress-remove
Remove SmoothCircularProgress component as being replaced
|
2022-12-05 14:49:32 +09:00 |
|
Salman Ahmed
|
af000c6e92
|
Fix RangeSlider potentially throwing exception on mobile platforms
|
2022-12-04 21:58:00 +03:00 |
|
Bartłomiej Dach
|
cb64919947
|
Merge branch 'master' into fix-exported-replay-overwrite
|
2022-12-03 21:09:19 +01:00 |
|
Dean Herbert
|
36ab6bc64e
|
Update framework
Update framework
|
2022-12-04 01:30:27 +09:00 |
|
Bartłomiej Dach
|
7f0d366d01
|
Extract common part of regex to separate method
|
2022-12-03 16:59:43 +01:00 |
|
Andrei Zavatski
|
41f7dad8e9
|
Delete SmoothCircularProgress.cs
|
2022-12-03 16:40:41 +03:00 |
|
Andrei Zavatski
|
97b6d88f00
|
Remove SmoothCircularProgress usage in AccuracyCircle
|
2022-12-03 16:39:44 +03:00 |
|
Andrei Zavatski
|
94cfcdb338
|
Remove SmoothCircularProgress usage in BeatmapCardThumbnail
|
2022-12-03 16:16:21 +03:00 |
|
Dean Herbert
|
49f5ac57b8
|
Fix first run beatmap screen button colours looking incorrect with new triangle effect
Addresses #21500.
|
2022-12-03 18:48:54 +09:00 |
|
Dean Herbert
|
5a69656764
|
Merge pull request #21496 from peppy/fix-zero-length-spinners
Fix being able to place zero-length spinners
|
2022-12-02 19:25:00 +09:00 |
|
Dan Balasescu
|
850931120d
|
Merge pull request #21479 from peppy/fix-wrong-last-hit-object-time
Fix some components not accounting for final hold notes in osu!mania beatmaps
|
2022-12-02 18:12:00 +09:00 |
|
Dean Herbert
|
d1296a22ce
|
Update timeline blueprint's end time logic to better match new blueprint implementation
|
2022-12-02 17:57:15 +09:00 |
|
Dean Herbert
|
ba99f1288c
|
Update IBeatSnapProvider documentation to mention the pre-divided BeatSnap
|
2022-12-02 17:57:15 +09:00 |
|
Dan Balasescu
|
eea9bd3898
|
Merge pull request #21463 from peppy/fix-chat-system-message-ordering
Fix system messages appearing out of order in chat display
|
2022-12-02 17:39:20 +09:00 |
|
Dan Balasescu
|
a39bd634c4
|
Merge pull request #21405 from LumpBloom7/Editor-DrawableRuleset-Dependencies
Provide DrawableRulesetDependencies from HitObjectComposer
|
2022-12-02 17:31:31 +09:00 |
|
Dan Balasescu
|
d684aa75b8
|
Merge pull request #21477 from peppy/fix-mania-timeline-blueprint-colour
Fix osu!mania editor timeline showing bright-white blueprints
|
2022-12-02 16:55:29 +09:00 |
|
Dean Herbert
|
25120060aa
|
Use new helper method in ModTimeRamp
|
2022-12-02 16:09:46 +09:00 |
|
Dean Herbert
|
a2db0afe19
|
Avoid querying GetLastObjectTime twice in editor seek flow
|
2022-12-02 16:07:24 +09:00 |
|
Dean Herbert
|
809d02cda0
|
Fix two implementation oversights
|
2022-12-02 16:05:14 +09:00 |
|
Dean Herbert
|
8cf89fcb81
|
Use Highlight1 instead of dull grey
|
2022-12-02 15:30:47 +09:00 |
|
Piggey
|
75cf7bd1d2
|
change GetNextBestFilename()'s parameters
|
2022-12-01 18:44:02 +01:00 |
|
Piggey
|
5de01686a9
|
extract findBestNumber() from GetNextBestName() into private method
|
2022-12-01 18:42:52 +01:00 |
|
Dean Herbert
|
d8dd7e7e0f
|
Fix test failures when no hitobjects are present in a scrolling ruleset
|
2022-12-01 21:42:03 +09:00 |
|
Dean Herbert
|
896f2d8f74
|
Fix multiple instances of last hitobject time being calculated incorrectly
|
2022-12-01 18:04:06 +09:00 |
|
Dean Herbert
|
f34a79b1a9
|
Set a better default colour for timeline blueprints when no colour information is available
|
2022-12-01 17:03:53 +09:00 |
|
Dean Herbert
|
bbf023cf68
|
Fix incorrect culture used when parsing timeline popup textbox content
|
2022-12-01 16:12:29 +09:00 |
|
Dean Herbert
|
c5bc071c4b
|
Merge pull request #21439 from LumpBloom7/Fix-DHO-load-state
Update DrawableHitObject state based on entry result during LoadComplete
|
2022-12-01 15:36:36 +09:00 |
|
Bartłomiej Dach
|
2e19e93036
|
Rename method
|
2022-11-30 22:54:14 +01:00 |
|
Bartłomiej Dach
|
6ebde9a747
|
Annotate Playfield.Mods as maybe-null
|
2022-11-30 20:00:25 +01:00 |
|
Piggey
|
8f59aad91c
|
unnecessary includes
|
2022-11-30 18:37:50 +01:00 |
|
Piggey
|
8b856f1c89
|
make LegacyExporter use NamingUtils.GetNextBestFilename()
|
2022-11-30 18:32:53 +01:00 |
|
Piggey
|
8412a44179
|
create NamingUtils.GetNextBestFilename()
|
2022-11-30 18:32:14 +01:00 |
|
Piggey
|
b99ddc2acf
|
use .Select() to trim the file extension from filename
|
2022-11-30 15:36:08 +01:00 |
|
Derrick Timmermans
|
5c8fce1c08
|
Remove extra blank line
|
2022-11-30 13:05:14 +01:00 |
|
Derrick Timmermans
|
6a61e70766
|
Expose Ruleset from HitObjectComposer instead
|
2022-11-30 12:17:58 +01:00 |
|
Piggey
|
660ad913ec
|
oh wait this affects all of the legacy exporters
|
2022-11-30 11:06:44 +01:00 |
|
Dawid Sośnia
|
f0b8b53e81
|
Merge branch 'ppy:master' into fix-exported-replay-overwrite
|
2022-11-30 10:54:12 +01:00 |
|
Piggey
|
5e74c4e3b7
|
override LegacyScoreExporter.Export() to not overwrite files
|
2022-11-30 10:52:41 +01:00 |
|
Piggey
|
f5d85f5774
|
make ExportStorage protected
|
2022-11-30 10:51:42 +01:00 |
|
Dean Herbert
|
5ce2d6f54a
|
Hide the game mouse cursor when playing osu!catch with relax mod
|
2022-11-30 18:13:53 +09:00 |
|
Dean Herbert
|
bb0237d4a9
|
Fix nullability inspection on disposal path
|
2022-11-30 17:49:08 +09:00 |
|
Dean Herbert
|
4215f4f5d7
|
Merge branch 'master' into Editor-DrawableRuleset-Dependencies
|
2022-11-30 17:42:46 +09:00 |
|
Dean Herbert
|
b1ce93e7bf
|
Add fallback stable sort to avoid any change of misordered local messages
|
2022-11-30 16:55:39 +09:00 |
|
Dean Herbert
|
f7b7b58718
|
Adjust colour and tween to feel better
|
2022-11-30 16:20:01 +09:00 |
|
Dean Herbert
|
24ee363563
|
Only hover when hovering actual text
|
2022-11-30 16:18:36 +09:00 |
|
Dean Herbert
|
80b0e4a99d
|
Rename Colour to avoid conflict with Drawable.Colour
|
2022-11-30 16:15:50 +09:00 |
|
Dean Herbert
|
7fca5ee28d
|
Move DrawableUsername into own file
It's too large at this point to be a nested class.
|
2022-11-30 16:15:50 +09:00 |
|
Dean Herbert
|
9ab4664fcc
|
Merge branch 'master' into chat-profile-highlight-v2
|
2022-11-30 16:15:48 +09:00 |
|
Dean Herbert
|
b7f0310070
|
Merge pull request #21353 from peppy/no-initial-presence
Stop requesting messages as part of initial chat presence
|
2022-11-30 16:15:23 +09:00 |
|
Dean Herbert
|
6524914dbd
|
Merge branch 'master' into chat-profile-highlight-v2
|
2022-11-30 16:00:52 +09:00 |
|
Dean Herbert
|
78f70dae75
|
Merge pull request #21420 from cdwcgt/NowPlaying
Show mods, ruleset and unicode metadata in "now playing" chat command
|
2022-11-30 15:57:52 +09:00 |
|
Dean Herbert
|
2d8854cbac
|
Change message comparator to always use timestamp comparison if either message has a missing Id
|
2022-11-30 15:46:58 +09:00 |
|
Dean Herbert
|
9e34fe360a
|
Ensure all LocalMessages get a timestamp
|
2022-11-30 15:46:36 +09:00 |
|
Dean Herbert
|
c84f011bb7
|
Improve ToString output of Message
|
2022-11-30 15:46:14 +09:00 |
|
Dean Herbert
|
b29054d30d
|
Merge pull request #21434 from jai-x/control-point-scroll-into-view
Ensure currently selected control point will scroll into view
|
2022-11-30 15:14:14 +09:00 |
|
Dean Herbert
|
d5301c75c1
|
Merge pull request #21460 from EVAST9919/triangles-v2-remove-texture
Remove texture usage in TrianglesV2 component
|
2022-11-30 15:13:08 +09:00 |
|
Dean Herbert
|
8bf5d6884d
|
Add ruleset to now playing string
|
2022-11-30 14:47:16 +09:00 |
|
Dean Herbert
|
b453eecebe
|
Ensure empty pieces do not result in whitespace between elements
|
2022-11-30 14:43:21 +09:00 |
|
Dean Herbert
|
2df6ccf33e
|
Tidy up code
|
2022-11-30 14:31:54 +09:00 |
|
Dean Herbert
|
b5c514a8f0
|
Make incoming Channel target non-nullable
|
2022-11-30 14:30:20 +09:00 |
|
Dean Herbert
|
69bf0df179
|
Merge branch 'master' into NowPlaying
|
2022-11-30 14:27:37 +09:00 |
|
Dean Herbert
|
2a3b24d058
|
Avoid need for implicit null casting
|
2022-11-30 14:21:04 +09:00 |
|
Dean Herbert
|
0659c84341
|
Rename method to be more in line with project naming
|
2022-11-30 14:17:49 +09:00 |
|
Dean Herbert
|
63ba40ff39
|
Merge branch 'master' into control-point-scroll-into-view
|
2022-11-30 14:12:19 +09:00 |
|
Dan Balasescu
|
fcd7c27bc2
|
Merge pull request #21451 from peppy/update-framework
Update framework
|
2022-11-30 13:39:08 +09:00 |
|
Dan Balasescu
|
3f4d8b39ca
|
Update package again
|
2022-11-30 12:55:45 +09:00 |
|
Andrei Zavatski
|
2eaefcad30
|
Remove unused renderer
|
2022-11-30 04:56:07 +03:00 |
|
Andrei Zavatski
|
3b13ca1167
|
Remove texture from TrianglesV2
|
2022-11-30 04:09:46 +03:00 |
|
Jai Sharma
|
7dbf379351
|
Don't use verbatim string literals
|
2022-11-29 18:22:07 +00:00 |
|
Dean Herbert
|
08a403cb33
|
Merge pull request #21428 from mk56-spn/RangeSlider_implementation
Refactor star "DifficultyRangeFilterControl" into generic range slider
|
2022-11-29 16:08:13 +09:00 |
|
Dean Herbert
|
56a694fb04
|
Add automated test coverage of simple scenarios for RangeSlider
|
2022-11-29 15:10:21 +09:00 |
|
Dean Herbert
|
61c702c02e
|
Add new IDependencyInjectionCandidate interface to non-drawable cached classes
|
2022-11-29 14:45:26 +09:00 |
|
Dean Herbert
|
b5b79e09e4
|
Remove unnecessary CQ disable
|
2022-11-29 14:45:08 +09:00 |
|
Bartłomiej Dach
|
8f78d6179b
|
Fix multiple issues with settings items unhiding on search
|
2022-11-29 14:41:49 +09:00 |
|
Bartłomiej Dach
|
24deb5f5f4
|
Remove all unnecessary usage of IHasFilterableChildren
|
2022-11-29 14:40:52 +09:00 |
|
Dean Herbert
|
96e19d4d84
|
Update framework
|
2022-11-29 14:36:23 +09:00 |
|
Dan Balasescu
|
198303513b
|
Merge pull request #21450 from Feodor0090/comments-btns-loc
Add missing localization in `DrawableComment`
|
2022-11-29 13:47:46 +09:00 |
|
ansel
|
16962d9a57
|
Localize deleted string
|
2022-11-29 07:02:02 +03:00 |
|
ansel
|
a4819e5c9c
|
Localize actions
|
2022-11-29 07:01:52 +03:00 |
|
Alden Wu
|
8ec4dd046e
|
Fix InspectCode errors
|
2022-11-28 18:06:44 -08:00 |
|
Alden Wu
|
0cb7c94c21
|
Merge branch 'master' of https://github.com/ppy/osu into chat-profile-highlight-v2
|
2022-11-28 17:59:15 -08:00 |
|
Alden Wu
|
c2d8ffc225
|
Refactor ChatLine username drawable creation
|
2022-11-28 17:50:12 -08:00 |
|
Andrei Zavatski
|
3e277a92e9
|
Fix incorrect texel size calculation
|
2022-11-29 03:21:59 +03:00 |
|
Andrei Zavatski
|
ba1717c2ca
|
Don't draw 0 thickness triangles
|
2022-11-29 02:36:27 +03:00 |
|
Derrick Timmermans
|
93ba84e5ff
|
Fix code style
|
2022-11-27 21:48:44 +01:00 |
|
Derrick Timmermans
|
70c320b2e8
|
Provide ruleset dependencies only to Compose Placement Blueprints
|
2022-11-27 21:43:33 +01:00 |
|
Derrick Timmermans
|
cff3e06ad6
|
Update state based on result during LoadComplete
|
2022-11-27 20:57:00 +01:00 |
|
mk56-spn
|
db7f429e39
|
Fix partial class issues and adjust test slightly
|
2022-11-27 10:44:05 +01:00 |
|
mk56-spn
|
0aba119056
|
Merge remote-tracking branch 'origin/RangeSlider_implementation' into RangeSlider_implementation
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeFilterControl.cs
# osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
|
2022-11-27 10:40:29 +01:00 |
|
Jai Sharma
|
218c04c174
|
Code quality
|
2022-11-27 03:23:08 +00:00 |
|
Jai Sharma
|
6000e14668
|
Correctly select issue row
|
2022-11-27 03:08:54 +00:00 |
|
Jai Sharma
|
3c56b9c93a
|
Add OnRowSelected event to EditorTable
|
2022-11-27 02:47:54 +00:00 |
|
Jai Sharma
|
792334a190
|
Move Control Group timing data into it's own component
|
2022-11-27 02:47:02 +00:00 |
|
Jai Sharma
|
b6d7bec240
|
Remove #nullable disabled from EditorTable and it's derived classes
|
2022-11-27 02:45:56 +00:00 |
|
Jai Sharma
|
1a914d0df7
|
Remove #nullable disable from TimingScreen
|
2022-11-27 02:43:22 +00:00 |
|
cdwcgt
|
e16f8a4410
|
Merge branch 'master' into NowPlaying
|
2022-11-27 08:48:49 +08:00 |
|
cdwcgt
|
02e3ebe1a0
|
DifficultyIncrease use + and other all -
mod.Name to mod.Acronym
|
2022-11-27 09:44:09 +09:00 |
|
cdwcgt
|
653875bbb4
|
only post mod when ingame
|
2022-11-27 09:41:41 +09:00 |
|
cdwcgt
|
8ecb4aa30b
|
better method name
|
2022-11-27 09:41:08 +09:00 |
|
Bartłomiej Dach
|
fd16e5992b
|
Merge branch 'master' into triangles-fix
|
2022-11-26 19:28:55 +01:00 |
|
Dean Herbert
|
d1eedd081c
|
Update resources
|
2022-11-27 02:46:11 +09:00 |
|
Andrei Zavatski
|
7ab5136e12
|
Compute texel size in the DrawNode
|
2022-11-26 20:05:34 +03:00 |
|
Bartłomiej Dach
|
c42720acd4
|
Temporarily disable "partial class with one part" inspection
|
2022-11-26 18:05:08 +01:00 |
|
Bartłomiej Dach
|
212d78865a
|
Add a few more missing partial specs
|
2022-11-26 16:30:52 +01:00 |
|
Bartłomiej Dach
|
894ef15e79
|
Merge branch 'master' into update-framework
|
2022-11-26 16:19:36 +01:00 |
|
Dan Balasescu
|
7bc8908ca9
|
Partial everything
|
2022-11-27 00:00:27 +09:00 |
|
Dean Herbert
|
a1c559ae05
|
Update framework
|
2022-11-27 00:00:12 +09:00 |
|
mk56-spn
|
92ed2ed4ef
|
Refactor star "DifficultyRangeFilterControl" into generic range slider class
|
2022-11-26 12:19:08 +01:00 |
|
Bartłomiej Dach
|
ca0597b38e
|
Merge branch 'master' into dont-change-ruleset-convert
|
2022-11-25 19:23:36 +01:00 |
|
Bartłomiej Dach
|
73176a1315
|
Merge branch 'master' into triangle-button-v2
|
2022-11-25 18:35:59 +01:00 |
|
Bartłomiej Dach
|
bbbc1d0428
|
Darken colour of playlists create button
To match d0c4637683.
|
2022-11-25 18:23:28 +01:00 |
|
cdwcgt
|
13f86f3e53
|
Merge branch 'master' into NowPlaying
|
2022-11-25 23:22:52 +09:00 |
|
cdwcgt
|
a2ea7a3f58
|
show selected mod and use ILocalisedBindableString in np
|
2022-11-25 23:20:44 +09:00 |
|
Dean Herbert
|
5ada9efa60
|
Update outdated comment regarding colour choices
|
2022-11-25 22:10:20 +09:00 |
|
Dean Herbert
|
76e9382e0b
|
Fix triangles showing on ExpandableButtons when in contracted state
|
2022-11-25 20:18:35 +09:00 |
|
Dean Herbert
|
d0c4637683
|
Lighten colour of multiplayer create game button
|
2022-11-25 20:18:21 +09:00 |
|
Dean Herbert
|
b0f14d4963
|
Clamp AimCount to ensure at least one triangle is spawned
|
2022-11-25 20:14:21 +09:00 |
|
Dean Herbert
|
4cb068ceb9
|
Change AimCount to not consider height
|
2022-11-25 20:10:04 +09:00 |
|
Dean Herbert
|
25410c9962
|
Avoid changing ruleset when presenting a beatmap if it can be converted
Closes #21415.
|
2022-11-25 19:48:01 +09:00 |
|