h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 06:02:56 +08:00
Code Issues Releases Wiki Activity
41,884 Commits 3 Branches 657 Tags 364 MiB
50e316fca4
Commit Graph

4587 Commits

Author SHA1 Message Date
Andrei Zavatski
13a956f6fc Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-12 20:08:17 +03:00
Dean Herbert
55e1f97f59 Remove unused using statement 2021-05-12 19:06:40 +09:00
Dean Herbert
0a895fff15 Remove remaining test usage of SkinnableXXX HUD components 2021-05-12 18:53:25 +09:00
Salman Ahmed
80e231d90a Add failing test case 2021-05-12 11:42:55 +03:00
Dean Herbert
c6f0a6aed3
Merge pull request #12538 from smoogipoo/multiplayer-spectator-screen 
Implement the multiplayer spectator screen
 2021-05-12 17:24:35 +09:00
smoogipoo
273cd18b8a Use test streaming client in gameplay leaderboard test 2021-05-12 14:19:36 +09:00
smoogipoo
21fc0ba43b Combine test spectator streaming client implementations 2021-05-12 13:05:02 +09:00
Andrei Zavatski
085c3d067f Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-11 23:41:45 +03:00
Andrei Zavatski
b0297c6324 Fix incorrect no posts handling and add corresponding test 2021-05-11 20:52:11 +03:00
Andrei Zavatski
822d99e69f Remove pointless test scenes 2021-05-11 20:42:13 +03:00
Dean Herbert
048677846b Change HealthDisplay to be a CompositeDrawable 2021-05-11 23:10:30 +09:00
Andrei Zavatski
b79a0237a3 Fix TestSceneNewsYearsPanel error 2021-05-11 16:54:19 +03:00
Andrei Zavatski
c2ba16f977 Use relative sizing for MonthDropdown 2021-05-11 16:51:59 +03:00
Andrei Zavatski
208224cc0d CI fixes 2021-05-11 16:08:09 +03:00
Andrei Zavatski
705aad262a Rename MonthPanel to MonthDropdown 2021-05-11 15:42:40 +03:00
Andrei Zavatski
0a9c3c9413 Move metadata change logic to it's own method 2021-05-11 15:39:50 +03:00
Andrei Zavatski
9603712aa1 Cache metadata in NewsSideBar 2021-05-11 15:33:27 +03:00
Andrei Zavatski
82436334b2 Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-11 13:52:51 +03:00
smoogipoo
f5bc389998 Fix flaky tests 2021-05-11 19:31:32 +09:00
smoogipoo
bc4213eea1 Add test for changing back to idle on deletion 2021-05-11 19:26:58 +09:00
smoogipoo
7fe8737d94 Add failing tests 2021-05-11 19:21:44 +09:00
smoogipoo
811282a975 Add failing test 2021-05-11 19:01:41 +09:00
Dean Herbert
61ea3f2e64 Remove unnecessary test step creating needless skins 2021-05-11 18:39:15 +09:00
Dean Herbert
2396ba42a6 Change HealthDisplay to be a CompositeDrawable 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
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
Salman Ahmed
004ce95f33 Merge branch 'current-star-rating' into player-loader-star-rating 2021-05-11 09:53:10 +03: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
Andrei Zavatski
220eef0351 Remove overcomplicated date logic in MonthPanel 2021-05-10 17:00:18 +03:00
Andrei Zavatski
fbf8b198cd Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-10 16:47:15 +03:00
Dan Balasescu
e7355da201
Merge branch 'master' into osu-markdown 2021-05-10 20:02:04 +09:00
Dean Herbert
2ecd638f7f Merge branch 'master' into skin-components-list 2021-05-10 18:13:10 +09:00
Andrei Zavatski
0d243be457 CI fixes 2021-05-10 10:07:43 +03:00
Andrei Zavatski
4b97224932 Implement NewsSideBar component 2021-05-10 09:53:52 +03:00
Dean Herbert
97e72849af Fix regressed HitErrorDisplay behaviour (and localise binding to meter implementations) 2021-05-10 15:24:13 +09:00
Salman Ahmed
ca772b60b1 Use regular test steps rather than one-time set up and scheduling 2021-05-10 08:56:30 +03:00
Salman Ahmed
301dab1ce8 Refactor StarRatingDisplay to be mutable with a current bindable 2021-05-10 08:56:30 +03:00
Andrei Zavatski
7971a2ef48 Implement MonthPanel component 2021-05-10 08:47:00 +03:00
Andrei Zavatski
7ca3e13712 Implement basic years panel 2021-05-10 07:43:01 +03:00
Dean Herbert
52ce16f9f1
Merge branch 'master' into player-loader-star-rating 2021-05-10 12:46:10 +09:00
Dean Herbert
9ba412d27e Add the osu! logo to the test scene 
Makes no sense to add a test intended to test visual behaviour with one
of the main elements missing. Not sure how you would be able to test the
flow with the logo's presence.
 2021-05-10 12:44:08 +09:00
Dean Herbert
b7acf9de52 Make test work without manually clicking things 2021-05-10 12:36:56 +09:00
Dean Herbert
2b90bc4f1f Remove unnecessary ruleset switching steps 2021-05-10 12:35:37 +09:00
Dean Herbert
0c973feb53 Tidy up test scene 2021-05-10 12:34:21 +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
1d38fa29b5 Remove unused using statement 2021-05-10 12:23:04 +09:00
Dean Herbert
1bbbe80420 Fix missing instances of HealthProcessor caching 2021-05-10 12:22:24 +09:00
Dean Herbert
132bb7832d Fix some regressions when updating test scenes 2021-05-10 12:06:33 +09:00
Dean Herbert
b274fdf20d Merge branch 'master' into skin-components-bind-outwards-health 2021-05-10 11:13:44 +09: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
879c08e666 Use UntilStep instead of Assert to check button visibility 2021-05-09 10:06:36 +03:00
Andrei Zavatski
f0c1784d05 Use FirstOrDefault instead of First 2021-05-09 09:12:37 +03:00
Swords
1a465c60ca Rename Tests 2021-05-09 16:07:18 +10:00
Ibby
075350e125 Adding a reset button to individual keybinds 2021-05-09 15:51:17 +10:00
Andrei Zavatski
8868439ce4 Another approach to fix test scene failure 2021-05-09 06:49:12 +03:00
Andrei Zavatski
0818deac17 Fix potential test scene failure due to showMoreButton not being loaded in time 2021-05-09 06:06:34 +03:00
Christine Chen
ae2b5a0806 Actually test that player was exited 2021-05-08 22:42:14 -04:00
Andrei Zavatski
342c5a5938 Add tests to indicate the issue 2021-05-09 04:49:40 +03:00
Salman Ahmed
8fba655d2e Allow changing ruleset during test 2021-05-08 23:02:38 +03:00
Bartłomiej Dach
efb9164658 Restore previous test scene logic 2021-05-08 21:35:12 +02:00
Bartłomiej Dach
0bc6a026eb
Merge branch 'master' into skin-components-bind-outwards-accuracy 2021-05-08 21:08:53 +02:00
Salman Ahmed
f701c331f2 Add initial fade in to the metadata display 
Avoids first frame discrepancies from appearing in the test scene, those can be delt with later on, if needed.
 2021-05-08 21:19:46 +03: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
Salman Ahmed
ca55287dd0 Pass empty facade and replace random property with method instead 2021-05-08 18:43:45 +03:00
Salman Ahmed
3575d9847c Use regular test steps rather than one-time set up and scheduling 2021-05-08 18:21:29 +03:00
Salman Ahmed
d9605e8070 Remove test scene description 2021-05-08 18:18:23 +03:00
Salman Ahmed
26c0010fe6 Fix test not handling 0 beatmap sets 2021-05-08 13:03:50 +03:00
Salman Ahmed
dca5efc59a Remove no longer necessary ruleset info requirement 2021-05-08 13:00:39 +03:00
Salman Ahmed
0410edecaf Refactor StarRatingDisplay to be mutable with a current bindable 2021-05-08 12:55:34 +03:00
Salman Ahmed
b4801faf32 Pass ruleset info to constructor instead 
Follows the way working beatmap is passed, not sure why mods are passed as a bindable though, don't wanna bother too much with that.
 2021-05-08 11:57:13 +03:00
Salman Ahmed
169a283402 Add visual test scene 2021-05-08 11:47:18 +03:00
Christine Chen
8c564a69ed Fix InvalidOperationException when exiting a map at the end 2021-05-07 21:11:03 -04: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
3044b1c432 Add missing cache rules 2021-05-07 17:50:44 +09:00
Dean Herbert
6c255a0572 Fix drain start time being weirdly incorrect 2021-05-07 17:47:33 +09:00
Dean Herbert
8e78cac058 Fix HealthProcessor cached as derived type in test 2021-05-07 17:31:29 +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
84a4ff333e Update skin editor test scene to cache a ScoreProcessor 2021-05-07 17:22:56 +09:00
Dean Herbert
755588258e Update HealthDisplay components to use DI to attach data source 2021-05-07 17:22:45 +09:00
Dean Herbert
4ac234bf7f Merge branch 'skin-components-bind-outwards' into skin-components-bind-outwards-accuracy 2021-05-07 17:15:57 +09:00
Dean Herbert
6dc591fc44 Merge branch 'skin-components-bind-outwards' into skin-components-bind-outwards-score-display 2021-05-07 17:15:37 +09:00
Dean Herbert
9d27b11e49 Update skin editor test scene to cache a ScoreProcessor 2021-05-07 17:10:31 +09: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
Dean Herbert
165f443ab5 Merge branch 'master' into add-missing-author-links 2021-05-07 14:32:44 +09:00
Dean Herbert
48b834d12a Merge branch 'master' into mbd-beatmap-set-cover 2021-05-07 13:19:17 +09:00
Gagah Pangeran Rosfatiputra
67f51959db
Merge branch 'master' into osu-markdown 2021-05-06 16:23:20 +07:00
Gagah Pangeran Rosfatiputra
91283d41ce
add paragraph test 2021-05-06 15:13:43 +07:00
Dean Herbert
aff32b0d19 Merge branch 'master' into skin-components-list 2021-05-06 14:17:33 +09: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
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
Dean Herbert
4ef901d08d Remove unnecessary redirection property to Container.Info 2021-05-05 21:07:49 +09:00
Dean Herbert
805ef621e9
Merge branch 'master' into play-storyboard-outro 2021-05-05 17:51:16 +09:00
Dean Herbert
3cc9bad979 Actually check for correct state of fade content in rewind test 2021-05-05 17:49:33 +09:00
Christine Chen
1d4a8bc0ae Add visual test for rewinding 2021-05-04 22:23:36 -04:00
Salman Ahmed
12c1ded7a8 Fix test scene broken on master 2021-05-05 00:28:49 +03:00
Salman Ahmed
1ac80d42f9
Merge branch 'master' into corner-rotation-controls 2021-05-04 23:53:23 +03:00
Bartłomiej Dach
2fd596d53c Merge branch 'master' into mbd-beatmap-set-cover 2021-05-04 21:14:48 +02:00
Bartłomiej Dach
040d393dd4 Add visual test case for crossfade behaviour 2021-05-04 21:12:25 +02:00
Dean Herbert
bb9fa1a25e
Merge branch 'master' into play-storyboard-outro 2021-05-04 14:01:34 +09:00
Salman Ahmed
8abff4881b Hide the corresponding rotation handle when holding scale handle 2021-05-04 07:31:55 +03:00
Dean Herbert
4f12ae2711 Merge branch 'master' into split-BufferedWedgeInfo 2021-05-04 13:28:42 +09:00
Gagah Pangeran Rosfatiputra
356b1e9a2d
add emphases test 2021-05-04 05:43:59 +07:00
Bartłomiej Dach
f52375eed2 Merge branch 'master' into mbd-beatmap-set-cover 2021-05-03 15:58:13 +02:00
Bartłomiej Dach
b9220d4dc7 Fix possible multiple enumeration 2021-05-03 15:57:57 +02:00
Dean Herbert
4f8240f19a
Merge branch 'master' into corner-rotation-controls 2021-05-03 18:02:23 +09:00
Dean Herbert
625890381f Update ComboCounter components to use DI to attach data source 2021-05-03 17:43:00 +09:00
Dean Herbert
fdd0713988 Merge branch 'fix-selection-handler-visibility' into skin-bindables 2021-05-03 17:40:03 +09:00
Dean Herbert
3268a75f05 Remove intermediate container to fix tests 2021-05-03 17:35:56 +09:00
Dean Herbert
6da4105da6 Remove Sync namespace (feels unnecessary) 2021-05-03 13:38:53 +09:00
Dean Herbert
e0c129ca85 Merge branch 'master' into multiplayer-spectator-screen 2021-05-03 13:08:14 +09:00
Gagah Pangeran Rosfatiputra
b97d3f2af1
add heading test scene 2021-05-03 09:35:26 +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
6585dd3a3e
add image test 2021-05-23 16:30:41 +07:00
Gagah Pangeran Rosfatiputra
8f1b48d766
add test for notice box 2021-05-23 17:29:48 +07:00
Gagah Pangeran Rosfatiputra
5c1c43dea3
add link assert 2021-05-25 10:44:22 +07:00
Gagah Pangeran Rosfatiputra
98af998978
add test markdown class 2021-05-25 09:56:26 +07:00
Gagah Pangeran Rosfatiputra
a38c33841a
add test scene wiki container 2021-05-23 16:30:41 +07:00
Dean Herbert
a1e64f4e3c Use the existing toolbox design 2021-04-30 14:41:06 +09:00
Gagah Pangeran Rosfatiputra
3681db491c
add long mixed list test 
Copied from https://github.com/ppy/osu-wiki/blob/master/wiki/Tournaments/OWC/2020/en.md#tournament-rules
 2021-04-30 11:21:20 +07:00
Dean Herbert
ae9d1dc40b Add component list to main editor interface and enable basic placement 2021-04-30 13:10:42 +09:00
Dean Herbert
6442fb819f Split out component from test scene and fix SongProgress 2021-04-30 13:10:42 +09:00
Dean Herbert
4770a64709 Add proof of concept components list 2021-04-30 13:10:42 +09:00
Gagah Pangeran Rosfatiputra
1582b0da88
add ordered list test 2021-04-30 10:43:19 +07:00
Dean Herbert
eeb66a955e
Merge branch 'master' into mbd-beatmap-set-cover 2021-04-30 08:14:33 +09:00
Dean Herbert
de73ac7cec Allow skin editor to be invoked from any context 
This is kind of how I see things working going forward, where the editor
can be applied to anything in the game which supports it (ie. a results
screen, gameplay screen, etc.) and it will immediately allow changing
the interface.

This adds a test scene which shows this working with gameplay.
 2021-04-29 16:12:15 +09:00
Dean Herbert
74c6fdc4b8 Add DrawableRuleset to the skin editor test to get a hit error meter to display 2021-04-29 16:12:15 +09:00
Dean Herbert
fd587a82ff Replace abstract class with interface, attached to the actual components (not skinnable wrapper) 2021-04-29 16:12:15 +09:00
Dean Herbert
defa350aa7 Set defaults on SkinnableHUDComponent to cancel out relative size default 
Specifying locally on each HUD component looks to make more sense.
 2021-04-29 16:12:15 +09:00
Dean Herbert
1cb8fc9a24 Extract editor classes out of test namespace and add anchor support 2021-04-29 16:12:15 +09:00
Dean Herbert
74fb7cd180 Extract storable attributes to bindables 2021-04-29 16:12:15 +09:00
Dean Herbert
99b428ee4b Add very basic skin editor test 2021-04-29 16:12:14 +09:00
Dean Herbert
fca173225a Refactor editor selection/blueprint components to be generic 2021-04-29 16:12:14 +09:00
Dean Herbert
2d17219c8f Setup basic test and classes for scale adjustment 2021-04-29 16:12:14 +09:00
Dean Herbert
5b009c21bb Merge branch 'master' into abstract-blueprint-handling 2021-04-29 16:10:22 +09:00
Gagah Pangeran Rosfatiputra
171e954e89
add unordered list test 2021-04-29 13:48:00 +07:00
Dean Herbert
ac1534cda2 Add test covering existing button actually changing to LocallyAvailable state 2021-04-28 15:54:40 +09:00
Gagah Pangeran Rosfatiputra
4e691ce4b0
add test link with inline text markdown 2021-04-28 11:01:54 +07:00
Gagah Pangeran Rosfatiputra
c09067c3d5
add OsuMarkdownTable 2021-04-28 10:53:12 +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
Dean Herbert
f2e56bd306 Refactor editor selection/blueprint components to be generic 2021-04-27 19:01:29 +09: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
65aa01866e
add test scene for OsuMarkdownContainer 2021-04-27 14:38:21 +07:00
Dean Herbert
5f6fd9ba13 Remove outdated dependency requirement in test 2021-04-26 19:07:42 +09:00
smoogipoo
94d0b06493 Expose mute adjustment instead 2021-04-26 19:01:30 +09:00
Dean Herbert
120fb8974d Combine more instances of test player IDs 2021-04-26 17:22:16 +09:00
Dean Herbert
737a15c2d4 Extract out test player IDs to constants 2021-04-26 17:04:39 +09:00
Dean Herbert
55f383c71e Rename test to match new MultiSpectatorLeaderboard class name 2021-04-26 16:48:40 +09:00
Dean Herbert
6d30a1a80f Reference constant for test startup delay 2021-04-26 16:45:20 +09:00
Salman Ahmed
beee318acc Add more distance between each hit object in editor selection test 
To avoid potentially hovering over the rotation control instead of wherever the test desired to move the mouse to.
 2021-04-26 01:45:52 +03:00
Salman Ahmed
334927ed35 Remove leftover step 2021-04-25 20:13:01 +03:00
Salman Ahmed
7490511ebf Instantiate selection box on SetUp 2021-04-25 20:03:15 +03:00
Salman Ahmed
11318fd9fc Add test coverage 2021-04-25 10:17:36 +03:00
Dean Herbert
c0b1c2f39b
Merge branch 'master' into realm-key-binding-store 2021-04-24 02:40:15 +09:00
smoogipoo
b41897fd9b Rename testscene to match class 2021-04-23 19:23:52 +09:00
smoogipoo
b25340653d Fix failing tests 2021-04-23 00:49:14 +09:00
smoogipoo
4f0857f946 Xmldocs and general refactorings 2021-04-22 23:52:22 +09:00
smoogipoo
ee25949751 Rename classes 2021-04-22 23:39:02 +09:00
smoogipoo
f8f9cf9412 Merge branch 'fix-initial-playingusers' into multiplayer-spectator-screen 2021-04-22 23:25:25 +09:00
smoogipoo
64579d50ac Use only single PlayerInstance for hit sample playback 2021-04-22 22:59:47 +09:00
Dan Balasescu
be8fe47f2c
Merge branch 'master' into editor-add-nudge-shortcuts 2021-04-22 20:38:34 +09:00
smoogipoo
6df23f1301 Merge branch 'master' into multiplayer-spectator-screen 2021-04-22 20:29:24 +09:00
Dan Balasescu
b774f5b72b
Merge pull request #12526 from peppy/fix-system-message-ordering 
Fix system messages always being displayed above standard messages
 2021-04-22 18:51:25 +09:00
Dan Balasescu
0e24f2eb59
Merge pull request #12529 from peppy/editor-placement-right-click-delete 
Allow shift+right-click deletion when in placement mode
 2021-04-22 18:50:20 +09:00
Dean Herbert
a5364b224f Add simple key based time nudging support to editor 2021-04-22 18:47:04 +09:00
Dean Herbert
daafa41dc1
Merge branch 'master' into fix-initial-spectator-state-callback 2021-04-22 16:22:04 +09:00
Dean Herbert
cf1e3ea988 Add failing test covering quick shift-rightclick deletion in placement mode 2021-04-22 15:44:12 +09:00
Dean Herbert
ea3bb07924 Add test that fails on incorrect system/info message ordering 2021-04-22 14:51:14 +09:00
Dean Herbert
78f274d51a Merge branch 'master' into realm-key-binding-store 2021-04-22 12:13:23 +09:00
smoogipoo
2bea625613 Fix initial playback states not being correct 2021-04-21 23:22:11 +09:00
Denrage
0dfd0bb59d Refactored background of BeatmapInfoWedge 2021-04-21 15:46:11 +02:00
Denrage
9fba87f67a Moved Info and Background into own container 2021-04-21 15:43:29 +02:00
Gagah Pangeran Rosfatiputra
416e08ae7a
add dummy response API in TestSceneWikiOverlay 
`TestSceneNewsOverlay` is used as example for this test.
 2021-04-21 17:25:13 +07:00
smoogipoo
e78ef05fcf Merge branch 'gcc-abstraction' into multiplayer-spectator-screen 2021-04-21 17:11:14 +09:00
smoogipoo
31c5fb350f Merge branch 'master' into gcc-abstraction 2021-04-21 16:33:36 +09:00
Bartłomiej Dach
881043bc5d Fix failing test after mod settings layout changes 
The slight hack which was used in the test to ensure that the mod
settings overlay covered the entire width of the mod overlay broke after
adjustments to the layout in the previous commit.

Locally adjust the hack to use the parent of the `ModSettingsContainer`
rather than the container itself.
 2021-04-20 19:38:25 +02:00
smoogipoo
156a518068 Merge branch 'master' into fix-initial-spectator-state-callback 2021-04-20 21:16:05 +09:00
smoogipoo
c5d6b6ea8d Fix tests failing intermittently 
This was due to this code happening in UpdateAfterChildren(), after the
GCC has processed one frame. During this time, the clock could have
advanced an arbitrary amount.

The cause of this is the removal of the Task.Run() to set the clock in
Restart() (now called Reset()) which changed the timing, so it only worked before due to pure
luck.
 2021-04-20 18:41:09 +09:00
Gagah Pangeran Rosfatiputra
460d656a0e
initial wiki overlay 2021-04-21 16:21:07 +07:00
Denrage
505a117862 splitted updateable part of wedge 2021-04-20 10:37:52 +02:00
smoogipoo
80473a356e Merge branch 'fix-pre-seek-sample-lifetime' into gcc-abstraction 2021-04-20 17:27:01 +09:00
Denrage
c73bbf0aa7 Fixed Tests 2021-04-19 19:24:58 +02:00
Bartłomiej Dach
97573fb11d Merge branch 'master' into combo-colours-display 2021-04-19 18:21:57 +02:00
Dean Herbert
fc41ad65f8
Merge pull request #12447 from smoogipoo/fix-non-60fps-recording 
Record every 60fps interval
 2021-04-19 23:26:58 +09:00
Gagah Pangeran Rosfatiputra
5117c51105
initial wiki header 2021-04-19 16:24:47 +07:00
smoogipoo
c12848ce4d Apply fixes to tests 2021-04-19 17:02:59 +09:00
smoogipoo
5397f4faba Merge branch 'master' into fix-initial-spectator-state-callback 2021-04-19 16:49:06 +09:00
jvyden
a854ce429a
add blank line between method 2021-04-18 23:49:13 -04:00
jvyden
999f2d810c
Fix accidentally removed code 2021-04-18 23:30:07 -04:00
Christine Chen
fd1241cc85 Added tests 
New tests:
- storyboard ending during the failing animation
- showResults = false
- storyboard ending before score processor completion

Co-Authored-By: Marlina José <marlina@umich.edu>
 2021-04-18 23:26:50 -04:00
jvyden
e44d11667c
Merge remote-tracking branch 'upstream' 2021-04-18 23:04:35 -04:00
jvyden
b727faace3
Revert changes to IdleTracker 2021-04-18 23:03:43 -04:00
Christine Chen
98460c8feb Rename IStoryboardElementHasDuration, remove unnecessary step in tests, add Duration field 2021-04-18 20:20:14 -04: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
67c19df000 Add test coverage for adding/removing colours 2021-04-18 19:35:42 +02:00
Bartłomiej Dach
1b2c43b92c Add basic structure of colour palette 2021-04-18 19:29:04 +02:00
Dean Herbert
2678089e0b Add test case failing on selection after paste 2021-04-18 20:28:39 +09:00
Salman Ahmed
2847dd7e05 Merge branch 'master' into play-storyboard-outro 2021-04-18 06:40:22 +03:00
Christine Chen
7b1d40db7d Remove redundant string interpolation 2021-04-17 22:13:28 -04:00
Christine Chen
e9f8fa64b8 Added a test for toggling the storyboard after the map is loaded 2021-04-17 21:49:29 -04:00
Christine Chen
7f5b1e84a1 Update TestSceneStoryboardWithOutro.cs 
- Construct storyboard in CreateWorkingBeatmap()
- Use GameplayClockContainer.GameplayClock.CurrentTime
- Remove unnecessary lines
 2021-04-17 13:57:32 -04:00
jvyden
1e56f14f5b
Merge remote-tracking branch 'upstream' 2021-04-17 09:35:24 -04:00
Bartłomiej Dach
f3ea51eeed Adjust tests to not rely on invalid assumption 2021-04-17 14:23:32 +02:00
smoogipoo
d5b26b0ab5 Fix incorrect test spectator client implementation 2021-04-16 23:01:34 +09:00
smoogipoo
a7aa3cb263 Merge branch 'gcc-abstraction' into multiplayer-spectator-screen 2021-04-16 20:16:26 +09:00
smoogipoo
5e82f40d67 Merge branch 'master' into gcc-abstraction 2021-04-16 20:14:53 +09:00
jvyden
8d6c30c73b
Fix lint 2021-04-16 05:57:36 -04:00
jvyden
ec0211809f
Apply peppy's suggestions 2021-04-16 05:53:27 -04:00
smoogipoo
65a6f9f8a4 Merge branch 'fix-initial-spectator-state-callback' into multiplayer-spectator-screen 2021-04-16 18:26:46 +09:00
jvyden
d760e81a91
Fix lint 2021-04-16 05:22:41 -04:00
smoogipoo
46d2181d42 Remove now unnecessary (duplicating) test 2021-04-16 18:21:56 +09:00
smoogipoo
377e5ce6b3 Fix test incorrect sending state too often 2021-04-16 18:21:35 +09:00
jvyden
471b8e3c74
Merge branch 'master' of https://github.com/ppy/osu 2021-04-16 05:02:40 -04:00
jvyden
7d23973ef8
Reset SessionStatics on activity 
Closes #12424
 2021-04-16 05:01:58 -04:00
smoogipoo
ca74f413cd Change to explicit method instead 2021-04-16 17:31:02 +09:00
smoogipoo
25f0f17766 Attempt to fix match subscreen test failure 2021-04-16 16:16:28 +09:00
smoogipoo
5652490d61 Fix OnUserBeganPlaying not being invoked if already watching 2021-04-16 14:11:55 +09:00
Christine Chen
b15838b220 Move storyboard outro logic to DrawableStoryboard 2021-04-16 00:59:10 -04:00
smoogipoo
5ac0eb02cd Always add player instances at first, populate later 2021-04-16 12:25:29 +09:00
Christine Chen
45c2b72a25
Merge branch 'master' into play-storyboard-outro 2021-04-15 15:11:35 -04:00
Christine Chen
25b8c2f257 Allow skipping storyboard outro 
Reuses SkipOverlay by calculating the endtime of the storyboard and using that as a "start point". Upon skipping the outro the score is instantly shown.
When the end of the storyboard is reached the score screen automatically shows up. If the player holds ESC (pause) during the outro, the score is displayed

The storyboard endtime is calculated by getting the latest endtime of the storyboard's elements, or simply returning 0 if there is no storyboard.

Co-Authored-By: Marlina José <marlina@umich.edu>
 2021-04-15 13:20:40 -04:00
Dean Herbert
7cf15fe729
Merge pull request #12412 from peppy/timeline-adjustments 
Update timeline control point display
 2021-04-15 22:43:26 +09:00
Dan Balasescu
ac8e462d32
Merge branch 'master' into refactor-framed-replay-input-hander 2021-04-15 21:48:58 +09:00
Dean Herbert
ad671ee07a
Merge branch 'master' into timeline-adjustments 2021-04-15 20:42:38 +09:00
Dan Balasescu
6f17c19a48
Merge branch 'master' into summary-timeline-design-refactors 2021-04-15 20:11:39 +09:00
Dean Herbert
5b06a68b93
Merge pull request #12330 from Cublibre/master 
Send a warning notification if device is unplugged and at low battery
 2021-04-15 19:21:04 +09:00
smoogipoo
1705d472b5 Reimplement multiplayer syncing using new master/slave clocks 2021-04-15 19:12:52 +09:00
Dean Herbert
18e8682f39 Remove unused using statements 2021-04-15 17:01:25 +09:00
Dean Herbert
dd9a142e89 Fix TestSceneEditorSummaryTimeline not displaying actual beatmap content 2021-04-15 16:39:20 +09:00
Dean Herbert
66bb5766b9 Make Mod.Description abstract and add missing descriptions 2021-04-15 16:39:20 +09:00
Dan Balasescu
a56391c6ca
Merge pull request #12418 from peppy/abstract-mod-description 
Make `Mod.Description` abstract and add missing descriptions
 2021-04-15 15:42:36 +09:00
Dean Herbert
346e36d32a Make Mod.Description abstract and add missing descriptions 2021-04-15 14:36:26 +09:00
Salman Ahmed
92fd34cea9 Revert "Inverse ignore user settings bindable to "apply user settings" instead" 
This reverts commit 175b8da2b2.
 2021-04-15 08:02:12 +03:00
Salman Ahmed
175b8da2b2 Inverse ignore user settings bindable to "apply user settings" instead 2021-04-15 07:34:20 +03:00
Salman Ahmed
7a9ff2ab38 Use until steps instead 
Ah..
 2021-04-15 00:48:25 +03:00
Salman Ahmed
505dc15e03 Add failing test case 2021-04-14 23:35:42 +03:00
Dean Herbert
9dea0ae935 Update test scene to be able to see a bit more 2021-04-14 21:03:52 +09:00
smoogipoo
54643f53e3 Merge branch 'gcc-abstraction' into multiplayer-spectator-screen 2021-04-14 19:56:58 +09:00
smoogipoo
1aa36818df Abstractify GameplayClockContainer 2021-04-14 17:47:11 +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
smoogipoo
3039b7b0f9 Make tests a bit more resilient 2021-04-13 22:40:24 +09:00
smoogipoo
20823abb30 Make resyncing a bit more resilient 2021-04-13 22:10:35 +09:00
Dan Balasescu
1505a38164
Merge pull request #12396 from peppy/update-timeline-slider-apperance 
Update timeline slider/spinner apperance
 2021-04-13 20:47:44 +09:00
Dan Balasescu
b2aa46690d
Merge pull request #12389 from peppy/fix-editor-ctrl-drag-deselection 
Fix ctrl-dragging on an existing selection unexpectedly causing deselection
 2021-04-13 20:38:29 +09:00
smoogipoo
5b53a2b211 Merge branch 'master' into multiplayer-spectator-screen 2021-04-13 20:07:56 +09:00
Dean Herbert
00f235760d Update visual appearance of timeline blueprints to close match new designs 2021-04-13 19:26:20 +09:00
Dean Herbert
fca9c70c1b Move timeline hit object test to immediately viewable area 2021-04-13 19:26:20 +09:00
Dean Herbert
0cf13dab8d
Merge pull request #12391 from frenzibyte/replays-tooltip-graph 
Display separate "replays watched" tooltip for replays subsection
 2021-04-13 19:25:50 +09:00
Dean Herbert
2884ed3ab9
Merge pull request #12350 from smoogipoo/multiplayer-spectator-player-grid 
Add the multiplayer spectator player grid
 2021-04-13 19:25:32 +09:00
Dan Balasescu
a0513f64f9
Merge branch 'master' into replays-tooltip-graph 2021-04-13 18:21:10 +09:00
Salman Ahmed
15658eda55 Add failing test case 2021-04-13 12:00:13 +03:00
Salman Ahmed
36510309d1 Merge EnableUserDim and IgnoreUserSettings to one bindable 2021-04-13 10:58:56 +03:00
Dean Herbert
a9652b7b25 Start TimelineTestScene in a more visible place 2021-04-13 16:05:12 +09:00
ekrctb
38d10755cb Merge branch 'master' into refactor-framed-replay-input-hander 2021-04-13 13:47:22 +09:00
Dean Herbert
516bd138e3 Add (previously failing) test coverage of drag from selection 2021-04-13 13:46:38 +09:00
Dean Herbert
7c975359d9 Add basic select/deselect tests 2021-04-13 13:29:37 +09:00
Dean Herbert
05d7fe289f Rename test scene in preparation for increasing scope 2021-04-13 13:09:18 +09:00
Dean Herbert
66e74da2b7 Fix regression in quick delete mouse action blocking 2021-04-13 13:03:14 +09:00
Salman Ahmed
8f84abf348 Display "replays watched" tooltip for replays subsection 2021-04-12 21:51:06 +03:00
Christine Chen
f66306a81a Remove IsLowBattery 2021-04-12 11:15:24 -04:00
Christine Chen
43b97fe0ad Refactor PowerStatus (now called BatteryInfo) 2021-04-12 10:52:52 -04:00
smoogipoo
1e002841cf Add test for scoring mode changes 2021-04-12 22:03:45 +09:00
smoogipoo
c531e38a36 Rework to create a derived tracked user data instead 2021-04-12 22:00:27 +09:00
smoogipoo
27660265b5 Merge branch 'master' into multiplayer-spectator-leaderboard 2021-04-12 21:02:18 +09:00
Dean Herbert
b4c75ba3c6 Fix TestQuickDeleteRemovesObject failing on second run 2021-04-12 19:19:25 +09:00
ekrctb
359fae895f Rename property 2021-04-12 18:50:25 +09:00
ekrctb
e19e8ff2a3 Rewrite FramedReplayInputHandler for robustness 
This commit changes the semantics of `CurrentFrame` and `NextFrame` of the class.
The ordering of `NextFrame.Time` and `CurrentFrame.Time` was dependent on the current direction.
Now, it should always satisfy `CurrentFrame.Time <= CurrentTime <= NextFrame.Time` except at the start/end.
This change, however, doesn't break existing deriving classes if the template code pattern usage of interpolation is used.
The deriving class code can be simplified due to the elimination of nullable types. I didn't include those changes in this commit.

I removed `StreamingFramedReplayInputHandlerTest` for now, as it is almost-duplicate of `FramedReplayInputHandlerTest`. I'll include more tests in later commits.

This commit fixes #6150.
 2021-04-12 16:18:11 +09:00
Dean Herbert
9be3163592 Merge branch 'master' into multiplayer-spectator-player-grid 2021-04-12 14:14:13 +09:00
smoogipoo
4fcddfb44b Fix multiplayer test failure 2021-04-12 13:42:14 +09:00
ekrctb
d6d8ea5b6b Throw when getting a frame of an empty replay 2021-04-12 11:17:56 +09:00
Salman Ahmed
cb947a3b27 Add expected output in test case rather than determining internally 2021-04-11 13:18:25 -04:00
Salman Ahmed
1fd4cb8963
Merge branch 'master' into master 2021-04-11 10:19:16 +03:00
Christine Chen
08311abc5e Remove setters, cache CreatePowerStatus() and use a dummy LocalPowerStatus class in test scene 2021-04-10 00:00:21 -04:00
smoogipoo
61c400b1a1 Fix filename 2021-04-09 20:18:26 +09:00
smoogipoo
eccd269cce Implement maximum start delay 2021-04-09 20:17:57 +09:00
smoogipoo
950e4e05ef Merge branch 'multiplayer-spectator-leaderboard' into multiplayer-spectator-screen 2021-04-09 18:30:21 +09:00
smoogipoo
e73f3f52d7 Add some more asserts 2021-04-09 18:23:41 +09:00
smoogipoo
9ddcd686ac Fix incorrect assert 2021-04-09 18:23:38 +09:00
smoogipoo
b49997f531 Add test for no frames 2021-04-09 18:18:23 +09:00
smoogipoo
589ce4bdc2 Add test 2021-04-09 18:16:10 +09:00
Christine Chen
59d13b0dd3 Fixed indentation 
sorry about the style fixes... I'm using JetBrains Rider from now on.
 2021-04-08 21:53:42 -04:00
Christine Chen
6b6a71d3c3 trim whitespace 2021-04-08 20:39:17 -04:00
Christine Chen
493c095535 Fixed code style 2021-04-08 20:28:23 -04:00
Christine Chen
6bccb3aab6 Use DI to implement battery detection, add BatteryCutoff property 
- Removed the Xamarin.Essentials package from osu.Game and added it to osu.iOS and osu.Android only.
- iOS and Android implementations use Xamarin.Essentials.Battery, while the Desktop implementation
only returns 100% battery for now.
- Added a BatteryCutoff property to PowerStatus so it can be different for each platform (default 20%, 25% on iOS)
 2021-04-08 19:55:11 -04:00
smoogipoo
7958a257e8 Add tests 2021-04-08 22:14:30 +09:00
smoogipoo
70cd018a98 Fix intermittent test failure 2021-04-08 21:38:58 +09:00
smoogipoo
125358158b Merge branch 'master' into multiplayer-spectator-screen 2021-04-08 21:13:37 +09:00
Dean Herbert
1e23f671fa
Merge pull request #12321 from smoogipoo/add-spectate-button-and-state 
Add multiplayer spectating user state and button
 2021-04-08 19:48:58 +09:00
smoogipoo
b38d332268 Fix broken test 2021-04-08 16:31:39 +09:00
Dean Herbert
545156d15c Add regression test coverage 2021-04-08 15:20:53 +09:00
Dean Herbert
8aff53172d Remove necessity for nested PassThroughInputManger 2021-04-08 15:18:31 +09:00
Christine Chen
0a6baf670e Send a warning notification if device is unplugged and low battery 
- Uses Xamarin.Essentials in osu.Game.PlayerLoader to check battery level
- Encapsulated battery checking in the public BatteryManager class so battery level and plugged in status can be accessed and edited in TestPlayerLoader
- When checking battery level, catch NotImplementedException thrown by Xamarin.Essentials.Battery on non-mobile platforms
- Added visual unit tests for battery notification
  To mock battery status and level, we had to define a batteryManager object in TestPlayerLoader and add a new function ResetPlayerWithBattery()

Co-Authored-By: Marlina José <marlina@umich.edu>
 2021-04-07 15:56:50 -04:00
smoogipoo
72a42ceaf7 Merge branch 'multiplayer-spectator-player-grid' into multiplayer-spectator-screen 2021-04-08 00:19:00 +09:00
smoogipoo
024adb699c Add test and fix several issues 2021-04-08 00:12:21 +09:00
smoogipoo
214813154b Fix class name 2021-04-07 22:28:22 +09:00
smoogipoo
99bee73ac1 Merge branch 'master' into add-spectate-button-and-state 2021-04-07 22:07:52 +09:00
Dan Balasescu
6eb809f4c4
Merge pull request #9194 from boswelja/rebind-song-select 
Allow rebinding Song Select mods/random/options keys
 2021-04-07 20:55:45 +09:00
smoogipoo
93c5935ebc Add match subscreen support + test 2021-04-07 20:46:30 +09:00
Dean Herbert
b4c6894d13 Add test coverage for song select footer area 2021-04-07 18:29:31 +09:00
smoogipoo
abd637ffaa Add button to footer 2021-04-07 17:35:18 +09:00
smoogipoo
56c13148f1 Fix typo in class name 2021-04-07 16:45:10 +09:00
smoogipoo
c744f77cfa Add participant panel state 2021-04-07 16:40:24 +09:00
smoogipoo
f5667125a0 Remove unnecessary method 2021-04-07 16:37:43 +09:00
smoogipoo
6be9c9f0f4 Link up ready button to spectate state 2021-04-07 16:35:50 +09:00
smoogipoo
1f57b6884d Add ready button to test scene 2021-04-07 16:30:40 +09:00
smoogipoo
6de91d7b6b Add spectate button + test 2021-04-06 21:37:27 +09:00
Dan Balasescu
ba3689b5b9
Merge pull request #12269 from PercyDan54/beatmap-details 
Use OnlineViewContainer for BeatmapDetails
 2021-04-06 17:52:32 +09:00
Dan Balasescu
2321101518
Merge branch 'master' into fix-overzealousmouse-button-blocking 2021-04-06 16:45:25 +09:00
Dean Herbert
53c1bc666c Make addition of nested GlobalActionContainer in OsuGameTestScene optional 2021-04-06 15:18:00 +09:00
Dean Herbert
e486e521ff Fix regressed test 2021-04-05 22:46:01 +09:00
Dean Herbert
beebdb0734 Clean up implementation 2021-04-05 22:30:51 +09:00
Bartłomiej Dach
b66ba43bc5 Add failing test scene 2021-04-03 14:02:46 +02:00
Bartłomiej Dach
7d4b0e3f0a Fix editor clock scene not re-enabling beatmap 
Could interfere with other tests due to causing crashes on attempts to
change `Beatmap.Value`.
 2021-04-03 12:34:48 +02:00
PercyDan54
1ff77754fd
Use OnlineViewContainer 2021-04-02 20:14:31 +08:00
smoogipoo
c3c7c18549 Fix tests 2021-04-01 23:48:26 +09:00
smoogipoo
9e95441aa6 Rename Spectator -> SoloSpectator 2021-04-01 22:08:52 +09:00
Dean Herbert
710599c521 Merge branch 'master' into realm-key-binding-store 2021-03-31 15:00:47 +09:00
Dean Herbert
0c53b4eb93 Fix wrong counting and add test 2021-03-31 14:09:39 +09:00
Dean Herbert
321ad737b6 Merge branch 'master' into realm-migration-operation-blocking 2021-03-30 22:40:08 +09:00
Dean Herbert
8dfff999f9 Add rotation slider 2021-03-30 12:40:50 +09:00
Dean Herbert
f8cea5cae3 Merge branch 'master' into realm-migration-operation-blocking 2021-03-26 17:07:31 +09:00
Max Hübner
558f8fa51e Adjust testscene 2021-03-25 23:20:26 +01:00
Dean Herbert
6cb14e91c9 Make Player abstract and introduce SoloPlayer 2021-03-23 18:18:49 +09:00
Dean Herbert
aeff9bd853 Add return bool to HandleRequest to better trigger failures 2021-03-23 18:17:29 +09:00
Bartłomiej Dach
a16c0641b2 Revert EF Core to version 2.2 
This reverts commit f3faad74d5, reversing
changes made to 712e7bc7bf.

Several issues arose after migrating to 5.0, including, but possibly not
limited to, performance regressions in song select, as well as failures
when attempting to save beatmaps after metadata changes in the editor.
 2021-03-21 11:05:15 +01:00
Dean Herbert
b9b351311a
Merge pull request #11824 from peppy/fix-unsafe-skinnable-sample-play 
Fix playing skinned samples being unsafe during skin changes
 2021-03-20 11:29:34 +09:00
Bartłomiej Dach
8e0536e1e2 Add failing test scene 2021-03-19 22:44:33 +01:00
Dean Herbert
03592fa696 Merge branch 'master' into realm-migration-operation-blocking 2021-03-19 21:33:26 +09:00
Dean Herbert
f59327cc3e Merge branch 'master' into fix-unsafe-skinnable-sample-play 2021-03-19 20:29:44 +09:00
Dean Herbert
196f95ae54 Update to use new bindables and centered area offset 2021-03-19 19:01:32 +09:00
Dean Herbert
9a6a0f3df5 Add test coverage and better UI handling of no tablet connected scenario 2021-03-19 19:01:32 +09:00
Dean Herbert
a8e319a320 Remove min/max from test scene to fix weirdness when switching test sizings 2021-03-19 19:01:31 +09:00
Dean Herbert
382109c7a2 Make test scene feel more like settings (width-wise) 2021-03-19 19:01:31 +09:00
Dean Herbert
464702182d Consume device name 2021-03-19 19:01:31 +09:00
Dean Herbert
3b7edf1333 Make tablet display always fit to size of settings area 2021-03-19 19:01:31 +09:00
Dean Herbert
d026c8da85 Initial pass of configuration interface 2021-03-19 19:01:31 +09:00
Dean Herbert
1c865682ae Add tablet configuration tests 2021-03-19 18:57:49 +09:00