917 Commits

Author	SHA1	Message	Date
Dean Herbert	3a01cfccee	Adjust fade length and easing.	2017-04-10 17:25:56 +09:00
Dean Herbert	15c1013f5b	Don't schedule event, it's unreliable and doesn't match the fade.	2017-04-10 17:25:46 +09:00
Andrey Zavadskiy	7366640b95	Merge remote-tracking branch 'refs/remotes/ppy/master' into key_retry	2017-04-10 09:10:20 +03:00
Dean Herbert	bb4a909de5	Update UI control access in line with framework changes.	2017-04-10 14:54:23 +09:00
Andrey Zavadskiy	1879a05c7b	Removed using	2017-04-10 06:10:12 +03:00
Andrey Zavadskiy	e73f543c4f	Applied suggestions	2017-04-10 06:06:10 +03:00
Andrey Zavadskiy	a7264aa84c	Warning fix	2017-04-09 17:53:16 +03:00
Andrey Zavadskiy	425e96c45c	Moved logic to it's own class	2017-04-09 17:44:19 +03:00
Andrey Zavadskiy	4ab4f65c83	Retry on Tilde key	2017-04-09 16:26:31 +03:00
Jorolf	bcef1ce2b6	replace space in text with Spacing in FillFlowContainer	2017-04-08 13:59:22 +02:00
Jorolf	f7a9a11ae5	Bar uses AccentColour aswell	2017-04-08 13:53:11 +02:00
Dean Herbert	adc16b0727	Merge pull request #608 from Tom94/music-controller-button-animation ... Music controller button animation	2017-04-08 20:48:39 +09:00
Jorolf	5e56e84c4a	change SRGBColour to Color4 and use IHasAccentColour in some places	2017-04-08 13:31:55 +02:00
Dean Herbert	b5431c496b	Fix osu! logo handling drags for no reason.	2017-04-08 19:34:04 +09:00
Jorolf	c60a55285c	updated TestCase and some null checks	2017-04-07 20:32:09 +02:00
Jorolf	6a87fd6112	retries and fails hide if they're not present	2017-04-07 20:19:03 +02:00
Jorolf	899e559b5c	ratings hide now + remove unnessary stuff	2017-04-07 19:58:49 +02:00
Jorolf	65d9f4fc45	hide MetadataSegments without content and remove fail/retry initialisations	2017-04-07 19:27:14 +02:00
Jorolf	9881889f88	removed some unused stuff	2017-04-07 18:24:36 +02:00
Jorolf	eb4b3772e9	put Bar into its own file and let it only add a background if BackgroundColour is changed	2017-04-07 18:13:55 +02:00
Dean Herbert	0d4f457265	Improve transitions when exiting play mode.	2017-04-07 20:46:35 +09:00
Dean Herbert	54d1afb655	Fade in HitRenderer post entering animation.	2017-04-07 20:38:57 +09:00
Dean Herbert	39175905e4	Fix crashes on completing a taiko map (where a strong his is the last hit in the map).	2017-04-07 16:56:09 +09:00
Dean Herbert	7e99fc47e2	wip	2017-04-07 16:54:54 +09:00
Dean Herbert	1842d80e28	Update test case.	2017-04-07 09:43:08 +09:00
Dean Herbert	12d2102a88	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-04-07 09:22:18 +09:00
Jorolf	e59c0a770f	Merge branch 'master' into details	2017-04-06 15:42:00 +02:00
Jorolf	28193cbaaa	hide BeatmapDetails on entering the Select screen	2017-04-06 15:39:23 +02:00
Huo Yaoyuan	411988f038	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Huo Yaoyuan	9b1e010dcc	Fix filename mismatch.	2017-04-06 16:05:41 +08:00
Dean Herbert	942699218a	Merge branch 'master' into details	2017-04-06 15:44:43 +09:00
Dean Herbert	7c63c8394b	Remove unnecessary depth setting.	2017-04-06 15:36:03 +09:00
Dean Herbert	a18367454d	InGameOverlay -> MenuOverlay.	2017-04-06 15:34:52 +09:00
Dean Herbert	856696b17e	Fix incorrect verbatim strings.	2017-04-06 15:31:21 +09:00
Dean Herbert	6285f3eea8	Merge branch 'master' into pause_buttons_refactor	2017-04-06 15:00:48 +09:00
Andrey Zavadskiy	0946e42363	removed useless stuff	2017-04-05 22:51:43 +03:00
Andrey Zavadskiy	6a510097df	InGameOverlay fixes	2017-04-05 22:36:03 +03:00
Dean Herbert	4aafc172ca	Allow playfield to specify whether it has a cursor or not.	2017-04-05 17:38:57 +09:00
Dean Herbert	4b1588a21d	Fix correct mode filter not being applied when first entering song select.	2017-04-05 17:33:19 +09:00
Dean Herbert	8173d01d78	Fix crash on changing play mode too early.	2017-04-05 17:26:45 +09:00
Andrey Zavadskiy	f2a9ec0f24	Converted constructor to protected	2017-04-04 19:02:36 +03:00
Andrey Zavadskiy	7b95f2d46a	InGameOverlay now is abstract	2017-04-04 18:53:13 +03:00
Andrey Zavadskiy	62655b70c9	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-04 18:41:37 +03:00
Jorolf	b2731bb0a1	some formatting	2017-04-04 17:27:08 +02:00
Jorolf	58f8dc8254	add direction to graphs	2017-04-04 17:17:22 +02:00
Dean Herbert	7c74951454	Update bindables. ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCaseResults.cs # osu.Game/Screens/Ranking/ResultModeButton.cs # osu.Game/Screens/Ranking/Results.cs	2017-04-04 11:34:13 +09:00
Dean Herbert	f6303d55ec	Upodate some tab usages.	2017-04-04 11:13:09 +09:00
Dean Herbert	d0ebbad0fa	Fix avatar display.	2017-04-04 10:33:41 +09:00
Jorolf	8e689a06d8	change font	2017-04-03 23:03:49 +02:00
Jorolf	5a694e0c9d	changed location of BarGraph to be more generic	2017-04-03 19:29:13 +02:00
Jorolf	f3946bebb4	Merge branch 'master' of git://github.com/ppy/osu into details	2017-04-03 18:33:47 +02:00
smoogipooo	27132958c8	Merge remote-tracking branch 'origin/master' into taiko-drawable-generation ... Conflicts: osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-04-03 14:19:31 +09:00
Dean Herbert	263374a357	Remove unnecessary using.	2017-04-02 17:11:31 +09:00
Dean Herbert	bfa2e68bfb	Container->Wrapper.	2017-04-02 16:17:13 +09:00
Dean Herbert	6f1fff4ee7	Update async load usage to new style.	2017-04-02 15:56:12 +09:00
Andrey Zavadskiy	1ecff1b32c	Fix naming and testcase	2017-04-01 21:50:25 +03:00
Andrey Zavadskiy	f70de7439b	Moved title and description to each class	2017-04-01 21:42:12 +03:00
Andrey Zavadskiy	bd123fa906	Better inheritance	2017-04-01 21:29:17 +03:00
Andrey Zavadskiy	e3a8a14281	Removed unnecessary using	2017-04-01 21:19:49 +03:00
Andrey Zavadskiy	ebc814f06a	Typos fix	2017-04-01 21:17:24 +03:00
Andrey Zavadskiy	3574dac780	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-01 21:03:19 +03:00
Jorolf	017281246d	changed SpriteText to OsuSpriteText	2017-04-01 18:12:44 +02:00
Jorolf	d0b4f86725	fix errors from merge	2017-04-01 14:16:18 +02:00
Jorolf	072a77b4d9	Merge branch 'master' of git://github.com/ppy/osu into details	2017-04-01 14:12:20 +02:00
Jorolf	e380254386	remove unnecessary code	2017-03-31 22:32:09 +02:00
Jorolf	1f19d72474	removed wrong using >.>	2017-03-31 21:24:05 +02:00
Jorolf	d8bb72dd78	remove unused using-directive	2017-03-31 21:19:23 +02:00
Jorolf	50b8580141	add license header	2017-03-31 21:13:20 +02:00
Jorolf	47698be1f5	Merge branch 'master' into details	2017-03-31 21:10:45 +02:00
Dean Herbert	24d06fa92d	CheckBox -> Checkbox.	2017-03-31 17:38:33 +09:00
Dean Herbert	fa7c72a099	Refactor ReplayInputHandler creation for more flexibility.	2017-03-31 15:59:53 +09:00
Jorolf	0d4f2c59a5	there's probably something in here I overlooked	2017-03-30 17:32:18 +02:00
Jorolf	15326204d5	Merge branch 'master' of git://github.com/ppy/osu into details	2017-03-30 16:38:25 +02:00
smoogipooo	76d0beb64f	Fix custom transform.	2017-03-30 22:28:51 +09:00
Jorolf	a3430dd072	add culture info	2017-03-29 16:10:07 +02:00
Jorolf	cdb3150c56	add readonlies and remove unused using directives	2017-03-29 16:00:29 +02:00
Jorolf	6982529481	Merge branch 'master' of git://github.com/ppy/osu into details	2017-03-29 15:47:00 +02:00
Jorolf	ab4d1c7725	better maxValue calculation for the retry and fail graph	2017-03-29 15:33:36 +02:00
Jorolf	7bd13d76a8	fixes + updates to DetailsBar and a button for the TestCaseDetails	2017-03-29 14:48:43 +02:00
Dean Herbert	6afa6f30cc	Keep selected beatmap in centre of screen post-filter.	2017-03-29 20:01:46 +09:00
Dean Herbert	fa7fd6efe3	Fix mode selector not invoking a re-filter.	2017-03-29 19:48:13 +09:00
Dean Herbert	b96a153e0e	Resize ranks better.	2017-03-29 12:24:04 +09:00
smoogipooo	eed50784ba	Make player work with TaikoHitRenderer.	2017-03-29 11:35:57 +09:00
Dan Balasescu	d7674e2367	Merge branch 'master' into dynamic-recompile	2017-03-29 10:12:48 +09:00
Dean Herbert	ab97967237	Update references and framework.	2017-03-29 09:54:00 +09:00
Dan Balasescu	bca18ce209	Merge branch 'master' into move-easingtypes	2017-03-29 08:14:13 +09:00
Dan Balasescu	e53a5a3521	Merge branch 'master' into avatars-and-login	2017-03-29 07:52:43 +09:00
Jorolf	199c70ff95	Added fails and retries	2017-03-28 20:18:56 +02:00
Jorolf	305bc9cff6	Merge branch 'master' of git://github.com/ppy/osu into details	2017-03-28 17:14:35 +02:00
Jorolf	909fdb647c	Added ratings and different bar rotations	2017-03-28 17:12:54 +02:00
Dean Herbert	f7dc7e9bb9	Update references.	2017-03-28 21:26:20 +09:00
Andrey Zavadskiy	91e18cc63e	Fix usings	2017-03-28 12:12:35 +03:00
Andrey Zavadskiy	cf3db49631	Inherit Pause/Fail overlay from InGameOverlay	2017-03-28 12:09:26 +03:00
Andrey Zavadskiy	687f71e410	Fixes	2017-03-28 11:45:48 +03:00
Andrey Zavadskiy	60be69d3b0	Fixes	2017-03-28 11:41:08 +03:00
Andrey Zavadskiy	85c2184170	Fixes	2017-03-28 11:33:56 +03:00
Andrey Zavadskiy	62693a6a59	Again separate classes	2017-03-28 10:49:58 +03:00
Dean Herbert	4042b94e01	Use DelayedLoadContainer in more places.	2017-03-28 15:28:58 +09:00
Dean Herbert	f690e1d0c4	Move async logic to framework.	2017-03-28 14:24:34 +09:00
Andrey Zavadskiy	9774f826ab	Pause and fail overlays -> StopOverlay	2017-03-28 06:08:31 +03:00
Andrey Zavadskiy	c4500fa270	fixes	2017-03-28 05:19:32 +03:00
Andrey Zavadskiy	110d43bc25	fixes	2017-03-28 05:12:04 +03:00
Andrey Zavadskiy	457f5c6a89	Removed unised using statement	2017-03-28 04:58:30 +03:00
Andrey Zavadskiy	2348b619a3	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-03-28 04:55:46 +03:00
Andrey Zavadskiy	5461c6516a	Refactor PauseOverlay, FailDialog -> FailOverlay	2017-03-28 04:53:57 +03:00
Andrey Zavadskiy	2f9a15092b	Refactor pause buttons	2017-03-28 04:52:11 +03:00
Dean Herbert	13272e6995	Make Avatar accept a user. ... Add UpdateableAvatar to handle the toolbar use-case.	2017-03-28 00:08:26 +09:00
Dean Herbert	0ad070c2d8	Update grade textures.	2017-03-27 22:24:47 +09:00
Jorolf	775fd63d0f	Added difficulty container	2017-03-25 23:33:03 +01:00
Jorolf	d8724e5e3e	Add metadata details	2017-03-24 23:02:24 +01:00
DrabWeb	f0035659db	Unused using	2017-03-24 00:45:19 -03:00
DrabWeb	a6dfed9668	Formatting	2017-03-24 00:41:56 -03:00
DrabWeb	0edee04200	Use OsuColour instead of static colours	2017-03-24 00:41:14 -03:00
Dean Herbert	cb0c7dca71	Merge branch 'master' into taiko_scoreprocessing	2017-03-24 12:25:19 +09:00
DrabWeb	f1f6f2041f	Null track handling in player	2017-03-23 23:57:33 -03:00
DrabWeb	befbc63c35	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-23 23:42:06 -03:00
DrabWeb	b56fb310bf	More cleanup	2017-03-23 23:38:23 -03:00
smoogipooo	2074812f46	Move ScoreProcessor and Score to Scoring/.	2017-03-24 09:51:52 +09:00
DrabWeb	0a11d035fe	Formatting	2017-03-23 09:07:13 -03:00
DrabWeb	b429d8f1b3	More proper fix	2017-03-23 09:05:53 -03:00
DrabWeb	3364801221	Fix for the fix	2017-03-23 08:32:24 -03:00
DrabWeb	bbca6cf602	Fix bottom square being clipped	2017-03-23 08:13:03 -03:00
DrabWeb	938f5eaf58	Dragging	2017-03-23 07:38:08 -03:00
Dean Herbert	63d7c5a5a3	Pressing back while mod select is visible should close mod select before exiting.	2017-03-23 19:35:46 +09:00
Dean Herbert	8c4fd44a85	Tidy up song select footer and fix depth of mod select vs osu! cookie.	2017-03-23 19:32:58 +09:00
DrabWeb	ca2816f9c8	Formatting	2017-03-23 07:24:43 -03:00
DrabWeb	3923892863	Delete SongProgressGraphColumn.cs	2017-03-23 07:20:16 -03:00
DrabWeb	546a3d0914	Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph	2017-03-23 07:15:53 -03:00
DrabWeb	0337f18fb9	Cleaning	2017-03-23 06:37:12 -03:00
Dean Herbert	b5d661b53a	some fixing and restyling.	2017-03-23 18:20:00 +09:00
Dean Herbert	4d61424abd	Merge branch 'master' into song-progress-graph	2017-03-23 17:44:22 +09:00
Dean Herbert	644e9ae9d5	Increase padding to make flyte happy.	2017-03-23 16:36:52 +09:00
Dean Herbert	6bcbd116c8	Only get APIAccess from DI (it's all we need).	2017-03-23 16:32:35 +09:00
Dean Herbert	3ae7d0cb98	Better handle the passing of Beatmap and updating of scores. ... PresentScores was dangerous as it could potentially bring up unsafe threading scenarios. This ensures everything will work well in all cases.	2017-03-23 16:31:08 +09:00
Dean Herbert	a561611125	Set default tab to global scores. ... This will need to be saved to the config file eventually.	2017-03-23 16:29:10 +09:00
Dean Herbert	022fd625df	Remove transitions for now ... If you want to add transitions, the containers should be IStateful so we can discern their state for later use (because I switched to Show/Hide I can use IsPresent for now). We should probably look at moving the VisibilityState portion of OverlayContainer into a new StatefulContainer class or similar, so it can be used in situations like this.	2017-03-23 16:28:45 +09:00
DrabWeb	88d878e1d5	Formatting	2017-03-23 02:47:27 -03:00
DrabWeb	b8129526a4	Typo	2017-03-23 02:29:23 -03:00
Dean Herbert	e77229b34b	Merge branch 'master' into beatmap-detail-tabs	2017-03-23 14:26:00 +09:00
Dean Herbert	681ed38941	Use const whenever possible.	2017-03-23 13:52:38 +09:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
DrabWeb	b8b45262c5	Formatting	2017-03-23 01:35:55 -03:00
DrabWeb	67421cdf1c	Even though it was 5 minutes ago what was I thinking	2017-03-23 01:34:06 -03:00
DrabWeb	677b8afc1f	Integration	2017-03-23 01:19:29 -03:00
DrabWeb	87b8015e8f	Cleanup	2017-03-23 00:29:28 -03:00
DrabWeb	c173c4b7ee	Tab control	2017-03-23 00:22:31 -03:00
DrabWeb	5ebbc2c0ba	Formatting	2017-03-22 09:33:01 -03:00
DrabWeb	818bdd8e88	SongProgress in HudOverlay	2017-03-22 09:27:04 -03:00
DrabWeb	333008e26d	Formatting	2017-03-22 08:59:44 -03:00
DrabWeb	340ddb59cd	License headers	2017-03-22 08:54:21 -03:00
DrabWeb	29c54d4d8b	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-22 08:50:17 -03:00
Dean Herbert	fbe08436d2	Fix usages of CircularContainer in line with framework changes.	2017-03-22 19:35:03 +09:00
Dean Herbert	f3486b7288	Add correct lifetime expiry for leaderboard content	2017-03-22 09:07:02 +09:00
Dean Herbert	7387dbd9fc	Tidy up LeaderboardScore	2017-03-22 09:04:33 +09:00
Dean Herbert	1699daaf7f	Make DrawableRank safer.	2017-03-22 08:32:28 +09:00
Dean Herbert	8983bbcaad	Merge branch 'master' into leaderboards	2017-03-22 08:24:49 +09:00
Dean Herbert	0b2bb2ea0e	Fix typo in font name declaration.	2017-03-21 22:51:49 +09:00
smoogipooo	d27f37beb5	Hard-code text size in cases it wasn't set.	2017-03-20 13:48:06 +09:00
Dean Herbert	09bf014ded	Simplify fade out gradient code.	2017-03-19 21:49:29 +09:00
Dean Herbert	5d0adc6454	Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards	2017-03-19 18:51:53 +09:00
Dean Herbert	256a3268ac	Inline single usage of EdgeEffect.	2017-03-19 18:51:40 +09:00
Thomas Müller	44f71b3975	Merge branch 'master' into fix-beatmap-options	2017-03-19 09:34:53 +01:00
Dean Herbert	8cb334a118	Adjust sizing a touch.	2017-03-19 16:34:29 +09:00
DrabWeb	b0e7296e25	-IHasDrawableRepresentation, User.Region -> Country	2017-03-19 00:09:58 -03:00
Dean Herbert	3d8ec4fa05	FIx transition not always being correct.	2017-03-19 02:33:25 +09:00
Dean Herbert	3c7b4a8ffa	Fix cursor being displayed during disclaimer.	2017-03-19 01:59:13 +09:00
DrabWeb	0bc8ed9c9e	Use Colour for non-faded scores	2017-03-18 01:56:19 -03:00
DrabWeb	e78069af12	Parenthesis	2017-03-18 01:48:29 -03:00
DrabWeb	b9d5ab5d8c	Only calculate fade for fading leaderboard scores	2017-03-18 01:44:05 -03:00
DrabWeb	fbb8e79f1a	Move ctor above methods	2017-03-17 19:45:51 -03:00
DrabWeb	137611ecf3	Use LeaderboardScore height for fade	2017-03-17 19:07:45 -03:00
DrabWeb	82c02fa1fc	Formatting	2017-03-17 18:29:55 -03:00
Seth	4aea06be22	Merge branch 'master' into leaderboards	2017-03-17 18:23:01 -03:00
DrabWeb	27ab8e2e86	Merge	2017-03-17 18:21:35 -03:00
DrabWeb	0834b5b794	Made requested changes	2017-03-17 18:16:59 -03:00
Dan Balasescu	e529f5e439	Merge branch 'master' into song-select-loading-reoptimisation	2017-03-18 02:12:56 +09:00
smoogipooo	bcaf12e3d9	Rename Criteria -> CreateCriteria and make into method.	2017-03-18 02:11:14 +09:00
Dan Balasescu	cd30958086	Merge branch 'master' into song-select-loading-reoptimisation	2017-03-18 01:25:22 +09:00
Dean Herbert	3e3cde01ef	Fix missing permitNulls.	2017-03-17 21:21:16 +09:00
Dean Herbert	f9f31ca092	Add statefulness to MenuCursor.	2017-03-17 20:45:27 +09:00
Dean Herbert	7110ab8e17	Stop cursor moving when paused.	2017-03-17 20:45:27 +09:00
Dean Herbert	0a03bdc428	Add missing license header.	2017-03-17 20:44:02 +09:00
Dean Herbert	6be80c95ae	Preload song select from main menu.	2017-03-17 20:11:59 +09:00
Dean Herbert	c7fa79b027	Fix nullref.	2017-03-17 20:09:23 +09:00
Dean Herbert	907236e475	Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria.	2017-03-17 19:54:51 +09:00
Dean Herbert	4b97304603	CarouselContainer -> BeatmapCarousel.	2017-03-17 19:12:54 +09:00
Dean Herbert	dc28f8c79e	Remove all external access to BeatmapGroup.	2017-03-17 19:12:15 +09:00
Dean Herbert	9c664e5b05	Reorganise song select methods to allow for more flexibility.	2017-03-17 11:52:54 +09:00
smoogipooo	9a4af8f194	GetScore -> CreateScore.	2017-03-17 02:03:12 +09:00
smoogipooo	2394e7ff78	Make CheckFailed not actually trigger internal things, and make private.	2017-03-17 01:36:30 +09:00
Dean Herbert	ea642e5ef4	Merge branch 'master' into scoreprocessor_failing_improvements	2017-03-17 00:52:30 +09:00
Dean Herbert	e78bcf8739	Update TabControl in line with framework changes.	2017-03-17 00:39:40 +09:00
smoogipooo	b13340c3c8	Move CheckFailed outside of Schedule().	2017-03-17 00:30:23 +09:00
Dean Herbert	60fc782e93	Merge branch 'master' into beatmap_timinginfo	2017-03-16 23:08:24 +09:00
Dean Herbert	271dddc9a7	Merge branch 'master' into generic_scoreprocessor	2017-03-16 23:04:19 +09:00
Dean Herbert	110bdbd0c1	Make everything share DropDown implementations again. Remove unnecessary files.	2017-03-16 21:17:14 +09:00
Dean Herbert	ab8a5afdb9	AlwaysReceiveInput and InternalContains.	2017-03-16 17:38:36 +09:00
smoogipooo	5137338c7c	Replace List<ControlPoint> with TimingInfo in Beatmap.	2017-03-16 17:11:24 +09:00
Dean Herbert	e17f728282	Fix CI.	2017-03-16 17:04:03 +09:00
Dean Herbert	1a7c2eda5e	Size FilterControl relatively now that we can.	2017-03-16 17:01:02 +09:00