331 Commits

Author	SHA1	Message	Date
Shivam	181cd67948	Merge remote-tracking branch 'upstream/master' into custom-ipc-location	2020-05-17 12:44:12 +02:00
Dean Herbert	13d4997c91	Remove custom back action logic (use receptor as intended)	2020-05-17 17:35:10 +09:00
Dean Herbert	864c1a73ae	Only add back button if required	2020-05-17 17:27:52 +09:00
Dean Herbert	2c0ac8cc36	Move padding to fill, not scroll container	2020-05-17 17:25:26 +09:00
Shivam	358345cee7	Change logic for parentscreen/subscreen relation	2020-05-16 12:50:56 +02:00
Shivam	b1243d6a87	Add padding to so the back button is not in the way	2020-05-16 04:05:01 +02:00
Shivam	bf6ce390ff	Add sub screen implementation to SeedingEditorScreen	2020-05-16 03:07:51 +02:00
Shivam	c931bae70e	Add back button to TournamentScreen and the inputhandler for it	2020-05-16 03:07:27 +02:00
Shivam	3fc888ef95	User interface setup for custom IPC location ... Right now makes use of another ActionableInfo field. Probably a better idea to add an extra button to the Current IPC Storage actionable field.	2020-05-16 03:03:10 +02:00
Shivam	1768beb690	Rename class SeeingEditorScreen to SeedingEditorScreen	2020-05-14 21:52:10 +02:00
Shivam	6ec55eb400	Give mappool scene its own video	2020-05-14 21:51:39 +02:00
Dean Herbert	09759565fa	Add support for 3v3 tournament chroma key layout	2020-05-07 14:51:14 +09:00
Dean Herbert	fcded20655	Don't specify IProvideVideo interface for now	2020-04-27 08:58:01 +09:00
Bartłomiej Dach	b9e0fed467	Use SongBar height instead of hard-coded dimensions	2020-04-27 00:02:58 +02:00
Shivam	39a593120c	Fixed CodeInspect errors	2020-04-24 17:00:35 +02:00
Shivam	28dcfe867c	Add Chroma keying to the background of the showcase video.	2020-04-23 21:09:12 +02:00
Shivam	085b6ae25f	Add background video for showcase scene (Tournament Client)	2020-04-23 20:24:03 +02:00
Dean Herbert	f4dc604dbf	Fix dragging tournament ladder too far causing it to disappear	2020-04-08 13:32:37 +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
Dean Herbert	99f28efc96	Automatically mark the currently selected match as stsrated on entering gameplay screen	2020-03-17 13:16:52 +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
Dean Herbert	b902e50396	Add resolution selector in tournament setup screen	2020-03-13 15:44:23 +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
Dan Balasescu	f37444ad18	Merge branch 'master' into tournament-header-logo	2020-03-12 18:12:08 +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	efceeba076	Use fixed width for tournament score displays	2020-03-12 02:22:02 +09:00
Dan Balasescu	f49f9f40ae	Merge branch 'master' into tournament-design-seeding	2020-03-11 18:03:27 +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
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	832e64cc95	Fix test failures due to null current match	2020-03-09 14:57:19 +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