55803 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Kamensky	c45ee59387	Merge branch 'stackDescs' into 'master' ... some more getStackDescription improvements See merge request core-developers/forge!6281	2022-02-22 09:48:59 +00:00
Tim Mocny	deb9744b38	some more getStackDescription improvements	2022-02-22 09:48:51 +00:00
Anthony Calosa	460475bb2a	Merge branch 'master' into 'master' ... unused imports See merge request core-developers/forge!6282	2022-02-22 07:05:51 +00:00
Anthony Calosa	e594a1ba86	unused imports	2022-02-22 15:00:47 +08:00
Anthony Calosa	7e8406d0ed	Merge branch 'master' into 'master' ... update touch controls for adventure rewards See merge request core-developers/forge!6278	2022-02-22 06:54:58 +00:00
Anthony Calosa	a799f3919c	Merge remote-tracking branch 'core/master'	2022-02-22 14:49:30 +08:00
Anthony Calosa	10c28ff2c3	align save/load layout	2022-02-22 14:42:25 +08:00
Anthony Calosa	a0498d9727	fix format	2022-02-22 12:36:28 +08:00
Anthony Calosa	b6a6b4517c	update UIActor ... - to set Label styles for font inside Table	2022-02-22 12:30:18 +08:00
Michael Kamensky	fea1a3b9dd	Merge branch 'nec_21' into 'master' ... NEC – 21 Feb See merge request core-developers/forge!6280	2022-02-22 04:05:24 +00:00
Tim Mocny	d638b50910	NEC – 21 Feb	2022-02-22 04:05:21 +00:00
Anthony Calosa	68ecc56a4e	update TransitionScreen ... - to match selected theme and logo	2022-02-22 09:36:29 +08:00
Anthony Calosa	82a8732c87	make altzonetabs for adventure mode ... - todo add reveal zone	2022-02-22 07:12:27 +08:00
Anthony Calosa	6d6dfb9845	Merge remote-tracking branch 'core/master'	2022-02-22 06:59:48 +08:00
Anthony Calosa	2faddd3824	use cropped border image for shop and reward cards	2022-02-22 05:56:03 +08:00
Anthony Calosa	f080a71300	update holdtooltip	2022-02-22 05:44:12 +08:00
Hans Mackowiak	c863c2c2f1	Merge branch 'nec_im' into 'master' ... NEC: Imposter Mech and support See merge request core-developers/forge!6268	2022-02-21 14:37:58 +00:00
Tim Mocny	7023059337	NEC: Imposter Mech and support	2022-02-21 14:37:56 +00:00
Michael Kamensky	0b9b008d6b	Merge branch 'nec_unq' into 'master' ... NEC: Unquenchable Fury and support See merge request core-developers/forge!6273	2022-02-21 13:53:16 +00:00
Tim Mocny	7d92359df2	NEC: Unquenchable Fury and support	2022-02-21 13:53:14 +00:00
Michael Kamensky	eec89828fc	Merge branch 'nec_20' into 'master' ... NEC – 20 Feb See merge request core-developers/forge!6272	2022-02-21 13:48:45 +00:00
Tim Mocny	784ef07f70	NEC – 20 Feb	2022-02-21 13:48:34 +00:00
Anthony Calosa	b73c4dfeea	updated tooltip code ... -todo set correct x, y and scale	2022-02-21 20:22:41 +08:00
Bug Hunter	00a2ea3cfc	Merge branch 'TRT-master-patch-81123' into 'master' ... Update forge-gui/res/cardsfolder/d/doomfall.txt See merge request core-developers/forge!6279	2022-02-21 09:43:59 +00:00
Bug Hunter	2934669c45	Update forge-gui/res/cardsfolder/d/doomfall.txt	2022-02-21 09:43:10 +00:00
Anthony Calosa	dc3d6b96e6	Merge remote-tracking branch 'core/master'	2022-02-21 16:19:03 +08:00
Anthony Calosa	6d6998ae92	update touch controls for adventure rewards ... - simulate hover for rewards cards / shop cards on touchdown	2022-02-21 16:05:32 +08:00
Michael Kamensky	fde9672eb2	Merge branch 'mindlinkFix' into 'master' ... TriggerBecomesCrewed: new Trigger for NEO Mechs Closes #2086 See merge request core-developers/forge!6277	2022-02-21 07:27:38 +00:00
Michael Kamensky	6427fa115c	Merge branch 'master' into 'master' ... [Mobile] Adventure Mode Android, Card Magnifier and Video Mode See merge request core-developers/forge!6234	2022-02-21 07:26:56 +00:00
Hans Mackowiak	0585398372	TriggerBecomesCrewed: new Trigger for NEO Mechs	2022-02-21 08:22:31 +01:00
Anthony Calosa	46e7bc5fd0	Merge remote-tracking branch 'core/master'	2022-02-21 14:37:47 +08:00
Anthony Calosa	b503ddc939	fix black screen for trying to load incompatible save..	2022-02-21 13:14:24 +08:00
Michael Kamensky	c99f09261d	Merge branch 'atsu' into 'master' ... tidy up various cards See merge request core-developers/forge!6276	2022-02-21 05:13:59 +00:00
Tim Mocny	6025d5df0d	tidy up various cards	2022-02-21 05:13:58 +00:00
Michael Kamensky	5b70d51f7f	Merge branch 'sd' into 'master' ... more Effect getStackDescription improvements See merge request core-developers/forge!6275	2022-02-21 05:13:41 +00:00
Tim Mocny	cc271cf82f	more Effect getStackDescription improvements	2022-02-21 05:13:39 +00:00
Michael Kamensky	2b2d30278f	Merge branch 'johnwilliams7-master-patch-72279' into 'master' ... Update Secret Lair Drop Series.txt See merge request core-developers/forge!6274	2022-02-21 05:06:41 +00:00
Anthony Calosa	1d1d753b51	add additional check for touchpad allowed bounds ... mark card magnifier as experimantal since it gets stuck on certain os/setup	2022-02-21 11:15:23 +08:00
Anthony Calosa	a55e0e8f0d	make touchpad auto follow	2022-02-21 08:45:30 +08:00
Anthony Calosa	3f07e65ead	fix gamehud world map ... - lock gamehud map controls inside the map stage (not world stage).	2022-02-21 07:39:56 +08:00
Anthony Calosa	e01953af0d	fix player keeps moving	2022-02-21 07:34:38 +08:00
Anthony Calosa	42f244d109	cache cursors	2022-02-21 07:30:22 +08:00
John Williams	d960248638	Update Secret Lair Drop Series.txt	2022-02-20 23:30:01 +00:00
Anthony Calosa	88365c2ff3	Merge remote-tracking branch 'core/master'	2022-02-21 06:59:09 +08:00
Anthony Calosa	0bfaad5a5a	unused import	2022-02-21 06:58:27 +08:00
Anthony Calosa	06a8daf02c	fix loading transition	2022-02-21 06:56:34 +08:00
Michael Kamensky	29f4b04ced	Merge branch 'sd' into 'master' ... some StackDescription tweaking See merge request core-developers/forge!6271	2022-02-20 20:21:35 +00:00
Tim Mocny	df2ada6f31	some StackDescription tweaking	2022-02-20 20:21:34 +00:00
Michael Kamensky	9686b14dbc	Merge branch 'revealhand' into 'master' ... RevealHandEffect: fix not revealing to all players See merge request core-developers/forge!6269	2022-02-20 20:21:22 +00:00
tool4EvEr	5e7cf52a7a	Also check supertype for Type$Legendary/Snow	2022-02-20 17:55:26 +01:00