53916 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Kamensky	5a4828d886	Merge branch 'aicombat' into 'master' ... Fix miscalculation of damage shields See merge request core-developers/forge!5622	2021-10-22 03:42:14 +00:00
tool4EvEr	f1467d5a3e	Fix miscalculation of damage shields	2021-10-21 22:55:50 +02:00
Michael Kamensky	4233ee160e	Merge branch 'shoe_tree' into 'master' ... Shoe Tree! See merge request core-developers/forge!5619	2021-10-21 19:21:29 +00:00
Northmoc	a319d7882d	add AI hint	2021-10-21 14:24:16 -04:00
Michael Kamensky	1deb890f93	Merge branch 'cleanup/added-DB$-space' into 'master' ... Cleanup/added db$ space See merge request core-developers/forge!5341	2021-10-21 17:59:27 +00:00
Stu Bob	efcb45546c	Cleanup/added db$ space	2021-10-21 17:59:24 +00:00
Michael Kamensky	dede976ce5	Merge branch 'fix' into 'master' ... haktos_the_unscarred.txt NICKNAME flag See merge request core-developers/forge!5620	2021-10-21 17:56:44 +00:00
Northmoc	9dd5f0b590	add RemoveFromGameEffect	2021-10-21 12:56:16 -04:00
Northmoc	947deb4b8d	awol.txt	2021-10-21 12:55:08 -04:00
Northmoc	d913d0519a	haktos_the_unscarred.txt NICKNAME flag	2021-10-21 12:48:08 -04:00
Northmoc	37036332f7	shoe_tree.txt	2021-10-21 12:46:25 -04:00
Michael Kamensky	4f8247c443	Merge branch 'orderCardsByTheirOwners' into 'master' ... orderCardsByTheirOwners adjustment See merge request core-developers/forge!5617	2021-10-21 15:26:41 +00:00
Michael Kamensky	e4394d135d	Merge branch 'gray2' into 'master' ... improve Gray Text preference implementation See merge request core-developers/forge!5618	2021-10-21 15:26:25 +00:00
TRT	de3edd52cc	orderCardsByTheirOwners adjustment	2021-10-21 15:42:50 +02:00
Northmoc	843a2a643c	improve Gray Text preference implementation	2021-10-21 09:31:20 -04:00
Michael Kamensky	158de07d60	Merge branch 'sld_hawkins' into 'master' ... SLD Edition for missing Stranger Things Card See merge request core-developers/forge!5612	2021-10-21 12:37:24 +00:00
Michael Kamensky	c3b860998b	Merge branch 'master' into 'master' ... update simplified chinese translation See merge request core-developers/forge!5615	2021-10-21 12:37:05 +00:00
Michael Kamensky	94141e6e7f	Merge branch 'TRT-master-patch-24531' into 'master' ... Update forge-gui/res/cardsfolder/t/tevesh_szat_doom_of_fools.txt See merge request core-developers/forge!5616	2021-10-21 12:36:32 +00:00
Michael Kamensky	656a8a9fac	Merge branch 'blockfix' into 'master' ... AiBlockController: fix for menace + trample See merge request core-developers/forge!5614	2021-10-21 12:36:13 +00:00
Bug Hunter	21b037e2e7	Update forge-gui/res/cardsfolder/t/tevesh_szat_doom_of_fools.txt	2021-10-21 12:35:26 +00:00
CCTV-1	9f0680b20a	update new Importer strings.	2021-10-21 19:54:25 +08:00
TRT	88312465cd	AiBlockController: fix for menace + trample	2021-10-21 13:28:31 +02:00
Anthony Calosa	50a7437fbd	Merge branch 'master' into 'master' ... unused imports See merge request core-developers/forge!5613	2021-10-21 07:46:21 +00:00
Anthony Calosa	165a564caf	unused imports	2021-10-21 15:45:30 +08:00
paul_snoops	83441c6e75	SLD Edition for missing Stranger Things Card	2021-10-21 08:37:30 +01:00
Michael Kamensky	6cfc5041c7	Merge branch 'master' into 'master' ... [Mobile] Prevent Card Animations when FScrollPane is moving See merge request core-developers/forge!5611	2021-10-21 05:25:21 +00:00
Anthony Calosa	a6570491ea	Merge remote-tracking branch 'core/master'	2021-10-21 12:40:54 +08:00
Michael Kamensky	7306f69c4a	Merge branch 'twosat-master-patch-36825' into 'master' ... Update de-DE.properties See merge request core-developers/forge!5606	2021-10-21 04:34:54 +00:00
Michael Kamensky	da838bdb4c	Merge branch 'layout' into 'master' ... Add some more modern resolution choices See merge request core-developers/forge!5608	2021-10-21 04:34:44 +00:00
Michael Kamensky	b19f01ef8b	Merge branch 'gildedrake' into 'master' ... Fix AI refusing Gilded Drake trigger when no targets See merge request core-developers/forge!5607	2021-10-21 04:30:40 +00:00
Michael Kamensky	ba3e0c01ea	Merge branch 'run-quest-tourney-on-edt' into 'master' ... Fix Quest Tournament not running on EDT See merge request core-developers/forge!5609	2021-10-21 04:29:50 +00:00
Michael Kamensky	dc765ed2b2	Merge branch 'hawkins' into 'master' ... hawkins_national_laboratory_the_upside_down.txt See merge request core-developers/forge!5610	2021-10-21 04:29:40 +00:00
Anthony Calosa	6179c991a0	fix NPE	2021-10-21 12:18:24 +08:00
Anthony Calosa	8c438261dc	[Mobile] Prevent Card Animations when FScrollPane is moving ... - cleaner looks when the user is scrolling through the cards	2021-10-21 10:10:38 +08:00
Northmoc	627461546a	hawkins_national_laboratory_the_upside_down.txt	2021-10-20 21:07:15 -04:00
friarsol	92d5a00750	Fix Quest Tournament not running on EDT	2021-10-20 20:40:32 -04:00
tool4EvEr	cb5cf75e9e	Clean up	2021-10-20 23:13:38 +02:00
tool4EvEr	43019b3881	Add some more modern resolution choices	2021-10-20 22:27:36 +02:00
tool4EvEr	e7c9cdb111	Fix AI refusing Gilded Drake trigger when no targets	2021-10-20 22:14:55 +02:00
Andreas Bendel	f75c457e66	Update de-DE.properties ... translated a lot of deck importer related lines	2021-10-20 18:39:44 +00:00
Michael Kamensky	253cf35841	Merge branch 'SLD' into 'master' ... SLD Extra Life 2021 See merge request core-developers/forge!5605	2021-10-20 16:33:43 +00:00
Michael Kamensky	15cc56add2	Merge branch 'TRT-master-patch-93812' into 'master' ... Update forge-gui/res/cardsfolder/b/brain_in_a_jar.txt See merge request core-developers/forge!5604	2021-10-20 16:33:04 +00:00
Michael Kamensky	50ad8c5204	Merge branch 'flashback' into 'master' ... Flashback reminder remove "extrawurst" See merge request core-developers/forge!5603	2021-10-20 16:32:54 +00:00
paul_snoops	96a604d6e9	SLD Extra Life 2021	2021-10-20 16:25:20 +01:00
Bug Hunter	bda03f44cf	Update forge-gui/res/cardsfolder/b/brain_in_a_jar.txt	2021-10-20 14:56:36 +00:00
Northmoc	58925880b4	Flashback reminder remove "extrawurst"	2021-10-20 10:20:40 -04:00
Michael Kamensky	898f3e91e0	Merge branch 'evoke' into 'master' ... tidy up non-mana Evoke costs See merge request core-developers/forge!5602	2021-10-20 14:07:55 +00:00
Michael Kamensky	a49ab3828e	Merge branch 'imp' into 'master' ... maddening_imp.txt streamline with IsTriggerRemembered See merge request core-developers/forge!5601	2021-10-20 14:06:54 +00:00
Northmoc	d51de2a1a1	tidy up non-mana Evoke costs	2021-10-20 10:01:50 -04:00
Northmoc	53670a4dd7	maddening_imp.txt streamline with IsTriggerRemembered	2021-10-20 09:09:20 -04:00