12169 Commits

Author	SHA1	Message	Date
smoogipoo	a6dc5606bc	Allow beatmapsets to be sorted by date added	2019-06-05 18:17:43 +09:00
Dean Herbert	2538f32fae	Merge branch 'osu-clickable-container' into OsuHoverContainer	2019-06-05 10:34:20 +09:00
Arphox	900cd5c484	Restore original values in FadeColour method call	2019-06-04 21:37:10 +02:00
Arphox	5f4d7437bc	Fix the issue ... When Enabled's value has been changed to true, it will now check if it is currently howered, and if yes, it will fade in correctly.	2019-06-04 21:30:49 +02:00
Dean Herbert	2e3d392a9f	Mark OsuButton as abstract ... Not being used directly, so we probably shouldn't support it for now.	2019-06-04 22:12:55 +09:00
Dean Herbert	7d2a75b350	Dim music volume when holding to confirm	2019-06-04 18:37:26 +09:00
Dean Herbert	4e7f2b8f47	Merge branch 'master' into osu-clickable-container	2019-06-04 17:42:17 +09:00
Dean Herbert	9c214c3f0e	Add animation on failing	2019-06-04 16:13:16 +09:00
Dean Herbert	b8fc535124	Fix blueprint tests crashing due to out-of-order operations	2019-06-04 12:08:23 +09:00
Dean Herbert	80a66b8b3a	Merge remote-tracking branch 'upstream/master' into audio-refactor-update	2019-06-04 12:08:21 +09:00
smoogipoo	4763a41c7e	Cleanups	2019-06-04 11:25:18 +09:00
smoogipoo	474191fcec	Update framework	2019-06-04 11:13:21 +09:00
Dan Balasescu	6e79e374e2	Merge branch 'master' into fix-endless-tests	2019-06-04 11:07:50 +09:00
smoogipoo	cea353975f	Update with further framework-side changes	2019-06-04 11:04:28 +09:00
smoogipoo	53a39e9142	Merge remote-tracking branch 'origin/master' into audio-refactor-update	2019-06-04 10:50:33 +09:00
Dean Herbert	e8315085c0	Better handle OnClick	2019-06-04 10:26:21 +09:00
EVAST9919	d5a2ebf79f	Fix endless loading state part 2	2019-06-04 04:04:33 +03:00
EVAST9919	2c71371282	Fix endless loading state	2019-06-04 02:06:15 +03:00
EVAST9919	fe6b4112c6	Adjust colors to match web design	2019-06-04 01:47:45 +03:00
EVAST9919	7e96ff7f14	Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update	2019-06-04 01:32:12 +03:00
Welsar55	194bb80354	Added close button and indictors of hotkeys to buttons	2019-06-03 11:09:21 -05:00
Dean Herbert	167213d3eb	Merge branch 'master' into fix-endless-tests	2019-06-04 00:50:18 +09:00
LeNitrous	516575a132	don't create "Start Chat" option when the sender is the local user	2019-06-03 18:54:29 +08:00
LeNitrous	4e6d7137aa	disallow current user from opening their own private channel	2019-06-03 17:25:19 +08:00
Dean Herbert	633c3b74ec	Don't handle clicks when in a loading state	2019-06-03 17:10:33 +09:00
Dean Herbert	c4f4f32db8	Shorten fade duration	2019-06-03 17:10:33 +09:00
Dean Herbert	491c9e96e0	Fix tests not ending execution after some exceptions	2019-06-03 16:42:27 +09:00
Dean Herbert	171fc14776	Fix editor regressions	2019-06-03 16:34:09 +09:00
Welsar55	fa331fbee1	Merge branch 'master' of https://github.com/ppy/osu	2019-06-03 01:23:25 -05:00
Dean Herbert	65e3b7c2ae	Remove unused DI	2019-06-03 13:58:55 +09:00
Dean Herbert	e55f5efa82	Merge branch 'osu-clickable-container' into settings-footer-show-changelog-current-build	2019-06-03 13:55:23 +09:00
Dean Herbert	cf9bc831ab	Merge branch 'master' into osu-clickable-container	2019-06-03 13:55:08 +09:00
Dean Herbert	3ef17a54f6	Fix sizing of OsuAnimatedButton and OsuClickableContainer ... Was incorrect under some combinations of relative and autosize usage.	2019-06-03 13:53:24 +09:00
Dean Herbert	4e5788959e	Make clickable text actually a button	2019-06-03 13:38:06 +09:00
Dean Herbert	115a75e4c6	Use a constant for lazer variables	2019-06-03 13:16:05 +09:00
Dean Herbert	dff7053a07	Merge branch 'master' into more_button_update	2019-06-03 11:48:05 +09:00
Dean Herbert	2d15e02406	Merge branch 'master' into selection-update	2019-06-03 11:47:30 +09:00
Lucas A	d8f45f7299	Disallow null references for dependencies loaded via load()	2019-06-02 15:17:03 +02:00
Lucas A	0a867e37af	Resolve dependencies via Resolved Attribute	2019-06-02 12:40:18 +02:00
Lucas A	58564579e4	Invert if statement	2019-06-01 08:46:38 +02:00
Lucas A	0625f51e65	Allow dependencies to be null in certain cases (Unit tests)	2019-05-31 22:42:09 +02:00
Lucas A	55c0c6a1bb	Show changelog for current build by clicking on settings footer in settings overlay.	2019-05-31 17:43:58 +02:00
Lucas A	b3f6640d11	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-31 12:41:26 +02:00
Dean Herbert	32a2aba631	Merge branch 'master' into logo-idle	2019-05-31 18:50:28 +09:00
Dean Herbert	b20ea93906	Merge branch 'master' into audio-refactor-update	2019-05-31 14:58:53 +09:00
Dean Herbert	b52276c489	Pass individual components to DummyWorkingBeatmap, not game	2019-05-31 14:51:12 +09:00
Dean Herbert	f33a5bc54c	Centralise and update WorkingBeatmap creation in test cases	2019-05-31 14:40:53 +09:00
Dean Herbert	80d65f9a3b	Update resource stores with GetAvailableResources	2019-05-31 14:33:18 +09:00
Dean Herbert	1629534a0c	More disposal?	2019-05-31 14:28:53 +09:00
David Zhao	465aa4e0f6	Prevent idle state from being updated incorrectly	2019-05-31 14:06:18 +09:00
smoogipoo	d7ccf939d8	General refactoring	2019-05-31 13:54:40 +09:00
smoogipoo	e7ae9c249f	Fix size of release stream separator in listing	2019-05-31 13:53:55 +09:00
smoogipoo	57d648df6d	Add comment + fix spinlocking	2019-05-31 13:38:48 +09:00
smoogipoo	4dc77d64a3	Fix overlay group + depth	2019-05-31 13:23:50 +09:00
smoogipoo	f780c80c17	Fix bar not expanding/collapsing correctly	2019-05-31 13:08:35 +09:00
smoogipoo	c211f1d0fe	Merge remote-tracking branch 'Joehuu/master' into changelog-overlay	2019-05-31 12:28:28 +09:00
EVAST9919	fe9e53e383	Add a testcase	2019-05-30 23:07:04 +03:00
EVAST9919	2933169614	Move the button into a separate class	2019-05-30 22:55:59 +03:00
EVAST9919	73fb28f9f7	Make the button inherit from OsuHoverContainer	2019-05-30 22:48:27 +03:00
EVAST9919	877fe97107	Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update	2019-05-30 22:17:22 +03:00
Dean Herbert	c950f37497	Ad missing link	2019-05-30 16:57:54 +09:00
Dean Herbert	e5999dd9b1	Update font sizes to match web	2019-05-30 16:49:18 +09:00
EVAST9919	9a13c52ffd	Add missing lines	2019-05-29 21:19:03 +03:00
EVAST9919	97dbc95bc6	Kudosu section update	2019-05-29 21:02:20 +03:00
HoLLy	2a295545a7	Don't mutate strainPeaks	2019-05-29 11:25:25 +02:00
HoLLy	7e9f5a0939	Add Skills to DifficultyAttributes	2019-05-29 11:22:51 +02:00
Dean Herbert	a1cc8c448f	Update TrackVirtual consumption	2019-05-29 16:43:27 +09:00
Dean Herbert	08ab1e5df7	Use new ITrackStore interface	2019-05-29 16:43:15 +09:00
David Zhao	4f09141718	remove extra bool	2019-05-29 12:22:34 +09:00
EVAST9919	5169e31d54	Fix CI issues	2019-05-28 19:53:00 +03:00
EVAST9919	19fbab6892	Applied suggested changes	2019-05-28 19:39:31 +03:00
Dean Herbert	a20eda7b5f	Fix remaining cases to work without things	2019-05-28 23:54:42 +09:00
EVAST9919	857eb9b83a	Fix CI stuff	2019-05-28 17:21:34 +03:00
tangalbert919	07e550a950	Merge branch 'master' into android	2019-05-28 09:08:44 -05:00
EVAST9919	6ca3bd086f	ShowMore button update	2019-05-28 17:04:05 +03:00
David Zhao	1a871af552	Fix hide selection, add test	2019-05-28 19:15:29 +09:00
Dean Herbert	23b5d30360	Remove csproj changes	2019-05-28 17:10:46 +09:00
Dean Herbert	4ca34bd5e8	Update osu! in line with audio subsystem refactor	2019-05-28 17:06:01 +09:00
David Zhao	e59a00ac6e	Remove excessive selection updating	2019-05-28 14:04:33 +09:00
Dan Balasescu	5742984c97	Merge branch 'master' into settings-flexibility	2019-05-28 13:35:06 +09:00
Dan Balasescu	0d2eef68b2	Merge branch 'master' into settings-flexibility	2019-05-28 13:21:33 +09:00
Dan Balasescu	4852519259	Merge branch 'master' into isolate-checkbox-alpha	2019-05-28 13:12:12 +09:00
Dean Herbert	31e6a4fa59	Add optional skin foreign key to databased settings	2019-05-27 01:56:19 +09:00
Dean Herbert	127858d398	Store databased settings based on string keys rather than ints ... Allows for rearranging/removal from enums without consequence.	2019-05-27 01:53:49 +09:00
Dean Herbert	e7b9d1efa3	Isolate alpha usage in OsuCheckbox	2019-05-27 01:49:24 +09:00
Dean Herbert	02e2fb963a	Tidy up how subpanels are handled in SettingsOverlay	2019-05-27 01:48:21 +09:00
Dean Herbert	53b2245330	Move common settings sub-panel logic to own class	2019-05-27 01:47:23 +09:00
Lucas A	a819dd764f	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-25 11:02:19 +02:00
EVAST9919	69ada11f41	use constant value	2019-05-24 20:01:47 +03:00
EVAST9919	cda97a61fa	Add a bit of smoothness to the rank graph	2019-05-24 19:43:53 +03:00
Dean Herbert	cc256614b9	Merge branch 'master' into changelog-overlay	2019-05-24 11:13:48 +09:00
Dean Herbert	a272004610	Use a more friendly set method for tab control	2019-05-24 11:04:36 +09:00
Dean Herbert	8f87e8ad7f	Merge branch 'master' into fix-beatmap-background-never-removed	2019-05-24 10:41:12 +09:00
Dean Herbert	e034b3d514	Use TaskCompletionSource in a better manner	2019-05-23 19:08:44 +09:00
Dean Herbert	acaf2f9fbb	Show changelog from new build notification	2019-05-23 18:54:42 +09:00
Dean Herbert	774ef87868	Merge branch 'update-framework' into HoutarouOreki-changelog-overlay	2019-05-23 17:58:56 +09:00
Dean Herbert	9c6fbebb67	Update framework	2019-05-23 17:55:18 +09:00
Dean Herbert	0bce7241d2	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-23 17:54:13 +09:00
smoogipoo	f0d7728e81	Fix failures with a null-model	2019-05-23 17:01:22 +09:00
smoogipoo	7971261fbc	Don't create a new drawable for the first background	2019-05-23 15:59:22 +09:00
Dan Balasescu	27504cf81b	Merge branch 'master' into fix-preview-state	2019-05-23 13:49:33 +09:00
Dean Herbert	7229975fef	Further minor refactoring	2019-05-23 12:41:45 +09:00
Dean Herbert	372c5b081c	Fix audio preview buttons not correctly handling load failure states ... Closes #4593.	2019-05-23 12:07:49 +09:00
Dean Herbert	5a887dabfe	Prepare changelog api requests to work when not logged in	2019-05-23 11:41:37 +09:00
Dean Herbert	cb62008280	Cleanup pass	2019-05-23 11:23:37 +09:00
Dean Herbert	a0ddc6d77a	Use linq instead of a temporary sorted list	2019-05-23 00:13:59 +09:00
Dean Herbert	c96d7bfb67	Centralise font specification	2019-05-23 00:13:47 +09:00
Dean Herbert	ba98c68cbd	Add support for osu! user links	2019-05-23 00:11:26 +09:00
Dean Herbert	81e42041e6	Move update streams inside header content	2019-05-22 23:56:50 +09:00
Dean Herbert	661fc01e7d	Fix date string	2019-05-22 23:49:54 +09:00
Dean Herbert	66f5dbaa9f	Fix badge state regressions from tab control usage	2019-05-22 23:44:37 +09:00
Dean Herbert	b588638740	Use TabControl instead of custom logic	2019-05-22 19:51:16 +09:00
Dean Herbert	9f9e86f18c	Rename classes and fix back-to-front state	2019-05-22 17:04:21 +09:00
Dean Herbert	1d5b7cdec0	Add ExpandingBar UI element	2019-05-22 16:44:47 +09:00
Dean Herbert	92c991494d	Fix (and rename) ExpandingBar	2019-05-22 16:38:15 +09:00
Welsar55	9e1f2d4fbc	Added ability to reset all mods by pressing 1 as present on stable.	2019-05-21 21:48:09 -05:00
Dean Herbert	8025a97b2b	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-21 17:18:23 +09:00
Dean Herbert	0e8517ebae	Update framework (#4837) ... Update framework	2019-05-21 17:16:49 +09:00
Dan Balasescu	2024cdf16d	Merge branch 'master' into hover-container-disabled-hover-effect	2019-05-21 17:04:50 +09:00
smoogipoo	17cb9d45c9	Merge remote-tracking branch 'origin/master' into abstract-profile-header	2019-05-21 16:06:27 +09:00
smoogipoo	e76d785c10	Move method above nested class	2019-05-21 16:05:59 +09:00
Dan Balasescu	ad2a495dbc	Merge branch 'master' into screen-title-custom-icon	2019-05-21 15:56:56 +09:00
Dean Herbert	7169eb67d2	Merge branch 'master' into abstract-profile-header	2019-05-21 15:33:47 +09:00
Dean Herbert	58efa7a177	Merge pull request #4729 from peppy/fix-control-point-ordering ... Fix control points with same timestamp potentially being parsed incorrectly	2019-05-21 15:33:27 +09:00
Dean Herbert	236b8cec27	Update framework	2019-05-21 15:31:36 +09:00
Dean Herbert	d09101b43c	Merge remote-tracking branch 'upstream/master' into hover-container-disabled-hover-effect	2019-05-21 15:02:44 +09:00
Dean Herbert	5ed1540a12	Handle unhover state change better	2019-05-21 15:02:31 +09:00
Dan Balasescu	67ac76aae7	Merge branch 'master' into move-tooltip-text	2019-05-21 15:00:09 +09:00
Dan Balasescu	ab183949df	Merge branch 'master' into new-colours-osu-colour	2019-05-21 14:49:25 +09:00
Dean Herbert	24a7e624df	Only propagate badge value changes if not the current UpdateStream	2019-05-21 14:35:11 +09:00
smoogipoo	7a56fe84f2	Remove ControlPoint.EquivalentTo	2019-05-21 14:27:57 +09:00
smoogipoo	7e38aabe75	Remove equivalence check from controlpoint parsing	2019-05-21 14:27:41 +09:00
Dan Balasescu	de08bab0a1	Merge branch 'master' into move-tooltip-text	2019-05-21 14:25:38 +09:00
Dean Herbert	4ac2acbfc0	Fix usages of SpriteText (instead of OsuSpriteText)	2019-05-21 14:13:52 +09:00
Dean Herbert	e0da919fe9	Allow custom icon specification in ScreenTitle ... Not all icons are available in fonts so IconUsage alone is not enough to cover all scenarios.	2019-05-21 14:10:21 +09:00
Dean Herbert	587e4bb5d5	Remove unnecessary getters from ScreenTitle	2019-05-21 14:10:16 +09:00
Dean Herbert	89e62c3d30	Only play OsuHoverContainer hover effect if action is present	2019-05-21 14:07:40 +09:00
Dean Herbert	a9447eaf7b	Remove redundant prefixes	2019-05-21 14:02:34 +09:00
Dean Herbert	e7c8c4f787	Fix incorrectly changed colour	2019-05-21 14:02:17 +09:00
Dean Herbert	40f7cbde3a	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-21 14:00:50 +09:00
Dean Herbert	db817b3b25	Set HeaderTabControl's default AccentColour to non-transparent ... Avoids items disappearing if no accent colour is set.	2019-05-21 13:58:36 +09:00
Dean Herbert	aba945934d	Move OverlayHeaderTabControl to correct namespace	2019-05-21 13:58:12 +09:00
Dean Herbert	5a9c3ab9fa	Move UserProfileOverlay's header into an abstract implementation	2019-05-21 13:58:03 +09:00
Dean Herbert	247dad7e86	Use OsuColour for profile overlay	2019-05-21 13:54:19 +09:00
Dean Herbert	bc962bf8f0	Move TooltipText to OsuClickableContainer	2019-05-21 13:51:38 +09:00
Dean Herbert	85a41cf6c3	Allow chaining of loadComponentSingleFile	2019-05-21 13:44:18 +09:00
Dean Herbert	340b207fa0	Delete breadcrumb implementation	2019-05-21 13:37:35 +09:00
Dean Herbert	9a769c9f15	Move OverlayHeaderTabControl to correct namespace	2019-05-21 13:36:31 +09:00
Dean Herbert	a131875a7b	Use bindables the whole way	2019-05-21 13:34:35 +09:00
Dean Herbert	58a3480b6a	Update ChangelogHeader to work again with OverlayHeader	2019-05-21 12:52:50 +09:00
Dean Herbert	aca0fc80a8	Set HeaderTabControl's default AccentColour to non-transparent ... Avoids items disappearing if no accent colour is set.	2019-05-21 12:45:20 +09:00
Dean Herbert	808b45ac64	Allow custom icon specification in ScreenTitle ... Not all icons are available in fonts so IconUsage alone is not enough to cover all scenarios.	2019-05-21 11:50:03 +09:00
Dean Herbert	6c26d6fdf9	Remove unnecessary getters from ScreenTitle	2019-05-21 11:13:36 +09:00
Dean Herbert	6a8a743eaa	Begin to consume abstract header implementation	2019-05-20 18:02:27 +09:00
Dean Herbert	a5bd3262be	Move UserProfileOverlay's header into an abstract implementation	2019-05-20 18:02:13 +09:00
Dean Herbert	455301de2c	Use OsuColour for profile overlay	2019-05-20 15:58:40 +09:00
Dean Herbert	39e03ae705	Fix tests failing when not logged in	2019-05-19 11:58:47 +09:00
Dean Herbert	1c85fcbc81	Remove usage of TooltipIconButton completely	2019-05-19 11:39:32 +09:00
Dean Herbert	dae315ec0a	Move TooltipText to OsuClickableContainer	2019-05-19 11:28:24 +09:00
Dean Herbert	3fa1545ea4	Huge refactor pass focusing on ChangelogContent	2019-05-19 02:09:08 +09:00
Dean Herbert	5d6c599129	Merge remote-tracking branch 'upstream/master' into changelog-overlay	2019-05-18 15:45:40 +09:00
Dean Herbert	5e499cf55d	Update resources	2019-05-18 12:45:06 +09:00
Dean Herbert	98189b2b87	Merge branch 'master' into update-framework	2019-05-18 12:10:37 +09:00
Dean Herbert	9106200c65	Bump framework version	2019-05-18 12:08:22 +09:00
Roman Kapustin	a538c94fed	Update NuGet packages	2019-05-17 21:40:46 +03:00
smoogipoo	ccbf3ff812	Update framework	2019-05-17 22:35:23 +09:00
Dan Balasescu	553d786b94	Merge branch 'master' into fix-logo-tracking-crash	2019-05-17 19:23:14 +09:00
Dean Herbert	2d56413e35	Update namespaces	2019-05-17 19:15:59 +09:00
Dean Herbert	9bc3aa3d46	Move new classes for now	2019-05-17 19:15:25 +09:00
Dean Herbert	dbc42fd59e	Remove StreamColour class and implement locally	2019-05-17 18:31:53 +09:00
Dean Herbert	0b076c9ca0	Only fetch after initial pop in	2019-05-17 18:31:53 +09:00
Dean Herbert	c41ec20236	Improve load and switch logic between views	2019-05-17 18:31:53 +09:00
Dean Herbert	c5c1896a11	Use new colour palette	2019-05-17 18:31:53 +09:00
Dean Herbert	dd2d58d4f7	Split out ChangelogContent into two classes	2019-05-17 18:31:53 +09:00
Dean Herbert	876f108e0a	Remove custom scroll logic	2019-05-17 18:31:53 +09:00
Dean Herbert	37e989fc64	fixup! Convert BadgeDisplay to use bindable	2019-05-17 18:31:53 +09:00
Dean Herbert	e606c73329	Convert BadgeDisplay to use bindable	2019-05-17 18:31:53 +09:00
Dean Herbert	880bfe9b6b	Move resources to osu-resources	2019-05-17 10:29:27 +09:00
Lucas A	5a72d509f2	Resolve merge conflicts	2019-05-16 18:48:15 +02:00
Dean Herbert	5d33a742c6	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-16 18:55:28 +09:00
Dean Herbert	409d89eecf	Match header titles with web (pt size)	2019-05-16 18:53:52 +09:00
Dean Herbert	359e5b71a5	Fix race condition causing player to never restart	2019-05-16 17:13:03 +09:00
Dean Herbert	8ee3958b4a	Fix some padding issues with DirectListPanel	2019-05-16 15:17:44 +09:00
Dean Herbert	7f30f61d1b	Update DirectListPanel to use same styling	2019-05-16 15:02:13 +09:00
Dean Herbert	a5074d550c	Merge branch 'master' into linkify-user-links	2019-05-16 14:42:44 +09:00
Dean Herbert	958598d13b	Fix crash on switching from main menu to gameplay too fast	2019-05-15 19:39:36 +09:00
Dan Balasescu	29a415de48	Merge branch 'master' into TextLengthLimit	2019-05-15 19:21:01 +09:00
Dean Herbert	1ccef61f7b	Fix some missed instances of TestCase	2019-05-15 18:32:29 +09:00
Dean Herbert	a717970e11	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-15 18:27:51 +09:00
Dean Herbert	084ea3efa9	Fix another font usage case	2019-05-15 18:27:43 +09:00
Dean Herbert	1505ca976b	API request clean-up	2019-05-15 18:21:06 +09:00
Dean Herbert	827ca445b1	Remove unnecessary ReceivePositionalinputAt modification	2019-05-15 18:11:22 +09:00
Dean Herbert	60d244d2d6	Clean up events and states	2019-05-15 18:08:19 +09:00
Dean Herbert	f49b0dc16d	Initial clean-up pass of breadcrumb and header	2019-05-15 17:55:26 +09:00
Dean Herbert	d7098e2066	Hide other overlays when showing changelog	2019-05-15 17:38:19 +09:00
Dean Herbert	e46a61febf	Allow chaining of loadComponentSingleFile	2019-05-15 17:36:29 +09:00
Dean Herbert	5ddd28bf30	Fix message display / html stripping	2019-05-15 16:42:12 +09:00
smoogipoo	5f56c38475	Merge remote-tracking branch 'origin/master' into rename_test_case	2019-05-15 15:52:06 +09:00
Dean Herbert	88528e797f	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-15 14:24:45 +09:00
Dean Herbert	1fd44d7945	Move OsuScreenDependencies to GameBase	2019-05-15 13:00:11 +09:00