778 Commits

Author	SHA1	Message	Date
Dean Herbert	f4dc604dbf	Fix dragging tournament ladder too far causing it to disappear	2020-04-08 13:32:37 +09:00
Dean Herbert	51db361c32	Update usages of Animation and Video in line with framework changes	2020-04-03 16:00:06 +09:00
Dan Balasescu	b5488bdecf	Merge pull request #8403 from peppy/chroma-key-width ... Add ability to adjust (and save) chroma-key area width	2020-03-23 13:54:56 +09:00
Dean Herbert	1b6342438f	Hide scrollbars in tournament chat display	2020-03-23 12:05:16 +09:00
Dean Herbert	27ae2d29aa	Add ability to adjust (and save) chroma-key area width	2020-03-23 11:47:24 +09:00
Dean Herbert	2ca225877f	Merge branch 'master' into tournament-mappool-flow-logic	2020-03-18 15:05:20 +09:00
Dan Balasescu	c6e4bf35de	Merge branch 'master' into start-match-on-gameplay	2020-03-17 18:21:55 +09:00
Dean Herbert	99f28efc96	Automatically mark the currently selected match as stsrated on entering gameplay screen	2020-03-17 13:16:52 +09:00
Dean Herbert	8895d52d29	Fix header-text scaling on intro/winner screens	2020-03-17 13:16:18 +09:00
Marcus "Mestro" Nordgren	24fe7538fd	Use new logo name for showcase screen	2020-03-16 13:09:15 +01:00
Dan Balasescu	0245bab7c6	Merge branch 'master' into user-cards-update	2020-03-16 14:27:21 +09:00
Dan Balasescu	70a17ae6cc	Merge branch 'master' into tournament-resolution-selector	2020-03-15 00:15:31 +09:00
Dean Herbert	bee855bd1d	Remove using	2020-03-13 15:54:46 +09:00
Dean Herbert	b902e50396	Add resolution selector in tournament setup screen	2020-03-13 15:44:23 +09:00
Dean Herbert	edd444ea73	Fix mod sprite bleeding border colour	2020-03-13 14:36:46 +09:00
Dean Herbert	30ad580993	Fix map pool screen vertical layout	2020-03-13 14:34:33 +09:00
Dean Herbert	00d7dc19cc	Update tests and logic	2020-03-13 14:25:58 +09:00
Dean Herbert	fbb7e9f12a	Add tests (wip)	2020-03-13 14:25:58 +09:00
Dean Herbert	ef0acde458	Adjust to allow for extra row	2020-03-13 14:25:58 +09:00
Dean Herbert	9e52fbdd3e	Merge pull request #8226 from omkelderman/stable-install-path-from-env-var ... Add ability to set stable path for tourney client via environment variable	2020-03-12 19:48:48 +09:00
Dean Herbert	08dc4a0e8b	Merge pull request #8216 from smoogipoo/video-start-from-zero ... Apply osu!-side video sprite changes	2020-03-12 19:46:46 +09:00
Dean Herbert	604ce37064	Merge remote-tracking branch 'upstream/master' into video-start-from-zero	2020-03-12 18:57:53 +09:00
Dan Balasescu	f37444ad18	Merge branch 'master' into tournament-header-logo	2020-03-12 18:12:08 +09:00
Dan Balasescu	4cdb94f3a5	Merge pull request #8236 from peppy/tournament-all-video-extensions ... Allow videos to be loaded with any extension	2020-03-12 18:03:45 +09:00
Dean Herbert	ec1c6f88ee	Adjust metrics to align logo pieces correctly on gameplay / map pool	2020-03-12 14:27:56 +09:00
Dean Herbert	7b1ac03b18	Hide logo on gameplay screen	2020-03-12 14:27:56 +09:00
Dean Herbert	b6b802e821	Add back customisable header logo/text ... Also adds test scene for MatchHeader component.	2020-03-12 14:27:56 +09:00
Dean Herbert	190ff97486	Rename classes to better suit purpose	2020-03-12 14:27:56 +09:00
Dean Herbert	39bb98bfb2	Allow videos to be loaded with any extension ... Also moves all tournament user resources to a "tournament" subfolder.	2020-03-12 13:27:00 +09:00
Dean Herbert	efceeba076	Use fixed width for tournament score displays	2020-03-12 02:22:02 +09:00
Olle Kelderman	2866d62653	Use environment variable for initializing osuInstallPath	2020-03-11 16:26:53 +01:00
Dan Balasescu	f49f9f40ae	Merge branch 'master' into tournament-design-seeding	2020-03-11 18:03:27 +09:00
smoogipoo	8eb8572c73	Apply osu!-side video sprite changes	2020-03-11 18:00:39 +09:00
Dean Herbert	02af3eefbd	Merge branch 'master' into tournament-mappool-flow-logic	2020-03-11 14:40:18 +09:00
Dean Herbert	ed837d3115	Use framework extension method for FromHex	2020-03-11 10:18:41 +09:00
smoogipoo	19ce2d643e	Remove unused using	2020-03-10 09:51:30 +09:00
Dean Herbert	e158cbfe24	Merge branch 'master' into tournament-design-schedule	2020-03-10 09:40:08 +09:00
Dan Balasescu	f5e134806a	Merge branch 'master' into tournament-design-gameplay	2020-03-09 19:33:53 +09:00
Dan Balasescu	3554cdda36	Merge pull request #8179 from peppy/tournament-design-win ... Implement 2020 win screen design	2020-03-09 19:33:42 +09:00
smoogipoo	6421f28ac7	Fix nullref	2020-03-09 19:07:44 +09:00
Dan Balasescu	6d23c3b4ab	Merge pull request #8180 from peppy/tournament-design-intro ... Implement 2020 intro screen design	2020-03-09 18:38:07 +09:00
Dan Balasescu	1fec5d17a8	Merge pull request #8174 from peppy/tournament-design-ladder ... Implement 2020 ladder design	2020-03-09 18:15:59 +09:00
Dean Herbert	8b16dadfe5	Merge branch 'master' into tournament-design-gameplay	2020-03-09 15:09:02 +09:00
Dean Herbert	33f457d663	Fix layout issues with TournamentBeatmapPanel	2020-03-09 15:08:24 +09:00
Dean Herbert	832e64cc95	Fix test failures due to null current match	2020-03-09 14:57:19 +09:00
Dean Herbert	e4f07e5284	Merge branch 'master' into tournament-design-gameplay	2020-03-09 14:50:36 +09:00
Dan Balasescu	0ecf6a4ecd	Merge branch 'master' into tournament-design-win	2020-03-09 14:16:34 +09:00
Dan Balasescu	1e9adbba4e	Merge branch 'master' into tournament-design-intro	2020-03-09 14:16:22 +09:00
Dan Balasescu	fac5530cab	Merge branch 'master' into tournament-design-mappool	2020-03-09 14:16:05 +09:00
Dan Balasescu	0f44c0739a	Merge branch 'master' into tournament-design-ladder	2020-03-09 14:16:01 +09:00
smoogipoo	b61e56cda5	Resolve post-merge issue	2020-03-09 13:29:17 +09:00
Dan Balasescu	ab79f36c41	Merge branch 'master' into tournament-drawable-team-tidy	2020-03-09 13:26:20 +09:00
Dan Balasescu	2eb8f245da	Merge branch 'master' into tournament-base-changes	2020-03-09 09:24:46 +09:00
Dan Balasescu	1c580216af	Merge pull request #8175 from peppy/score-counter-flexibility ... Increase flexibility of StarCounter component	2020-03-09 09:17:55 +09:00
Dean Herbert	61297847a7	Fix compilation failure	2020-03-09 01:21:37 +09:00
Dean Herbert	414e704d37	Use existing local function ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-03-09 00:18:28 +09:00
Dean Herbert	dc201a68dc	Merge branch 'tournament-drawable-team-tidy' into tournament-design-mappool	2020-03-08 20:16:48 +09:00
Dean Herbert	5f6ce7fde5	Merge branch 'tournament-drawable-team-tidy' into tournament-design-ladder	2020-03-08 20:16:35 +09:00
Dean Herbert	7f38ff8046	Merge branch 'tournament-drawable-team-tidy' into tournament-design-schedule	2020-03-08 20:16:12 +09:00
Dean Herbert	ece049e0c9	Merge branch 'tournament-drawable-team-tidy' into tournament-design-seeding	2020-03-08 20:15:48 +09:00
Dean Herbert	71824ce7d6	Merge branch 'tournament-drawable-team-tidy' into tournament-design-win	2020-03-08 20:14:59 +09:00
Dean Herbert	ba865aa195	Merge branch 'tournament-drawable-team-tidy' into tournament-design-intro	2020-03-08 20:14:15 +09:00
Dean Herbert	cc438210a3	Merge branch 'tournament-drawable-team-tidy' into tournament-design-gameplay	2020-03-08 20:13:29 +09:00
Dean Herbert	2fe32b7d2b	Remove LadderInfo requirement in DrawableMatchTeam	2020-03-08 19:41:22 +09:00
Dean Herbert	9138bafbeb	Fix alignment of flags on team intro screen	2020-03-08 18:49:06 +09:00
Dean Herbert	8b0b910196	Update song / chat / beatmap info display to reflect new design	2020-03-08 18:25:22 +09:00
Dean Herbert	3744aaf55f	Update vertical alignment of chroma area	2020-03-08 18:16:32 +09:00
Dean Herbert	0019199082	Merge branch 'tournament-base-changes' into tournament-design-gameplay	2020-03-08 18:12:10 +09:00
Dean Herbert	0102aaf32a	Move chat expand/contract logic local to tournament	2020-03-08 18:11:57 +09:00
Dean Herbert	5d5910822b	Initial pass of intro screen design update	2020-03-08 16:06:37 +09:00
Dean Herbert	a85cef2f06	Reset win screen video on display; add fade in transition	2020-03-08 16:05:37 +09:00
Dean Herbert	3a3a2ad2a7	Fix video looping not propagating when set too early in initialisation	2020-03-08 16:04:51 +09:00
Dean Herbert	3ac599246d	Initial pass of seeding screen design update	2020-03-08 16:03:37 +09:00
Dean Herbert	8ab9ca77d6	Fix next match timer not updating	2020-03-08 16:02:13 +09:00
Dean Herbert	6c0a27e0b9	Improve look of selected match	2020-03-08 16:02:13 +09:00
Dean Herbert	9934a97bd0	Limit upcoming matches displayed to 8	2020-03-08 16:01:41 +09:00
Dean Herbert	434feb5ac6	Fix alignment on schedule screen	2020-03-08 16:01:41 +09:00
Dean Herbert	059aea8ead	Initial pass of schedule screen design update	2020-03-08 16:00:00 +09:00
Dean Herbert	9bd837da41	Update match score display	2020-03-08 15:55:54 +09:00
Dean Herbert	3807c449bd	Update chat position	2020-03-08 15:55:54 +09:00
Dean Herbert	e25206728f	Hide score displays during warmup	2020-03-08 15:55:54 +09:00
Dean Herbert	86b12a384b	Initial pass of gameplay screen design update	2020-03-08 15:55:54 +09:00
Dean Herbert	ba6c4abbe6	Initial pass of ladder screen design update	2020-03-08 15:52:41 +09:00
Dean Herbert	2981730442	Initial pass of map pool screen design update	2020-03-08 15:49:37 +09:00
Dean Herbert	77c94afcf1	Add better flow logic to map pool layout when few beatmaps are present	2020-03-08 15:44:05 +09:00
Dean Herbert	4d74493289	Initial pass of win screen design update	2020-03-08 15:38:10 +09:00
Dean Herbert	1c5d6e0cf4	Split out nested classes to higher level for better code sharing	2020-03-08 15:34:45 +09:00
Dean Herbert	aed52179f0	Fix weird reverse logic	2020-03-08 15:32:22 +09:00
Dean Herbert	01e32896ee	Make save changes button more prominent	2020-03-08 15:32:22 +09:00
Dean Herbert	aeb6bf5b46	Remove unnecessary width specification on editor screens	2020-03-08 15:32:22 +09:00
Dean Herbert	129c8fe24f	Add helper method to get winning team colour	2020-03-08 15:32:22 +09:00
Dean Herbert	3caffb81e1	Add new element colours to TournamentGame	2020-03-08 15:32:22 +09:00
Andrei Zavatski	66f40f7f6e	Merge remote-tracking branch 'refs/remotes/ppy/master' into user-cards-update	2020-03-07 04:01:36 +03:00
Dean Herbert	09bd5ad185	Merge pull request #8151 from peppy/tourney-simplify-video-spec ... Simplify tournament video construction	2020-03-06 23:15:02 +09:00
Dan Balasescu	3d54334dd6	Merge pull request #8150 from peppy/remove-layout-durations-tournament-editors ... Remove layout durations from tournament editor screens for better performance	2020-03-06 22:38:06 +09:00
Dan Balasescu	643b25e484	Merge branch 'master' into tourney-simplify-video-spec	2020-03-06 22:28:21 +09:00
Dean Herbert	0a72fa69ab	Simplify video creation (and handle fallback better)	2020-03-06 18:39:12 +09:00
Dean Herbert	2d95f29925	Add gameplay screen specific video	2020-03-06 18:38:54 +09:00
Dean Herbert	88759e65a0	Remove layout durations from tournament editor screns for better performance	2020-03-06 16:31:36 +09:00
Dean Herbert	ac88ba717b	Ensure screens respect aspect ratio in tests	2020-03-06 16:13:07 +09:00
Andrei Zavatski	6631b07442	Refactor to replace existing panels	2020-03-04 14:58:15 +03:00
Dan Balasescu	5eeed3faa1	Merge branch 'master' into owc-2019	2020-03-04 16:27:46 +09:00
Dean Herbert	c306d3de2e	Fix typo in button ... Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>	2020-03-04 16:03:43 +09:00
Dan Balasescu	dadf151e7c	Merge branch 'master' into tournament-seeding-screen	2020-03-04 15:42:44 +09:00
Dan Balasescu	6f5d2da03e	Merge branch 'master' into add-torus-font	2020-03-04 13:56:30 +09:00
Dean Herbert	dade58adf3	Fix crash from editor screen test scene when trying to view seeding editor	2020-03-04 13:21:14 +09:00
Dean Herbert	6b7144e21b	Fix non-matching filename	2020-03-04 13:19:52 +09:00
Dean Herbert	22c4c515f5	Merge pull request #8123 from smoogipoo/fix-ladderscreen-nullref ... Fix nullref when deleting teams in the ladder screen	2020-03-04 13:18:07 +09:00
smoogipoo	fc0821f194	Fix nullref when deleting teams in the ladder screen	2020-03-04 12:37:42 +09:00
Dean Herbert	23091cb25e	Merge branch 'split-out-files' into tournament-seeding-screen	2020-03-04 12:11:17 +09:00
Dean Herbert	0f7316d41d	Move file to other file	2020-03-04 12:08:44 +09:00
Dean Herbert	e678a068b6	Bring design up-to-date with 2019 standards	2020-03-03 19:20:42 +09:00
Dean Herbert	1b355d02d6	Update video resource paths	2020-03-03 19:20:42 +09:00
Dean Herbert	093f2affdf	Add seeding screen	2020-03-03 19:19:03 +09:00
Dean Herbert	372060bc2b	Only trigger changes if new user information is actually populated	2020-03-03 18:57:00 +09:00
Dean Herbert	a2273234cb	Better handle startup when ladder cannot be read correctly	2020-03-03 18:57:00 +09:00
Dean Herbert	f1f4f1ffbd	Add torus font	2020-03-03 18:17:51 +09:00
smoogipoo	958c891d15	Update with framework-side bindable list changes	2020-02-17 15:06:14 +09:00
Dean Herbert	32fb87acec	Update country names	2020-01-23 16:45:30 +09:00
Dean Herbert	c0935b9b86	Update naming in tournament	2020-01-22 23:13:21 +09:00
Dean Herbert	7c62cc3ac3	Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework	2020-01-22 22:57:52 +09:00
smoogipoo	bfb056c612	Apply input method signature refactorings	2020-01-20 18:17:21 +09:00
Dean Herbert	cd5290b030	Enforce using get-only auto property where possible	2020-01-20 13:50:27 +09:00
smoogipoo	43f144cd6a	Invert condition	2020-01-20 11:48:56 +09:00
Dean Herbert	55ed823c88	Fix hard crashes on tournament client if a round contains an empty beatmap	2020-01-19 22:26:15 +09:00
recapitalverb	af167eb719	Remove duplicate condition in TournamentFont	2020-01-13 23:28:26 +07:00
smoogipoo	91735ff367	Update MathUtils namespace usages	2020-01-09 13:43:44 +09:00
Huo Yaoyuan	1b33581667	Construct DllResourceStore with assemblies	2019-12-28 21:13:18 +08:00
Huo Yaoyuan	ecfc6dfa3d	CA1825: use Array.Empty.	2019-12-17 12:59:48 +08:00
Dean Herbert	77b9989e11	Fix some weird private field names	2019-12-11 14:10:35 +09:00
dependabot-preview[bot]	b764a74919	Bump Microsoft.Win32.Registry from 4.6.0 to 4.7.0 ... Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/corefx) from 4.6.0 to 4.7.0. - [Release notes](https://github.com/dotnet/corefx/releases) - [Commits](https://github.com/dotnet/corefx/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-09 07:52:22 +00:00
Dean Herbert	c49aeb08c4	Add API methods to perform requests out-of-queue	2019-11-29 20:03:14 +09:00
Dean Herbert	9a941c4f94	Update font loading to use new method	2019-11-29 02:15:13 +09:00
Dean Herbert	14277d714e	Fix tournament client crashing due to null ruleset	2019-11-29 01:01:25 +09:00
Huo Yaoyuan	c0fe91a84c	Merge branch 'master' into sharpen	2019-11-26 18:21:50 +08:00
Dan Balasescu	2aa13370df	Merge branch 'master' into song-bar-stats	2019-11-26 13:27:01 +09:00
Dean Herbert	b85189f855	Merge remote-tracking branch 'upstream/master' into fix-spritetext-usage	2019-11-25 11:31:12 +09:00
Dean Herbert	45514ff660	Apply fixes	2019-11-25 11:30:55 +09:00
Berkan Diler	fccdbffa93	Use MathF instead of Math- functions when possible ... MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.	2019-11-25 00:45:42 +01:00
Dean Herbert	244177880e	Only show star on HR	2019-11-24 01:45:21 +09:00
Dean Herbert	326a8f62eb	Calculate more correct AR locally for now	2019-11-24 00:22:01 +09:00
Dean Herbert	eb81d15463	Don't attempt to repopulate already populated users on startup	2019-11-23 20:55:00 +09:00
Dean Herbert	e3f3b1ab1a	Display useful statistics on song bar depending on current ruleset	2019-11-23 20:52:41 +09:00
Dean Herbert	c2e85a2057	Apply CornerExponent fixes	2019-11-22 19:49:20 +09:00
Huo Yaoyuan	4cd7d67fe4	Use early return for if-pattern-matching.	2019-11-22 00:02:40 +08:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
Huo Yaoyuan	374ef6ff83	Merge branch 'master' into sharpen	2019-11-20 17:30:58 +08:00
Huo Yaoyuan	608785b99a	Update .Net Standard projects to 2.1	2019-11-18 18:35:58 +08:00
Huo Yaoyuan	144812669d	Use static local functions.	2019-11-12 19:56:54 +08:00
Huo Yaoyuan	64fc5007fc	Use language primitive types.	2019-11-12 19:56:45 +08:00
Huo Yaoyuan	31cc0d13da	Use 'out var'.	2019-11-12 19:55:26 +08:00
Huo Yaoyuan	0d81b96c5f	Use deconstruction declaration.	2019-11-12 19:55:22 +08:00
Huo Yaoyuan	e5e8e70704	Use pattern matching.	2019-11-12 19:55:19 +08:00
Huo Yaoyuan	7d7b9e36b2	Use compound assignment.	2019-11-12 19:53:50 +08:00
Dean Herbert	2f8768a4b1	Move LabelledDropdown local to usage	2019-11-12 11:04:49 +09:00
Dean Herbert	bedd136c81	Merge remote-tracking branch 'upstream/master' into lookup-players-for-ruleset	2019-11-12 11:02:36 +09:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
Dean Herbert	5d96e6d90a	Populate users centrally, using the correct ruleset	2019-11-11 17:39:48 +09:00
Dean Herbert	702a1c496b	Add ruleset selection to tournament client	2019-11-11 17:39:28 +09:00
Dan Balasescu	1c1a49011b	Merge branch 'master' into infrastructure	2019-11-08 19:10:49 +09:00
Dean Herbert	c1ad3114d6	Merge remote-tracking branch 'upstream/master' into tournament-improve-transitions	2019-11-08 19:09:19 +09:00
Dan Balasescu	592368a320	Merge branch 'master' into tournament-highlight-active-screen	2019-11-08 18:28:51 +09:00
Dean Herbert	12b855d68f	Make drawing screen transition properly	2019-11-08 17:56:11 +09:00
Dean Herbert	7b8ed1ac9a	Improve tournament screen transitions	2019-11-08 17:56:04 +09:00
Dan Balasescu	f68013059f	Merge branch 'master' into fix-tourney-button-sounds	2019-11-08 17:47:38 +09:00
Dean Herbert	651a1e2ae1	Highlight selected tournament screen's button	2019-11-08 17:22:51 +09:00
Dean Herbert	380859e06e	Set clock on video directly; ignore long frames	2019-11-08 17:13:45 +09:00
Dean Herbert	8bcbc93501	Fix tournament buttons playing sound effects	2019-11-08 17:00:47 +09:00
Dean Herbert	5fe764b2db	Fix tournament videos stuttering when changing scenes	2019-11-08 16:19:34 +09:00
Dean Herbert	5e416bd18d	Fix tournament client crashing if beatmap added with an ID of zero	2019-11-06 14:47:31 +09:00
Huo Yaoyuan	3ad0369d7b	Resolve new diagnostics in C# 7.3	2019-10-30 23:13:11 +08:00
Huo Yaoyuan	bcf8e3a9d4	Remove redundant properties from desktop projects. ... While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.	2019-10-30 22:56:33 +08:00
Huo Yaoyuan	31595159be	Normalize .props	2019-10-30 21:54:14 +08:00
Dean Herbert	08040adfad	Expose Current bindable in LabelledComponents ... Adds a `LabelledDrawable` class for usages where bindables are not present.	2019-10-28 16:24:28 +09:00
Dean Herbert	9372526d3a	Don't automatically return to gameplay from map pool if no picks are made ... Closes #6491.	2019-10-14 20:08:05 +09:00
Dean Herbert	f493f1c71d	Move new components to v2 namespace	2019-09-24 19:00:26 +09:00
smoogipoo	df692b091c	Make LabelledComponent generic	2019-09-24 18:22:02 +09:00
Dan Balasescu	45015fc4ba	Merge branch 'master' into tournament-setup	2019-09-24 17:27:17 +09:00
dependabot-preview[bot]	50dcb70342	Bump Microsoft.Win32.Registry from 4.5.0 to 4.6.0 ... Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/corefx) from 4.5.0 to 4.6.0. - [Release notes](https://github.com/dotnet/corefx/releases) - [Commits](https://github.com/dotnet/corefx/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-23 21:04:20 +00:00
Dean Herbert	bafb429e9b	Don't show video background	2019-09-23 04:49:31 +09:00
Dean Herbert	4b7a421191	Set setup screen as default when opening	2019-09-23 04:47:51 +09:00
Dean Herbert	b41ac543c5	Allow changing logged in user	2019-09-23 04:46:50 +09:00
Dean Herbert	e07aa94fc8	Allow reloading ipc source	2019-09-23 04:22:50 +09:00
Dean Herbert	47a89231ad	Read from (and allow reloading) IPC source	2019-09-23 03:17:14 +09:00
Dean Herbert	3b52e7c724	Add boilerplate logic	2019-09-23 03:17:14 +09:00
Dean Herbert	48716f8f2b	Update framework	2019-08-21 13:29:50 +09:00
Dean Herbert	90b1fe81f3	Update cached usage in line with framework changes	2019-08-09 19:12:29 +09:00
Dean Herbert	1d1372d639	Remove forceful resizing	2019-07-30 07:42:19 +09:00
Dean Herbert	56dbd94d16	Adjust tournament map pool layout to allow for larger pools	2019-07-27 19:46:46 +09:00
Dean Herbert	08014b1b99	Fix logo masking not being applied correctly for showcase/win screens	2019-07-13 11:13:05 +09:00
iiSaLMaN	e73f22eff8	Convert length retrieved from online to milliseconds	2019-07-09 17:53:34 +03:00
iiSaLMaN	129899f419	Add a BPM property in BeatmapInfo	2019-07-08 10:43:35 +03:00
iiSaLMaN	729f0901f7	Move Length out of OnlineInfo	2019-07-07 20:25:36 +03:00
iiSaLMaN	3ea9629daf	Move BPM out of OnlineInfo	2019-07-07 20:11:44 +03:00
Dan Balasescu	18d64df0c4	Merge branch 'master' into add-numberbox	2019-06-24 15:22:30 +09:00
Dean Herbert	d595860b14	Remove background from team intro screen	2019-06-23 20:09:42 +09:00
Dean Herbert	ba97b887b4	Allow cusotmisation of the colour portion of the tournament logo header	2019-06-23 20:05:55 +09:00
Dean Herbert	12740eff72	Format tournament bracket output	2019-06-22 22:42:11 +09:00
Unknown	1bc1e2459e	add SettingsNumberBox and use it in tournament tools	2019-06-21 15:04:52 +02:00
Unknown	2c3504d302	fix bracket editor crash when no round description is present	2019-06-21 13:29:24 +02:00
smoogipoo	66b8dc2de7	Fix ladder permanently disappearing after being dragged offscreen	2019-06-21 15:47:41 +09:00
smoogipoo	5a34794240	Add default date to matches	2019-06-21 15:34:03 +09:00
smoogipoo	cffc82ce81	Add a max height for the ladder settings dropdowns	2019-06-21 15:22:56 +09:00
smoogipoo	ee30612a76	Add registry-based stable storage fallback	2019-06-21 15:07:12 +09:00
Dean Herbert	d6469aed58	Remove migration code	2019-06-19 14:55:28 +09:00
Dean Herbert	9a319e3f96	Add missing space	2019-06-18 17:59:47 +09:00
Dean Herbert	ba589b2139	Add more functionality and share more logic between editor screens	2019-06-18 17:59:33 +09:00
Dean Herbert	711214ed09	Use OsuButton everywhere	2019-06-18 17:17:46 +09:00
Dean Herbert	437ad2b0d0	Transfer more pieces of user across	2019-06-18 16:46:33 +09:00
Dean Herbert	4baadf6319	Add map pool editing functionality to round editor	2019-06-18 16:37:13 +09:00
Dean Herbert	412778c71a	Rename nested TeamRow class for clarity	2019-06-18 15:54:34 +09:00
Dean Herbert	77f3d4848b	Make common base class for editor screens	2019-06-18 15:53:03 +09:00
Dean Herbert	926a11ab8c	Group, rename and standardise tests	2019-06-18 15:28:36 +09:00
Dean Herbert	3fcb8081dd	Remove unused ruleset bindable	2019-06-18 15:20:36 +09:00
Dean Herbert	1a92263652	Ignore parse errors rather than dying	2019-06-18 15:18:14 +09:00
Dean Herbert	3db6913a9c	Rename editor screens removing plurals	2019-06-18 15:15:28 +09:00
Dean Herbert	7c163ad911	Move font-related code out of TournamentGame	2019-06-18 15:09:39 +09:00
Dean Herbert	21138e6e2c	Fix mismatching filenames	2019-06-18 15:05:55 +09:00
Dean Herbert	6226889d1c	Add xmldoc and serialisable attributes	2019-06-18 15:00:33 +09:00
Dean Herbert	da20904a57	MatchPairing -> TournamentMatch	2019-06-18 14:57:05 +09:00
Dean Herbert	96e24ebd20	General namespace tidy-up	2019-06-18 14:51:48 +09:00
Dean Herbert	4f5abeb79f	Grouping -> Round	2019-06-18 14:44:15 +09:00
Dean Herbert	796afc0bf9	Rename and expand chat tests	2019-06-18 14:03:09 +09:00
Dean Herbert	1e2f9d1ba1	Fix start failure if videos are missing	2019-06-17 21:07:30 +09:00
Dean Herbert	5911105298	Make team editor prettier	2019-06-17 20:59:17 +09:00
Dean Herbert	ba884162b2	Add player editor	2019-06-17 20:47:45 +09:00
Dean Herbert	acca2587ac	Use Current instead of Bindable ... Bindable is going to be removed upstream	2019-06-17 19:36:26 +09:00
Dean Herbert	be4cc8c6e1	Simplify LadderEditorSettings implementation by using bindables directly	2019-06-17 19:11:57 +09:00
Dean Herbert	58136360e0	Bindable handling in DrawableTournamentTeam	2019-06-17 19:11:57 +09:00
Dean Herbert	93fc14426b	Convert TournamentTeam props to use binadbles	2019-06-17 19:11:57 +09:00
Dean Herbert	e58d259498	Create wireframe for team editor	2019-06-17 19:11:57 +09:00
Dean Herbert	c9bd62e815	Use bindable logic for grouping name/description updates	2019-06-14 20:32:23 +09:00
Dean Herbert	ef21a9e1d2	Use bindable flow to avoid scheduled updates	2019-06-14 20:32:23 +09:00
Dean Herbert	eb86d43d19	Update grouping dropdown after new groupings are added	2019-06-14 20:32:23 +09:00
Dean Herbert	9818637b8d	Fix MapPoolScreen test	2019-06-14 20:32:23 +09:00
Dean Herbert	a7fcec8d97	Fix TournamentSceneManager test	2019-06-14 20:32:23 +09:00
Dean Herbert	8da448fca7	Improve usability of grouping editor screen	2019-06-14 20:32:23 +09:00
Dean Herbert	0db013b782	Fix save button not being topmost	2019-06-14 20:32:23 +09:00
Dean Herbert	4cd6955a96	Fix GameplayScreen test not working	2019-06-14 20:32:23 +09:00
Dean Herbert	d4808ded0b	Fix tooltips not showing at correct location	2019-06-14 20:32:23 +09:00
Dean Herbert	2b4384bb30	Fix crash when setting a match as current which doesn't have a grouping	2019-06-14 20:32:23 +09:00
Dean Herbert	831686d20b	Fix crash when starting with an empty bracket	2019-06-14 20:32:23 +09:00
Dean Herbert	9e4f2c7eb9	Move font local	2019-06-13 19:41:01 +09:00
Dean Herbert	ee9d82f0fe	Revert right click handling for now	2019-06-13 19:10:57 +09:00
Dean Herbert	89c68c78d1	Reduce size of paths	2019-06-13 18:06:24 +09:00
Dean Herbert	eb0f0aefba	Apply review changes	2019-06-13 17:12:06 +09:00
Dean Herbert	ba475ef6c8	Remove unnecessary invalidation	2019-06-13 16:38:45 +09:00
Dean Herbert	4af16262e3	Limit zoom range of bracket display	2019-06-13 16:38:39 +09:00
Dean Herbert	a0503fcbe3	Reduce update rate of paths	2019-06-13 16:05:34 +09:00
Dean Herbert	5d77ae4a1e	Fix regression in FileBasedIPC implementation	2019-05-26 10:25:17 +09:00
Dean Herbert	084c2252cb	Use less DI where we already have access to LadderInfo	2019-05-20 14:48:33 +09:00
Dean Herbert	d8ed402779	Make use of ValueChanged.OldValue	2019-05-20 14:47:46 +09:00
Dean Herbert	069245e7ab	Update header colour to match TWC	2019-05-18 21:40:02 +09:00
Dean Herbert	30e36627cf	Remove redundant code	2019-05-18 21:37:46 +09:00
Dean Herbert	530032cafe	Update obsoleted font usages	2019-05-15 13:10:58 +09:00
Dean Herbert	7b56180b8b	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-05-15 12:08:23 +09:00
Dean Herbert	1ef2a4c46f	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-04-03 16:23:33 +09:00
Dean Herbert	b0971ef0fd	Fix remaining inspections	2019-03-04 14:18:04 +09:00
Dean Herbert	cf63ee4948	Update licence headers	2019-03-04 13:24:19 +09:00
Dean Herbert	8bf49830d5	Simplify and extract complex method	2019-03-04 13:13:31 +09:00
Dean Herbert	5b81de7663	Apply codefactor fixes	2019-03-04 13:04:07 +09:00
Dean Herbert	132ce541f3	Fix obsolete font usages	2019-03-04 12:06:41 +09:00
Dean Herbert	73d266fe10	Fix win screen being incorrectly displayed after switching matches	2019-03-02 16:32:11 +09:00
Dean Herbert	4c66ebb501	Fix formatting issues	2019-03-02 13:52:56 +09:00
Dean Herbert	389632d932	Fix bindable changes	2019-03-02 13:40:43 +09:00
Dean Herbert	796f6c3092	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-03-02 13:13:51 +09:00
Dean Herbert	e7668a749b	Bind to correct target (hacky)	2019-02-17 19:49:10 +09:00
Dean Herbert	6ea1ed8d04	Fix unnecessary texture atlas generation	2019-02-17 19:48:54 +09:00
Dean Herbert	fcab21908b	Update in line with screen changes	2019-02-17 18:20:03 +09:00
Dean Herbert	61e6285f7a	Update paths	2019-02-08 15:20:22 +09:00
Dean Herbert	5048f425d4	Add ability to reset bracket	2019-02-06 18:36:15 +09:00
Dean Herbert	cb23918512	Changes for mania world cup	2019-02-03 11:24:43 +09:00
Dean Herbert	482a01e7ba	Merge branch 'master' into tournament-tools ... # Conflicts: # osu.Game/Online/API/Requests/Responses/APIBeatmap.cs # osu.Game/OsuGameBase.cs # osu.Game/Overlays/ChatOverlay.cs # osu.Game/Screens/Menu/MainMenu.cs # osu.Game/Screens/Tournament/Drawings.cs # osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs # osu.Game/osu.Game.csproj # osu.sln	2019-02-02 19:09:48 +09:00
Dean Herbert	a7c82c9741	Split out chat component into reusable piece	2018-12-20 16:50:38 +09:00
Dean Herbert	8907ce3f63	Automatically fix invalid pairing dates on load (based on contained groupings)	2018-12-14 18:11:04 +09:00
Dean Herbert	61ca79a8b2	Add conditional match support	2018-12-02 22:36:21 +09:00
Dean Herbert	056025c5c2	Fix handling of API responses	2018-12-01 09:50:11 +09:00
Dean Herbert	fdba2bffb9	Ensure last state is set correctly	2018-11-22 17:33:48 +09:00
Dean Herbert	17a81259d4	Fix spacing and colouring of song bar eleemnts ... Also uses MM:ss instead of ssss.	2018-11-22 17:26:19 +09:00
Dean Herbert	fb05ea3de3	Fix alignment and fonts of tem intro screen	2018-11-22 16:23:44 +09:00
Dean Herbert	4e8c7a4dc0	Adjust gameplay area to match better ... Also reduces size of score display to avoid hiding combos.	2018-11-22 15:42:10 +09:00
Dean Herbert	cbf82f892d	Add OD display and fix "*" difficuty modifier display	2018-11-22 14:10:33 +09:00
Dean Herbert	7d3bcdfc17	Fix stats not displaying on showcase screen	2018-11-22 13:17:51 +09:00
Dean Herbert	f91d2e2e07	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-22 10:25:30 +09:00
Dean Herbert	8fab241ce3	Don't show matches on showcase which are more than four days away	2018-11-18 21:15:29 +09:00
Dean Herbert	5621101d40	Adjust gameplay screen size	2018-11-18 12:39:25 +09:00
Dean Herbert	925532508c	Change precedence of chat colouring	2018-11-18 12:39:17 +09:00
Dean Herbert	256d11620f	Add missing space after "CS"	2018-11-18 12:38:48 +09:00
Dean Herbert	06b08cd82d	Automate return to gameplay after map pool selection	2018-11-18 09:29:18 +09:00
Dean Herbert	e6529eac3e	Add automation of map pool and win screen workflows	2018-11-18 08:30:17 +09:00
Dean Herbert	70739ae5a0	Reduce rate of scale of score display	2018-11-18 08:25:23 +09:00
Dean Herbert	584adaf77d	Limit horizontal bounds of score display	2018-11-18 07:54:53 +09:00
Dean Herbert	4b047ad9cc	Centralise chat display	2018-11-17 21:27:02 +09:00
Dean Herbert	8b820f7346	Move channel reading to new ipc file	2018-11-17 21:26:56 +09:00
Dean Herbert	852f0337dd	Group map pool by mod type	2018-11-17 16:06:43 +09:00
Dean Herbert	4ae9413ee6	Add mod icons	2018-11-17 16:00:12 +09:00
Dean Herbert	9f519d7002	Actually add match score display to gameplay screen	2018-11-17 15:59:55 +09:00
Dean Herbert	26286177d3	Colour chat names	2018-11-17 15:35:14 +09:00
Dean Herbert	49e155c2c0	Fix chat not appearing at ranking	2018-11-17 15:31:03 +09:00
Dean Herbert	aebece3d89	Use already populated beatmap values if available	2018-11-17 15:18:22 +09:00
Dean Herbert	5659ba6ef8	Add logo to ladder screen	2018-11-17 14:59:37 +09:00
Dean Herbert	71184c602f	Show times on schedule	2018-11-17 14:55:27 +09:00
Dean Herbert	81f39c2f39	Don't show matches on schedule which don't have teams set	2018-11-17 14:35:40 +09:00
Dean Herbert	bed967b456	Add better date string formatting	2018-11-17 14:05:42 +09:00
Dean Herbert	c1e1306c97	Show controls above screens	2018-11-17 13:39:55 +09:00
Dean Herbert	7f7d4ef442	Don’t hard fail if stable install is missing	2018-11-17 13:36:36 +09:00
Dean Herbert	87243a72d3	Add date entry for pairings	2018-11-17 12:14:15 +09:00
Dean Herbert	2ee77670ee	Add date entry for groupings	2018-11-17 12:04:19 +09:00
Dean Herbert	c1e3c4d435	Make chat tests work again, clear old messages	2018-11-17 10:40:44 +09:00
Dean Herbert	4b74105ad9	Fix code sanity issues	2018-11-16 20:34:51 +09:00
Dean Herbert	cf0976955b	Expose groupings editor	2018-11-16 20:30:12 +09:00
Dean Herbert	67bb428aef	Move editing functionality to its own screen	2018-11-16 20:16:18 +09:00
Dean Herbert	5801ed7b1a	Adjust spacing on map pool screen	2018-11-16 19:49:17 +09:00
Dean Herbert	e3e92f4302	Add chat IPC and gameplay screen integration	2018-11-16 19:43:54 +09:00
Dean Herbert	c9e2ee8f56	Fix masking of song bar	2018-11-16 18:14:42 +09:00
Dean Herbert	1ab4713ef6	Add tournament chat display	2018-11-16 15:30:19 +09:00
Dean Herbert	e6637532bc	Add back padding	2018-11-16 12:20:21 +09:00
Dean Herbert	46e163ec5e	Add score display	2018-11-15 21:28:42 +09:00
Dean Herbert	54b87e9c93	Don't crash on unexpected pairing links	2018-11-15 14:12:51 +09:00
Dean Herbert	604cb4cb9e	Update to support new dropdown logic	2018-11-15 14:12:41 +09:00
Dean Herbert	8eff21d128	Fix star colours being incorrect	2018-11-15 14:12:14 +09:00
Dean Herbert	01f814aace	Fix song length not being rounded correctly when DT is applied	2018-11-15 14:11:58 +09:00
Dean Herbert	d7a086be83	Fix regression in song bar display logic	2018-11-12 01:25:31 +09:00
Dean Herbert	00731560cb	Add CS display	2018-11-12 01:25:22 +09:00
Dean Herbert	123629ba9e	Flash panels on select	2018-11-11 10:48:57 +09:00
Dean Herbert	be3904b647	Add win screen	2018-11-11 10:39:04 +09:00
Dean Herbert	eabcef3e12	Add schedule screen	2018-11-11 10:13:17 +09:00
Dean Herbert	949cf98d1a	Adjust gameplay position ever so slightly	2018-11-11 09:23:54 +09:00
Dean Herbert	e3576572a3	Fix warmup state, automate more	2018-11-11 09:22:57 +09:00
Dean Herbert	2683b161d5	Fix missing logo	2018-11-11 09:16:46 +09:00
Dean Herbert	9c18f7a25a	Fix date display	2018-11-11 09:05:36 +09:00
Dean Herbert	21bbb68636	Handle delayed contract	2018-11-11 01:50:09 +09:00
Dean Herbert	b5c2d94cc4	Avoid rendering more than one video at once	2018-11-11 01:39:02 +09:00
Dean Herbert	86423dce5f	Animate song bar based on game mode	2018-11-11 01:30:21 +09:00
Dean Herbert	976180ecc2	Fix incorrect order after bans	2018-11-11 00:48:22 +09:00
Dean Herbert	629657044d	Add automatic scoring	2018-11-11 00:45:48 +09:00
Dean Herbert	713038bff8	Share header area between screens	2018-11-10 17:26:21 +09:00
Dean Herbert	82d53e6f17	Fix many unnecessary requests being fired	2018-11-10 08:37:21 +09:00
Dean Herbert	1756ef95cb	Add ability to adjust scores from gameplay screen	2018-11-10 07:31:06 +09:00
Dean Herbert	e170372932	Populate json with enums better	2018-11-09 17:54:05 +09:00
Dean Herbert	9064f3fe0f	Fix ladder manager not saving changes out correctly	2018-11-09 17:39:46 +09:00
Dean Herbert	8a917e4cc7	Fix context menus (temporarily)	2018-11-09 16:57:45 +09:00
Dean Herbert	66dc7d6b02	Fix debug tools not working	2018-11-09 16:26:09 +09:00
Dean Herbert	1c6c598644	Fill out username from user ids, rather than user ids from user ids	2018-11-09 16:11:12 +09:00
Dean Herbert	0be2f5ac94	Add non-working warmup toggle button	2018-11-09 16:10:58 +09:00
Dean Herbert	160984719d	Add team and star displays	2018-11-08 20:38:14 +09:00
Dean Herbert	ee6263f395	Fix old maps not getting cleared when switching matches	2018-11-08 20:14:50 +09:00
Dean Herbert	6ff29c1ea4	Fix non-unbinding bindable bind	2018-11-08 16:55:55 +09:00
Dean Herbert	a31507ff0e	Safety check	2018-11-08 13:08:59 +09:00
Dean Herbert	bd6d3f1473	Improve appearance	2018-11-08 06:47:42 +09:00
Dean Herbert	5da6f11a14	Automate picks and bans from IPC	2018-11-08 06:36:36 +09:00
Dean Herbert	5c84c3c0a8	Add support for picks and bans	2018-11-08 06:29:04 +09:00
Dean Herbert	e4a767d656	Move control panel logic to its own class	2018-11-08 03:51:39 +09:00
Dean Herbert	3eabac0e3d	Move all IPC handling to its own class	2018-11-08 01:23:00 +09:00
Dean Herbert	878b16c596	Add automatic country/user information lookups	2018-11-07 17:20:50 +09:00
Dean Herbert	a0d64c1b13	Add ability to select current match	2018-11-07 01:24:35 +09:00
Dean Herbert	555d63165b	Add custom font	2018-11-07 00:27:12 +09:00
Dean Herbert	53ec01d51f	Perform mappings earlier in execution	2018-11-06 20:18:11 +09:00
Dean Herbert	968d39c0e6	Rearrange scenes	2018-11-06 20:13:09 +09:00
Dean Herbert	4e87288049	Add the concept of "current match"	2018-11-06 20:13:04 +09:00
Dean Herbert	3427127589	Automatically keep window wide enough to display correctly	2018-11-06 19:27:10 +09:00
Dean Herbert	ca9df94ea2	Add skeleton for gameplay screen	2018-11-06 19:27:10 +09:00
Dean Herbert	afb3b38098	Fix regression in testing logic	2018-11-06 18:32:59 +09:00
Dean Herbert	a2b28e0bf4	Add missing header	2018-11-06 16:15:03 +09:00
Dean Herbert	85fe4db2ec	Hide game cursor so it is not included in stream	2018-11-06 15:08:14 +09:00
Dean Herbert	6f25548737	Remove now unnecessary null setters	2018-11-06 14:49:20 +09:00
Dean Herbert	9c5eddea54	Allow running tournament tools from main executable	2018-11-06 14:49:09 +09:00
Dean Herbert	fb93aea909	Use logo-less video by default	2018-11-05 23:15:30 +09:00
Dean Herbert	c7e5ae0573	Read from stable	2018-11-05 23:15:13 +09:00
Dean Herbert	7e092c6084	Read videos from storage	2018-11-04 21:15:06 +09:00
Dean Herbert	89a1414c63	Read flag name from file	2018-11-04 21:14:16 +09:00
Dean Herbert	54a02ee2d7	Add showcase screen	2018-11-04 07:12:07 +09:00
Dean Herbert	2e348edd8d	Fix filename	2018-11-04 05:29:06 +09:00
Dean Herbert	a918e83b1e	Add drawings screen	2018-11-04 04:58:59 +09:00
Dean Herbert	b610095ff5	Update drawings design	2018-11-04 04:58:40 +09:00
Dean Herbert	5568e9ff8a	Reduce test case crashes when missing data is present	2018-10-25 01:31:24 +09:00
Dean Herbert	12c0b2c37d	Add test videos and adjust alignment to match	2018-10-18 02:18:09 +09:00
Dean Herbert	7a753ad9e2	Change grouping title colours to match white background	2018-10-18 02:17:54 +09:00
Dean Herbert	830eda2a9f	Fix unused properties	2018-10-16 16:07:59 +09:00
Dean Herbert	3a5af47ee8	Populate beatmaps with api information when not present	2018-10-16 15:20:12 +09:00
Dean Herbert	63fbe4e946	Add map pool beatmaps to groupings	2018-10-14 18:00:28 +09:00
Dean Herbert	a02caeef64	Add team intro screen ... Also adds dates to groups and matches (must be manually populated via json)	2018-10-14 05:19:50 +09:00
Dean Herbert	c4b486f1d4	Fix transfer of teams in the case loser and winner progression are equal	2018-10-14 03:04:06 +09:00
Dean Herbert	b1862a863b	Fix not being able to decrement scores of matches with no defined progression	2018-10-14 03:03:40 +09:00
Dean Herbert	f5716c3d21	Add ability to change best of, add and delete groupings	2018-10-14 01:03:04 +09:00
Dean Herbert	522f106f74	Add initial version of beatmap card	2018-10-14 00:41:10 +09:00
Dean Herbert	a4bb4255b1	Add grouping manager	2018-10-13 07:10:13 +09:00
Dean Herbert	77055f6d5c	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-10-12 18:49:47 +09:00
Dean Herbert	73f451f27a	Fix right click regression	2018-09-25 13:39:33 +09:00
Dean Herbert	2abe96fb9c	Fix crash	2018-09-25 13:39:27 +09:00
Dean Herbert	c210ea7c39	Improve zoom logic	2018-09-25 10:47:56 +09:00
Dean Herbert	e74fd042aa	Use MouseUp instead of MouseDown for now	2018-09-25 10:35:00 +09:00
Dean Herbert	991d85a9f3	Cleanups	2018-09-25 10:30:04 +09:00
Dean Herbert	a5888feca4	Wip zoomable container logic	2018-09-25 10:23:27 +09:00
Dean Herbert	56981acc92	Fix default value of dropdown	2018-09-25 05:54:42 +09:00
Dean Herbert	fbda872a53	Update line colours to match bracket type	2018-09-25 04:58:34 +09:00
Dean Herbert	40ec24c721	Increase line thickness to match design	2018-09-25 04:52:05 +09:00
Dean Herbert	756141d9ed	Add basic scaling support	2018-09-25 04:51:40 +09:00
Dean Herbert	492cdb6a05	Fix namespacing	2018-09-25 04:21:48 +09:00