21633 Commits

Author	SHA1	Message	Date
smoogipoo	243e913e4a	Add hitobject usage events	2020-11-12 18:32:20 +09:00
smoogipoo	fe347c8661	Add playfield support for keeping hitobjects alive	2020-11-12 18:30:32 +09:00
smoogipoo	7548db7ecc	Fix hitobjects sometimes not fading in completely with HD mod	2020-11-12 18:29:22 +09:00
Andrei Zavatski	7177dd5d82	Add counter to most played beatmaps section in user overlay	2020-11-12 18:29:22 +09:00
Dean Herbert	8a2addbf3d	Update framework	2020-11-12 18:29:22 +09:00
Dean Herbert	d9750fc043	Remove duplicate instantiation of externalLinkOpener	2020-11-12 18:29:22 +09:00
smoogipoo	a8c2b798ad	Add support for nested hitobject pooling	2020-11-12 17:43:51 +09:00
smoogipoo	e44a8b3934	Resort as early as possible	2020-11-12 17:07:20 +09:00
Dean Herbert	41a1730927	Merge pull request #10794 from smoogipoo/fix-osu-hd-mod	2020-11-12 17:06:04 +09:00
Dean Herbert	25af091409	Fix storyboard animations of very old beatmaps playing too slow ... Closes https://github.com/ppy/osu/issues/10772.	2020-11-12 17:03:43 +09:00
smoogipoo	cf91962865	Fix test failures due to on-the-fly starttime changes	2020-11-12 16:58:40 +09:00
smoogipoo	974390bda7	Make Add() + Remove() virtual	2020-11-12 15:36:02 +09:00
smoogipoo	72a6b75626	Add back removed event	2020-11-12 15:34:51 +09:00
smoogipoo	4e43235955	Fix double bind leading to test failures	2020-11-12 15:33:49 +09:00
smoogipoo	653f5bce67	Reword xmldocs	2020-11-12 15:00:58 +09:00
smoogipoo	16e4e8d032	Fix possible nullref	2020-11-12 14:54:33 +09:00
smoogipoo	1f8d376b85	Replace CreatePool() with non-virtual RegisterPool() overload	2020-11-12 14:17:33 +09:00
smoogipoo	5dbbe11fc6	Remove PoolHitObjects, use return value of CreateDrawableRepresentation() instead	2020-11-12 14:04:16 +09:00
smoogipoo	f652eb9982	Remove GetDrawableRepresentation() override, add null hinting	2020-11-12 13:18:44 +09:00
smoogipoo	d7d77460fb	Small refactorings	2020-11-12 12:55:42 +09:00
Dean Herbert	ad79c2bc62	Avoid multiple enumeration by converting to array at construction time	2020-11-12 10:55:22 +09:00
Andrei Zavatski	f753f138c6	Add counter to most played beatmaps section in user overlay	2020-11-12 03:11:29 +03:00
Dean Herbert	ef5e3d5ab8	Merge pull request #10796 from smoogipoo/fix-incorrect-framestability-value ... Fix frame stable playback not being set correctly	2020-11-11 19:54:45 +09:00
smoogipoo	a8929b0764	Revert unnecessary change of casting	2020-11-11 19:27:07 +09:00
smoogipoo	7fdaf69903	Add some more xmldocs	2020-11-11 19:12:12 +09:00
smoogipoo	606cfacedf	Fix state update exception in a better way	2020-11-11 19:01:12 +09:00
smoogipoo	7d02018134	Remove some unnecessary implementations for now	2020-11-11 18:54:40 +09:00
smoogipoo	d7bee80d4e	Merge branch 'fix-incorrect-framestability-value' into hitobject-pooling-base	2020-11-11 18:52:51 +09:00
smoogipoo	90499329bd	Fix frame stable playback not being set correctly	2020-11-11 18:50:38 +09:00
Dean Herbert	a08833f3b3	Update framework	2020-11-11 18:03:04 +09:00
Bartłomiej Dach	2b2f0321fd	Merge branch 'master' into fix-osu-hd-mod	2020-11-11 09:45:45 +01:00
smoogipoo	6f7a1dd57d	Merge branch 'master' into hitobject-pooling-base	2020-11-11 17:09:18 +09:00
Dean Herbert	6fa0cc9bda	Merge pull request #10792 from peppy/remove-double-external-link-opener ... Remove duplicate instantiation of externalLinkOpener	2020-11-11 16:58:35 +09:00
smoogipoo	5d55af5818	Fix hitobjects sometimes not fading in completely with HD mod	2020-11-11 16:35:48 +09:00
Dean Herbert	804450e707	Remove duplicate instantiation of externalLinkOpener	2020-11-11 15:49:45 +09:00
smoogipoo	7df9484458	Merge branch 'master' into add-random-skin-hotkey	2020-11-11 15:48:12 +09:00
Dan Balasescu	09324c4598	Merge pull request #3652 from WebFreak001/shuffle-skin ... Add "random skin" option to skin setting dropdown	2020-11-11 15:47:00 +09:00
Dan Balasescu	8ad84d6640	Merge branch 'master' into osd-custom-bindings-display	2020-11-11 15:12:31 +09:00
Dan Balasescu	b446f21c68	Merge pull request #10786 from peppy/osd-skin-display ... Display skin changes via on-screen display overlay	2020-11-11 15:12:19 +09:00
Dean Herbert	c308eb75d9	Move logic for performing actions from specific screen to its own component	2020-11-11 14:45:50 +09:00
Dean Herbert	f78f2fb59e	Merge branch 'osd-custom-bindings-display' into add-random-skin-hotkey	2020-11-11 13:53:49 +09:00
Dean Herbert	324626e097	Move default config tracking calls out of OnScreenDisplay itself	2020-11-11 13:53:09 +09:00
Dean Herbert	11cf04eed1	Fix frames potentially getting added to spectator replay in wrong format ... The way spectator currently works, the `Spectator` screen is responsible for adding new frames to the replay, even when it has a child (`SpectatorPlayer`) present. There was a possibility that a new play had already started, and on returning to the Spectator screen (to initialise the new play) there would be a brief period where the Player instance is still reading from the replay, the `userBeganPlaying` call had not yet finished initialising the new target replay, and `userSentFrames` is run (asynchronously), writing frames to the previous replay using the incorrect ruleset instance). To make this work, it doesn't `Schedule` frame addition to the replay (making things a bit unsafe). Changing this itself isn't such a simple one to do, so I instead opted to fix this via locking. Closes https://github.com/ppy/osu/issues/10777.	2020-11-11 13:39:43 +09:00
Dean Herbert	8d38d9cc93	Add hotkey to select random skin	2020-11-11 13:05:03 +09:00
Dean Herbert	df00a4ab9b	Merge branch 'osd-custom-bindings-display' into shuffle-skin	2020-11-11 13:00:32 +09:00
Dean Herbert	3364648fe2	Merge branch 'osd-skin-display' into shuffle-skin	2020-11-11 13:00:31 +09:00
Dean Herbert	6014751e29	Add the ability for the game OSD to display user bindings ... Adds binding display for mouse button toggle / HUD toggle keys. - [ ] Depends on #10786 for ease-of-merge	2020-11-11 12:56:10 +09:00
Dean Herbert	9caa56c64f	Display skin changes via on-screen display overlay	2020-11-11 12:19:01 +09:00
Dean Herbert	6674628bc7	Only include user skins in random choices	2020-11-11 12:03:38 +09:00
Dean Herbert	6b548ef5e4	Split out SkinInfo ID constants and fix random logic	2020-11-11 11:54:40 +09:00
Dean Herbert	6593aac3f2	Merge pull request #7762 from EVAST9919/history-graph	2020-11-11 11:35:34 +09:00
Dean Herbert	a5e13e4d2c	Merge branch 'master' into shuffle-skin	2020-11-11 11:34:48 +09:00
Dan Balasescu	451f0a29c6	Merge pull request #10784 from peppy/fix-best-performance-weighting ... Fix user profile best performance weighting being out of order	2020-11-11 11:21:43 +09:00
Dean Herbert	89c4e3d3b2	Merge branch 'master' into history-graph	2020-11-11 11:01:48 +09:00
Dean Herbert	8706b51b77	Merge pull request #10717 from smoogipoo/dho-apply	2020-11-11 10:54:24 +09:00
Dean Herbert	53c968e137	Fix user profile best performance weighting being out of order	2020-11-11 10:19:59 +09:00
Andrei Zavatski	6c428d8b11	Merge master with conflicts resolved	2020-11-11 01:37:01 +03:00
Bartłomiej Dach	546249b071	Temporarily fix crash on deleting control point groups	2020-11-10 21:32:47 +01:00
smoogipoo	b725c9cce9	Fix possible nullrefs	2020-11-11 00:24:28 +09:00
smoogipoo	e525784cb2	Clear lifetimeEntry after use	2020-11-11 00:24:14 +09:00
smoogipoo	99e5450af3	Cache DrawableRuleset	2020-11-11 00:22:36 +09:00
smoogipoo	66213f2ed0	Add pooling support to DrawableRuleset + Playfield	2020-11-10 23:56:32 +09:00
smoogipoo	31e4d71852	Rewrite HitObjectContainer with pooling support	2020-11-10 22:49:02 +09:00
smoogipoo	5354ef1699	Merge branch 'dho-apply' into hitobject-pooling-base	2020-11-10 22:30:08 +09:00
Bartłomiej Dach	20f9759a2e	Merge branch 'master' into fix-storyboard-sprite-paths	2020-11-10 12:57:10 +01:00
Dean Herbert	e1dcac4d8b	Update framework	2020-11-10 20:29:29 +09:00
Bartłomiej Dach	61093030ee	Remove redundant class name qualifier	2020-11-10 12:20:49 +01:00
Bartłomiej Dach	ce837eaba0	Rename variables	2020-11-10 12:20:26 +01:00
Bartłomiej Dach	dd873dbd85	Merge branch 'master' into fix-profile-graph-crash	2020-11-10 12:17:12 +01:00
smoogipoo	6f3f6dc28b	Add hitobject lifetime support	2020-11-10 20:16:52 +09:00
cadon0	539806e9d6	Rewrite - Add empty drawable whenever sprite not found	2020-11-10 23:52:37 +13:00
cadon0	6446074976	Fix paths for storyboard animation sprites	2020-11-10 23:52:37 +13:00
smoogipoo	45e9f16f6b	Add initial DrawableRuleset interface	2020-11-10 19:27:08 +09:00
smoogipoo	757a4b5c31	Add hitobject lifetime model	2020-11-10 19:26:01 +09:00
smoogipoo	88112801eb	Remove result storage from hitobject	2020-11-10 18:56:16 +09:00
Dan Balasescu	ef1036cef1	Merge pull request #10767 from peppy/fix-editor-crash-on-two-mouse-button-click ... Fix BlueprintContainer triggering assert when left and right mouse button are pressed together	2020-11-10 18:41:58 +09:00
Dan Balasescu	d873229120	Merge pull request #10769 from peppy/fix-mod-select-keys-handle-control ... Stop mod select overlay hotkeys handling input when control is pressed	2020-11-10 18:37:14 +09:00
smoogipoo	f5076fe3b8	Revert unnecessary change	2020-11-10 18:15:11 +09:00
Dan Balasescu	4e3f6f19f4	Merge pull request #10768 from bdach/force-import-standardised ... Always store standardised score when populating ScoreInfo	2020-11-10 18:12:35 +09:00
Dean Herbert	833c0b223e	Clamp index to valid bounds	2020-11-10 18:08:12 +09:00
Dean Herbert	2e3dc6fc46	Merge branch 'master' into fix-profile-graph-crash	2020-11-10 18:06:51 +09:00
Dean Herbert	28daff1716	Stop mod select overlay hotkeys handling input when control is pressed ... Closes https://github.com/ppy/osu/issues/10766 in about the best way we can for now.	2020-11-10 17:57:59 +09:00
Dan Balasescu	601cc477e5	Merge branch 'master' into fix-editor-crash-on-two-mouse-button-click	2020-11-10 17:42:25 +09:00
Dan Balasescu	86026ad98f	Merge pull request #10764 from peppy/fix-editor-quick-delete-via-left-mouse ... Fix editor quick delete being triggerable from left mouse button	2020-11-10 17:42:12 +09:00
Dean Herbert	de6fcd1792	Fix BlueprintContainer triggering assert when left and right mouse button are pressed together	2020-11-10 17:16:28 +09:00
Dean Herbert	a012105dac	Fix editor quick delete being triggerable from left mouse button ... Closes https://github.com/ppy/osu/issues/10629.	2020-11-10 16:54:37 +09:00
Bartłomiej Dach	109abc0e29	Always store standardised score when populating ScoreInfo	2020-11-10 08:41:00 +01:00
Dean Herbert	5221a34929	Only handle keys which create characters	2020-11-10 16:32:58 +09:00
Dean Herbert	a2ef3aa21a	Force beatmap listing overlay's textbox back on screen when a key is pressed ... Not the cleanest solution, but works for now. Will eventually be replaced after the header is updated to reflect the latest designs (which keeps it on screen in all cases). Closes https://github.com/ppy/osu/issues/10703.	2020-11-10 16:26:30 +09:00
Andrei Zavatski	e464e719ef	Merge remote-tracking branch 'refs/remotes/ppy/master' into history-graph	2020-11-10 10:22:57 +03:00
Dean Herbert	6cc0bf17a9	Add explicit lock object and some xmldoc for clarity	2020-11-10 14:31:52 +09:00
Dean Herbert	dc21aebdc7	Merge branch 'master' into fix-bdc-threadsafety	2020-11-10 14:31:51 +09:00
Dean Herbert	85d641c630	Merge pull request #10740 from Game4all/add-multi-statuses	2020-11-10 14:23:26 +09:00
Dean Herbert	4855e43764	Merge pull request #10758 from nbvdkamp/rank-history-json-property-fix ... Replace rankHistory in JsonProperty with rank_history for consistency	2020-11-10 14:05:25 +09:00
Dean Herbert	582b5454ed	Merge pull request #10759 from Joehuu/disable-watching-yourself	2020-11-10 13:10:54 +09:00
Dean Herbert	4af390a168	Move hierarchy init to load and remove unnecessary field storage	2020-11-10 12:33:07 +09:00
Dean Herbert	de554f9091	Merge pull request #10742 from Morilli/fix-ki-texture-positioning	2020-11-10 12:27:40 +09:00
Joehu	670d6d8719	Make button field readonly	2020-11-09 18:59:54 -08:00
Joehu	c671d97e6f	Disable watch button on the local user	2020-11-09 18:39:35 -08:00
kamp	4303a24a6f	Replace rankHistory in JsonProperty with rank_history	2020-11-10 00:53:24 +01:00
Dean Herbert	37feedae7a	Fix potential crash due to stale index	2020-11-10 07:27:38 +09:00
Dean Herbert	1548c0dc25	Ensure graph hover state is updated after data changes	2020-11-10 07:27:27 +09:00
smoogipoo	0bab5605d1	Merge branch 'master' into dho-apply	2020-11-10 01:30:45 +09:00
smoogipoo	d4d3a6621e	Disable automatic lifetime management	2020-11-10 01:30:25 +09:00
smoogipoo	66ea1572c7	Fix unsafe list manipulation in BeatmapDifficultyCache	2020-11-10 01:10:00 +09:00
smoogipoo	ac47399e6e	Update state after OnApply()	2020-11-10 00:30:23 +09:00
smoogipoo	ec8b726ea8	Re-privatise start time bindable	2020-11-09 21:51:58 +09:00
Lucas A	b8c63e7944	Apply review suggestions.	2020-11-09 13:39:50 +01:00
Dean Herbert	ba137aadc8	Update framework	2020-11-09 20:44:12 +09:00
Dean Herbert	4d6f0a8ea7	Fix API request error handling	2020-11-09 19:42:00 +09:00
Dean Herbert	d99e1ba8dd	Merge branch 'master' into efficient-user-retrieval	2020-11-09 19:41:44 +09:00
Dan Balasescu	33c3b07101	Fix events not being bound correctly ... Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-11-09 19:06:48 +09:00
Dan Balasescu	a2877fb00a	Merge pull request #10730 from peppy/fix-patcher-no-object-crash ... Fix legacy patcher crash on no objects present	2020-11-09 18:51:00 +09:00
Morilli	7b0e387dfc	apply different offset based on whether the marker is newStyle or not	2020-11-09 08:20:19 +01:00
Morilli	490fbd1dd8	Fix ki* textures having an incorrect vertical position	2020-11-09 05:54:48 +01:00
Dean Herbert	cfb42037cf	Refactor request string logic to avoid linq usage	2020-11-09 12:23:29 +09:00
Dean Herbert	690e69bcc6	Reforamt for legibility	2020-11-09 12:22:54 +09:00
Dean Herbert	dc69eefa51	Use HashSet instead of ConcurentBag	2020-11-09 11:54:28 +09:00
Dean Herbert	90ce1bd5f0	Add missing async suffix	2020-11-09 10:40:16 +09:00
Lucas A	e44951969f	Use ??= operator instead of null check.	2020-11-08 18:22:19 +01:00
Lucas A	d8d4022119	Precise XMLDoc	2020-11-08 14:39:56 +01:00
Lucas A	48fce8c4b9	Add user activities to multi subscreens.	2020-11-08 13:21:21 +01:00
Lucas A	89b98b5388	Make multiplayer screen handle user activity updates from subscreens.	2020-11-08 13:16:27 +01:00
Lucas A	55070556a7	Move activity setup to BDL.	2020-11-08 12:53:19 +01:00
Lucas A	790a2ca97d	Extract UserActivity logic to OsuGame.	2020-11-08 12:29:52 +01:00
Dean Herbert	42e4df8cc8	Merge branch 'master' into efficient-user-retrieval	2020-11-08 14:35:40 +09:00
Dean Herbert	567cf932f1	Merge pull request #10732 from bdach/editor-exit-stack-overflow ... Fix crash upon exiting the editor without saving from new beatmap	2020-11-08 12:12:24 +09:00
Bartłomiej Dach	6d4bb4316c	Fix difficulty retrieval for online-sourced beatmaps	2020-11-08 00:12:25 +01:00
Bartłomiej Dach	ddbd6df24d	Unbind bindable lists for general safety	2020-11-07 20:59:57 +01:00
Bartłomiej Dach	e078b78dcc	Ensure callbacks don't fire when restoring default beatmap	2020-11-07 20:59:57 +01:00
Dean Herbert	b0052210b6	Add asserts of HitObjects indices	2020-11-08 00:18:38 +09:00
Dean Herbert	c5b6908e71	Always write [HitObjects] to file ... I think this is expected. If not, there's an alternative solution.	2020-11-08 00:18:27 +09:00
Dean Herbert	d93cf08570	Merge branch 'master' into dho-apply	2020-11-07 01:18:46 +09:00
smoogipoo	91c627c22d	Revert HOC changes	2020-11-07 00:57:33 +09:00
smoogipoo	b1e039bcec	Prevent overrides from messing with application/freeing	2020-11-07 00:40:26 +09:00
smoogipoo	3a4bd73823	Fix DHOs being freed when not expected	2020-11-07 00:25:26 +09:00
Dean Herbert	f94ac1cbc7	Merge branch 'master' into efficient-user-retrieval	2020-11-07 00:07:29 +09:00
Dean Herbert	84e090583d	Merge pull request #10712 from peppy/move-cache-logic-to-base-impl ... Move cache and lookup logic to base MemoryCachingComponent class	2020-11-07 00:06:43 +09:00
smoogipoo	7eceda242b	Change derived class to use property	2020-11-06 23:04:28 +09:00
smoogipoo	2d892c7407	Allow Apply() to be called multiple times sequentially	2020-11-06 23:03:29 +09:00
smoogipoo	248d342a2f	Initial Apply()/FreeAfterUse() DHO implementation	2020-11-06 23:02:37 +09:00
smoogipoo	2bef9312d9	Make SkinReloadableDrawable poolable	2020-11-06 22:15:06 +09:00
Dan Balasescu	f230250faf	Merge branch 'master' into editor-slider-control-point-quick-delete	2020-11-06 21:47:37 +09:00
Dean Herbert	4bbd3fe886	Handle null result	2020-11-06 18:37:27 +09:00
Dean Herbert	c3c288145a	Ignore null results for now	2020-11-06 17:55:29 +09:00
Dean Herbert	1ca8b03aa5	Never disable pause button on now playing overlay	2020-11-06 17:26:23 +09:00
Dean Herbert	24be1e183b	Merge branch 'move-cache-logic-to-base-impl' into efficient-user-retrieval	2020-11-06 17:24:36 +09:00
Dean Herbert	c1c3d37720	Remove non-null assert	2020-11-06 17:24:28 +09:00
Dean Herbert	c97c6bbf52	Add and consume user cache class	2020-11-06 17:00:29 +09:00
Dean Herbert	893979b3de	Add exception if attempting to exceed the maximum supported lookup size for one request	2020-11-06 17:00:29 +09:00
Dean Herbert	2457083d8b	Add padding to currently playing view	2020-11-06 17:00:29 +09:00
Dean Herbert	db039da668	Add and consume multi-lookup API endpoint	2020-11-06 17:00:29 +09:00
Dean Herbert	aa252d562a	Rename top user request to make way for new type	2020-11-06 17:00:29 +09:00
Dean Herbert	f51cb0dd14	Add ruleset fallback logic into cache lookup class	2020-11-06 16:58:53 +09:00
Dean Herbert	d3a303e251	Use CheckExists function	2020-11-06 16:57:09 +09:00
Dean Herbert	9bb32f0914	Merge branch 'master' into move-cache-logic-to-base-impl	2020-11-06 16:56:35 +09:00
Dan Balasescu	44c6457c85	Merge branch 'master' into add-spinner-spin	2020-11-06 15:40:40 +09:00
Dean Herbert	c5b172d0dd	Remove synchronous lookup path from BeatmapDifficultyCache	2020-11-06 14:53:15 +09:00
Dan Balasescu	972fc54c2d	Merge pull request #10710 from peppy/user-id-as-int ... Use int instead of long for user_id fields for now	2020-11-06 14:35:14 +09:00
Dean Herbert	1dcbf15d81	Merge branch 'master' into move-cache-logic-to-base-impl	2020-11-06 14:35:06 +09:00
Dan Balasescu	9ec5f9bff8	Merge pull request #10711 from peppy/rename-cache-classes ... Rename cache classes in line with their function (and share a base implementation)	2020-11-06 14:34:47 +09:00
Dean Herbert	b69ada64e8	Update BeatmapDifficultyCache to use base implementation logic	2020-11-06 14:31:21 +09:00
Dean Herbert	a2606d31c7	Move lookup/storage/compute logic to base class (and consume in ScorePerformanceCache)	2020-11-06 13:51:41 +09:00
Dean Herbert	517a656899	Move StarDifficulty to own file	2020-11-06 13:51:25 +09:00
Dean Herbert	74ca2faa31	Remove unused using	2020-11-06 13:48:06 +09:00
Dean Herbert	07166ec819	Fix a couple of remaining unnecessary casts	2020-11-06 13:29:47 +09:00
Dean Herbert	0103b12575	Add basic base class to begin to standardise function across caching components	2020-11-06 13:26:39 +09:00
Dan Balasescu	71a1165209	Merge branch 'master' into drawable-hit-object-hit-state-fix	2020-11-06 13:19:25 +09:00
Dean Herbert	14bb079feb	Rename ScorePerformanceManager to ScorePerformanceCache	2020-11-06 13:15:33 +09:00
Dean Herbert	5113d4af8f	Rename BeatmapDifficultyManager to BeatmapDifficultyCache	2020-11-06 13:14:29 +09:00
Dean Herbert	1e1569eb53	Use int instead of long for user_id fields for now	2020-11-06 12:59:46 +09:00
Dean Herbert	d774afd224	Update framework	2020-11-05 22:29:44 +09:00
Dean Herbert	309b1d6334	Merge pull request #10695 from peppy/fix-skinnable-test-scene ... Fix SkinnableTestScene's autosize propagation	2020-11-05 20:48:36 +09:00
Dean Herbert	a0b3379909	Fix judgement offsets being zero when windows are empty	2020-11-05 18:58:37 +09:00
Dean Herbert	2bbdbfda5c	Merge pull request #10696 from smoogipoo/visibility-adjustment-mod	2020-11-05 18:18:57 +09:00
Dean Herbert	2d50a7b616	Fix a few xmldoc typos	2020-11-05 17:38:02 +09:00
Dean Herbert	019d286ce8	Merge branch 'drawable-hit-object-hit-state-fix' into add-spinner-glow	2020-11-05 17:27:38 +09:00
Dean Herbert	8aa0a698d9	Avoid errors due to second set	2020-11-05 17:26:41 +09:00
Dean Herbert	9c91f16e3a	Update sizing as early as possible in addition to scheduling (to handle any dependent edge cases)	2020-11-05 17:24:59 +09:00
Dean Herbert	8293846afc	Merge branch 'master' into fix-skinnable-test-scene	2020-11-05 17:24:24 +09:00
Dean Herbert	0cadb31947	Merge branch 'master' into drawable-hit-object-hit-state-fix	2020-11-05 17:07:52 +09:00
smoogipoo	9d5b1ec28c	Add removal dates	2020-11-05 17:04:11 +09:00
Dean Herbert	2d0c62dce2	Fix SkinnableTestScene's autosize propagation ... Regressed with recent DrawableHitObject changes (moving of RelativeSizeAxes specifications out of constructors).	2020-11-05 16:37:48 +09:00
Dean Herbert	414daab1dc	Fix paused samples potentially getting stuck in a playing state in rapid toggling ... Closes #10693. Should be obvious why.	2020-11-05 16:14:23 +09:00
smoogipoo	cc518feca7	Make methods abstract	2020-11-05 16:03:10 +09:00
smoogipoo	a219aa7ba2	Add xmldoc	2020-11-05 15:53:35 +09:00
smoogipoo	628b8be15d	Implement ModWithVisibilityAdjustment	2020-11-05 15:40:25 +09:00
smoogipoo	9a7fcadabc	Use BDL for top-level osu! DHOs	2020-11-05 13:51:46 +09:00
Dan Balasescu	ea2fd831ab	Merge branch 'master' into editor-slider-control-point-quick-delete	2020-11-05 00:38:42 +09:00
Dean Herbert	d19b799f44	Invert boolean logic	2020-11-04 17:53:03 +09:00
Dean Herbert	68b7efe4d5	Change order of execution to be chronological	2020-11-04 17:14:23 +09:00
Dean Herbert	831325978a	Always execute UpdateHitStateTransforms (even for idle)	2020-11-04 17:14:23 +09:00
Dean Herbert	3b6cf95f49	Remove parameter from StartTime method and add obsoleted previous version	2020-11-04 16:39:52 +09:00
Dean Herbert	7f30140b7e	Add new method handling hit state specifically ... Until now UpdateStateTransforms was applying results offsets to StartTime. This didn't cover the case of a HitObject with duration, where the call would be made with `StartTime + hitOffset` rather than `EndTime + hitOffset`. To resolve this, a new method has been added which should be used to handle hit-specific state transforms.	2020-11-04 16:13:14 +09:00
Dan Balasescu	3322c2bbc5	Merge branch 'master' into ios-editor-crash-fix	2020-11-04 15:56:40 +09:00
Dean Herbert	487a5ecdba	Replace all usage of IBindableList.GetBoundCopy	2020-11-04 15:29:14 +09:00
Dan Balasescu	42c543f5b9	Merge branch 'master' into fix-editor-play-after-drag	2020-11-04 14:45:20 +09:00
Dan Balasescu	98c992004b	Merge pull request #10660 from peppy/fix-song-select-first-track-looping ... Fix looping mode not being set on first track after entering song select	2020-11-04 14:37:27 +09:00
Dan Balasescu	c6779b414e	Merge pull request #10611 from peppy/spectator-listing ... Add "currently playing" player listing and spectator UI flow	2020-11-04 14:08:11 +09:00
Dean Herbert	cfe3218239	Move scheduler call to inside method itself for added safety	2020-11-04 10:23:06 +09:00
Dean Herbert	29e8e5ab94	Merge branch 'master' into fix-load-async-after-disposal-beatmap-wedge	2020-11-04 10:23:05 +09:00
Dean Herbert	9dc2ca666d	Merge branch 'master' into spectator-listing	2020-11-04 09:30:15 +09:00
Bartłomiej Dach	3bb86ce127	Merge branch 'master' into editor-waveform-opacity	2020-11-03 23:04:19 +01:00
Bartłomiej Dach	13f729916a	Merge branch 'master' into editor-timeline-scroll-mousewheel	2020-11-03 22:27:35 +01:00
Bartłomiej Dach	ddf0d75c38	Don't fall through to seek if handling zoom	2020-11-03 21:49:21 +01:00
Bartłomiej Dach	4b528e80d0	Use AltPressed shorthand	2020-11-03 21:49:04 +01:00
Bartłomiej Dach	211510fe9a	Fix undesirable vertical spacing in currently playing display	2020-11-03 19:12:03 +01:00
Bartłomiej Dach	86d283ebf4	Adjust layout slightly to avoid specifying width twice	2020-11-03 19:03:48 +01:00
Bartłomiej Dach	18428dff8e	Ensure hotkey actions are executable in handler	2020-11-03 18:01:12 +01:00
Dean Herbert	83c004bbde	Add key bindings for flip and reverse patterns	2020-11-03 21:10:31 +09:00
Dean Herbert	9f333ac58a	Add the ability to delete slider control points using shift+right click ... Closes https://github.com/ppy/osu/issues/10672. In two minds about how this should be implemented but went in this direction initially. The other way would be to add local handling of Shift-Right Click inside PathControlPointPiece (which is already doing mouse handling itself).	2020-11-03 20:46:33 +09:00
Dean Herbert	1b2bd6a8c9	Remove redundant base call	2020-11-03 20:10:13 +09:00
Dean Herbert	3e29e468ea	Ensure "start watching" button starts in a disabled state	2020-11-03 20:06:42 +09:00
Dean Herbert	a3c67aabe2	Merge branch 'master' into spectator-listing	2020-11-03 19:56:25 +09:00
Dean Herbert	d788931661	Fix LoadComponentAsync calls potentially occuring after beatmap wedge disposal ... As seen in https://ci.appveyor.com/project/peppy/osu/builds/36109658/tests. Also adds cancellation logic for good measure.	2020-11-03 19:53:45 +09:00
Dean Herbert	df9ff76f23	Reduce assert to guard in the outwards direction	2020-11-03 16:49:13 +09:00
Dean Herbert	f701a38e20	Merge branch 'master' into fix-song-select-first-track-looping	2020-11-03 16:48:20 +09:00
Dean Herbert	c2ffc18379	Change editor timeline mouse wheel handling to scroll by default (and zoom with alt held)	2020-11-03 16:30:11 +09:00
Dean Herbert	0dcb4ea441	Add handling of opacity to timeline waveform display	2020-11-03 16:07:01 +09:00
Dean Herbert	7e4314684b	Add editor waveform opacity selection to menu	2020-11-03 16:01:14 +09:00
Dean Herbert	6bf35d5767	Fix editor menu not supporting stateful item drawables	2020-11-03 16:00:07 +09:00
Dean Herbert	34aa59f237	Fix editor clock not always remaining stopped when dragging timeline ... Closes https://github.com/ppy/osu/issues/10461.	2020-11-03 15:00:01 +09:00
Bartłomiej Dach	b152514bc7	Merge branch 'master' into spectator-connection-logging	2020-11-02 20:21:45 +01:00
Dean Herbert	ab308d28d2	Debounce calls to UpdateTernaryStates ... Just something I noticed in passing recently which may help with reducing performance overhead of some batch operations.	2020-11-03 01:08:36 +09:00
Dean Herbert	d5c95a8b46	Centralise into methods and add assertions for safety	2020-11-03 00:45:55 +09:00
Dean Herbert	c3d3856a64	Fix looping mode not being set on first track after entering song select ... Closes #10656.	2020-11-02 23:51:02 +09:00
Dean Herbert	c1d9a0c92c	Move click action out of user panel	2020-11-02 21:09:47 +09:00
smoogipoo	3956a0669a	Fix editor seek transform seeking too much	2020-11-02 21:08:58 +09:00
Dean Herbert	ed30756c19	Add test coverage for new display (and remove live version for now)	2020-11-02 20:41:14 +09:00
Dean Herbert	c6de0544d2	Disable display for not	2020-11-02 20:21:23 +09:00
Dean Herbert	5cbfaf3589	Revert "Add (temporary) local user cache to avoid re-querying API each display" ... This reverts commit 4e17634ee2.	2020-11-02 20:19:38 +09:00
Dean Herbert	a89aeaf1ce	Add very basic connection status logging for spectator streaming client	2020-11-02 17:32:10 +09:00
Dean Herbert	4e17634ee2	Add (temporary) local user cache to avoid re-querying API each display	2020-11-02 17:31:04 +09:00
smoogipoo	6f623d8cca	Rename IsUserPaused -> UserPauseRequested	2020-11-02 16:08:59 +09:00
Dean Herbert	414f65c1ef	Merge branch 'master' into spectator-listing	2020-11-02 15:48:21 +09:00
Dean Herbert	8adf146f53	Merge pull request #10640 from bdach/fix-music-paused-on-multi-exit	2020-11-02 15:46:19 +09:00
Dean Herbert	ab9e0aac58	Merge pull request #10258 from Game4all/results-dynamic-pp-calc	2020-11-02 15:40:55 +09:00
Dan Balasescu	2c51c24913	Merge pull request #10605 from peppy/spectator-replay-watcher ... Add screen hierarchy for spectating another player	2020-11-02 15:29:59 +09:00
Dean Herbert	8f2cd0e8c5	Add matching requestedByUser parameter to Play method	2020-11-02 15:01:30 +09:00
Dean Herbert	d2f6303988	Change default value of requestedByUser to false	2020-11-02 14:56:50 +09:00
Dean Herbert	ecad85b5f5	Merge branch 'master' into fix-music-paused-on-multi-exit	2020-11-02 14:55:15 +09:00
Dan Balasescu	04178e9458	Merge branch 'master' into spectator-replay-watcher	2020-11-02 14:54:51 +09:00
Dean Herbert	7b320a991f	Add note about missing expiration logic	2020-11-02 14:53:32 +09:00
Dean Herbert	d46f7535c9	Add xmldoc for new component	2020-11-02 14:50:44 +09:00
Dean Herbert	fb105a1e9c	Remove unnecessary field storage	2020-11-02 14:49:25 +09:00
Dean Herbert	73b290aca3	Merge branch 'master' into results-dynamic-pp-calc	2020-11-02 14:47:33 +09:00
Dean Herbert	3adf451e82	Handle changes via SamplePoints list for simplicity	2020-11-02 14:40:40 +09:00
smoogipoo	bd7c3d0d9f	Merge branch 'master' into results-screen-applause	2020-11-02 13:38:19 +09:00
Dan Balasescu	1b53e6c782	Merge branch 'master' into sample-lookup-improvements	2020-11-02 13:04:35 +09:00
Dan Balasescu	8a768669ad	Merge pull request #10606 from FamousPig/fix-timeline-drag-select-weirdness ... Fix timeline zoom during drag-select causing unexpected behaviour	2020-11-02 13:04:26 +09:00
Dean Herbert	6cfaee0f0b	Merge pull request #10631 from bdach/shift-delete-all-selected	2020-11-02 12:04:58 +09:00
Dean Herbert	6e2d722b8a	Merge pull request #10649 from ppy/dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.3.1	2020-11-02 11:52:38 +09:00
Dan Balasescu	5ae3da9399	Merge branch 'master' into fix-timeline-drag-select-weirdness	2020-11-02 11:18:37 +09:00
Dean Herbert	61c9bb3245	Merge branch 'master' into dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.3.1	2020-11-02 10:56:09 +09:00
Dan Balasescu	b1b52f9073	Merge branch 'master' into fix-resume-beatmap-options-edit	2020-11-02 10:46:31 +09:00
Dan Balasescu	ba726c6291	Merge pull request #10623 from cadon0/fix-beatmap-details-metadata-bounce ... Fix "bounce" when metadata container text is empty in song select	2020-11-02 10:45:14 +09:00
Joehu	71d55f16f3	Fix edit beatmap options button not resuming back to song select	2020-11-01 13:50:38 -08:00
Bartłomiej Dach	432282e8de	Use alternative solution to avoid storing last zoom	2020-11-01 21:25:05 +01:00
Bartłomiej Dach	3090b6ccb5	Resolve CA2249 inspections ... "Use `string.Contains` instead of `string.IndexOf` to improve readability"	2020-11-01 18:54:44 +01:00
Bartłomiej Dach	89bf7b1bd6	Resolve CA1835 inspection ... "Change the `ReadAsync` method call to use the `Stream.ReadAsync(Memory<byte>, CancellationToken)` overload"	2020-11-01 18:51:39 +01:00
Bartłomiej Dach	ca5de22ca5	Resolve CA1834 inspection ... "Use `StringBuilder.Append(char)` instead of `StringBuilder.Append(string)` when the input is a constant unit string"	2020-11-01 18:50:13 +01:00
Bartłomiej Dach	2b0bea535e	Resolve CA1805 inspections ... "Member is explicitly initialized to its default value"	2020-11-01 18:47:40 +01:00
Bartłomiej Dach	716458344f	Ensure spectator player is unsubscribed to prevent leak	2020-11-01 16:13:19 +01:00
Bartłomiej Dach	23d9fa4dfa	Merge branch 'master' into spectator-replay-watcher	2020-11-01 15:53:37 +01:00
Bartłomiej Dach	b7696c85ad	Add more xmldocs	2020-11-01 15:23:03 +01:00
Dean Herbert	1f8d627af4	Merge branch 'master' into shift-delete-all-selected	2020-11-01 23:03:01 +09:00
Dean Herbert	e1b8875553	Merge pull request #10634 from bdach/fix-leftover-selection-box-tooltip ... Fix selection box action tooltips still being visible after object deletion	2020-11-01 23:02:29 +09:00
Bartłomiej Dach	5903c3be90	Fix inaccurate xmldoc	2020-11-01 14:39:10 +01:00
Lucas A	6bfff43634	Extract StatisticCounter to a separate class and use it instead.	2020-11-01 13:25:36 +01:00
Bartłomiej Dach	f3e0480e77	Merge branch 'master' into fix-beatmap-details-metadata-bounce	2020-10-31 17:36:40 +01:00
Bartłomiej Dach	79f47953a8	Migrate existing call to new flag parameter	2020-10-31 16:08:27 +01:00
Bartłomiej Dach	19023e7d43	Fix player restart invoking user-level pause	2020-10-31 16:08:15 +01:00
Bartłomiej Dach	941e8525af	Add flag parameter to allow non-user-pause via music controller	2020-10-31 16:07:54 +01:00
Dean Herbert	a9a3489e92	Fix potential null reference when loading background ... As seen in https://discordapp.com/channels/188630481301012481/188630652340404224/772094427342569493. Caused due to async load of the loader, which means it may not be ready before Next() is called.	2020-10-31 22:51:35 +09:00
Bartłomiej Dach	007c27d3ff	Schedule visibility update once per frame	2020-10-31 14:45:11 +01:00
Bartłomiej Dach	d74c19e2d7	Shorten show/hide code	2020-10-31 13:54:02 +01:00
Bartłomiej Dach	3322b8a7ea	Run OnSelectionChanged() on each change	2020-10-31 13:54:02 +01:00
Bartłomiej Dach	003994ab75	Bind UpdateVisibility() directly to source of truth	2020-10-31 13:54:02 +01:00
Bartłomiej Dach	129b1bc6d3	Delete all selected objects if shift-clicked on one	2020-10-31 11:46:25 +01:00
Dean Herbert	6a293dd536	Add missing ctor parameters back	2020-10-31 18:56:30 +09:00
Dean Herbert	979eb1685b	Merge branch 'master' into results-screen-applause	2020-10-31 18:47:49 +09:00
Dean Herbert	f0b80d245e	Merge branch 'master' into spectator-listing	2020-10-31 16:22:49 +09:00
Dean Herbert	a088151e58	Merge branch 'spectator-replay-watcher' into spectator-listing	2020-10-31 16:22:10 +09:00
Bartłomiej Dach	78842ab95a	Improve look & behaviour of background transitions	2020-10-30 22:40:24 +01:00
Bartłomiej Dach	391dd73843	Fix typo in comment	2020-10-30 22:39:34 +01:00
Bartłomiej Dach	38cf90a69b	Change background to seasonal right after login	2020-10-30 22:03:26 +01:00
Bartłomiej Dach	29ad099902	Allow to fetch if going online after launch	2020-10-30 21:49:14 +01:00
Bartłomiej Dach	67a325f47d	Move config setting logic to background loader	2020-10-30 21:22:22 +01:00
Bartłomiej Dach	cf0e8e0a62	Document nullability of seasonal backgrounds	2020-10-30 20:00:59 +01:00
Bartłomiej Dach	aeab2be5d1	Add xmldoc to SeasonalBackgroundMode	2020-10-30 19:56:52 +01:00
Bartłomiej Dach	20c27c6943	Rename lookup & field	2020-10-30 19:55:22 +01:00
Bartłomiej Dach	82ef85569b	Fix nullref when querying IsInSeason before request completion	2020-10-30 19:35:08 +01:00
Max Hübner	d5dfd1dffe	Insert optional parentheses	2020-10-30 18:07:07 +01:00
Max Hübner	51a58269ad	Fix nullref in case of successfull request but no backgrounds available	2020-10-30 17:57:29 +01:00
Max Hübner	0b46c19b23	Move seasonalBackgroundMode check up and early return if available	2020-10-30 17:16:51 +01:00
Max Hübner	f6eb5680ec	Save full api response in SessionStatics	2020-10-30 16:43:18 +01:00
Max Hübner	6f6a8e2a8f	Convert switch to if	2020-10-30 16:06:48 +01:00
Max Hübner	d19dd4eef6	IsInSeason() -> IsInSeason	2020-10-30 15:56:19 +01:00
Max Hübner	4e3fb615d2	Rename "SeasonalBackgrounds" to "SeasonalBackgroundMode"	2020-10-30 15:54:10 +01:00
Dean Herbert	1db8dfd03e	Merge branch 'master' into seasonal-backgrounds	2020-10-30 22:53:51 +09:00
Dean Herbert	bc69ed3870	Simplify sample lookup	2020-10-30 22:33:27 +09:00
cadon0	a1fa6588f6	Fix "bounce" when metadata container text is empty	2020-10-31 01:06:19 +13:00
Dean Herbert	b4e5311014	Move initial state set inside updateClock	2020-10-30 20:39:25 +09:00
Dean Herbert	1bd461f229	Move clock logic back to inside updateClock method	2020-10-30 20:21:14 +09:00
Max Hübner	f27ce7521d	Make "Sometimes" setting depend on season end date, rather than chance	2020-10-30 10:27:43 +01:00
Dean Herbert	79aecc9a98	Merge branch 'master' into spectator-replay-watcher	2020-10-30 16:31:24 +09:00
Dean Herbert	32e68a6a3c	Fix FramedReplayInputHandler incorrectly blocking in streaming mode when time requested is before the first frame ... Most of this is just tidying up the logic to (hopefully) be better to follow, again (again (again)). The actual fix is that we now allow interpolation/playback when the incoming time is less than the first frame's time, regardless of receiving status.	2020-10-30 16:09:03 +09:00
Dan Balasescu	0ef1459f4b	Merge pull request #10621 from peppy/hud-momentary-visibility ... Add momentary HUD toggle	2020-10-30 15:40:54 +09:00
Dean Herbert	0f997386ae	Fix direction and IsRunning not updating on first frame after becoming valid ... The parent clock will not unpause until WaitingForFrames becomes false, so I've moved the set of that before we start to propagate its values across. Doesn't fix any visible issue but should make propagation one game loop faster.	2020-10-30 15:26:23 +09:00
Dean Herbert	326fd03525	Fix loop not exiting after first valid frame	2020-10-30 15:25:53 +09:00
Dan Balasescu	b14291a312	Merge branch 'master' into tracked-hud-visibility-settings	2020-10-30 14:58:45 +09:00
Dan Balasescu	8be16bd4ed	Merge pull request #10370 from peppy/fix-test-beatmap-virtual-clock ... Ensure virtual track time is long enough for test beatmaps	2020-10-30 14:23:06 +09:00
Dan Balasescu	45b8af5391	Merge pull request #10614 from peppy/results-screen-animate-once ... Only play results panel animation once (and only for the local user)	2020-10-30 14:21:05 +09:00
Dean Herbert	8928aa6d92	Add key binding to show HUD while held	2020-10-30 14:19:40 +09:00
Dean Herbert	b4eda65383	Commit missing pieces	2020-10-30 13:53:51 +09:00
Dean Herbert	c72017a7db	Remove "hide during breaks" option ... Probably wouldn't be used anyway.	2020-10-30 13:49:45 +09:00
Dean Herbert	f58f8e0f93	Update resources	2020-10-30 13:46:54 +09:00
Dean Herbert	9bb86ccb83	Change shift-tab to cycle available HUD visibility modes	2020-10-30 13:09:22 +09:00
Dean Herbert	18f92818da	Show current HUD visibility mode as a tracked setting	2020-10-30 13:09:13 +09:00
Dean Herbert	46d89d55f4	Add note about ScheduleAfterChildren requirement	2020-10-30 12:47:04 +09:00
Dean Herbert	8e6c803900	Avoid running full updateClock loop when waiting on frames	2020-10-30 12:39:11 +09:00
Dean Herbert	8dbaca341e	Merge branch 'sample-lookup-improvements' into results-screen-applause	2020-10-30 12:28:48 +09:00
Dean Herbert	b906736b85	Remove redundant initialisation	2020-10-30 12:28:40 +09:00
Dean Herbert	823230f06a	Merge branch 'sample-lookup-improvements' into results-screen-applause	2020-10-30 12:17:36 +09:00
Dean Herbert	2ea4aa0a37	Fix incorrect specification on some sample lookups	2020-10-30 11:59:41 +09:00
Dean Herbert	d319b27b3d	Run sample lookup logic through getFallbackNames	2020-10-30 11:59:41 +09:00
Dean Herbert	0b28cca7e6	Don't force Gameplay prefix on all skin sample lookups	2020-10-30 11:59:40 +09:00
Dean Herbert	c9a85587fb	Allow SampleInfo to specify fallback sample lookup names	2020-10-30 11:59:29 +09:00
Dean Herbert	0c1d12460f	Remove unused parameter	2020-10-30 10:30:11 +09:00
Max Hübner	fb1e09b3e7	Load seasonal backgrounds according to setting	2020-10-29 18:04:48 +01:00
Max Hübner	d9846fad37	Remove fallback texture parameter ... When there isn't a seasonal event, we don't want to fall back to the basic background here, but rather to the user selected background source.	2020-10-29 18:03:36 +01:00
Max Hübner	34371b8888	Show next Background on showSeasonalBackgrounds.ValueChanged	2020-10-29 17:44:23 +01:00
Max Hübner	bf4d99dfe7	Load SeasonalBackgroundLoader asynchronously	2020-10-29 17:43:10 +01:00
Max Hübner	907e1921c7	Make SeasonalBackgroundLoader read from SessionStatics	2020-10-29 17:31:42 +01:00
Max Hübner	76c0a790b4	Add separate Seasonal Backgrounds setting (Always, Sometimes, Never)	2020-10-29 17:28:04 +01:00
Dean Herbert	87be7d162b	Merge branch 'master' into spectator-replay-watcher	2020-10-30 00:25:17 +09:00
Max Hübner	b189e0b7cf	Revert "Load SeasonalBackgroundLoader asynchronously" ... This reverts commit 81ebcd8796.	2020-10-29 16:01:22 +01:00
Max Hübner	7d523fee28	Revert "Set BackgroundSource.Seasonal as default setting" ... This reverts commit cdb2d23578.	2020-10-29 14:31:07 +01:00
Max Hübner	0c540537c9	Revert "Add BackgroundSource.Seasonal" ... This reverts commit 2871001cc2.	2020-10-29 14:30:50 +01:00
Dean Herbert	1c353b4745	Update framework	2020-10-29 20:38:28 +09:00
Dean Herbert	17ea06f793	Merge branch 'results-screen-animate-once' into results-screen-applause	2020-10-29 20:23:25 +09:00
Dean Herbert	7be4dfabd8	Revert "Update namespace references" ... This reverts commit d69d78ab5d.	2020-10-29 20:23:15 +09:00
Dean Herbert	404885af89	Merge branch 'results-screen-animate-once' into results-screen-applause	2020-10-29 18:52:54 +09:00
Dean Herbert	3491dea9e2	Fix scroll logic running before children may be alive in flow	2020-10-29 18:51:54 +09:00
Dean Herbert	d69d78ab5d	Update namespace references	2020-10-29 18:45:18 +09:00
Dean Herbert	f1b8a8f7f5	Remove unused using	2020-10-29 18:16:04 +09:00
Dean Herbert	335d150a13	Fix aim time being mutated inside update loop	2020-10-29 18:11:50 +09:00
Dean Herbert	4dec46b33e	Attempt to fix in a less destructive way for now	2020-10-29 17:52:58 +09:00
Dean Herbert	7bef695072	Merge branch 'master' into fix-test-beatmap-virtual-clock	2020-10-29 17:51:15 +09:00
Dean Herbert	0a0239a7c7	Only play results panel animation once (and only for the local user)	2020-10-29 17:08:59 +09:00