52558 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Northmoc	d280317ff8	shoreline_scout.txt	2021-08-02 16:03:06 -04:00
Michael Kamensky	a882f56b7e	Merge branch 'j21_30' into 'master' ... J21 - 30 July See merge request core-developers/forge!5147	2021-08-02 19:13:25 +00:00
Northmoc	e79fbad31d	fix StackDescs	2021-08-02 15:10:27 -04:00
Northmoc	5bd3062ce2	fix spelling	2021-08-02 15:10:26 -04:00
Northmoc	d3a464304d	longtusk_stalker.txt	2021-08-02 15:10:26 -04:00
Northmoc	fa70d55432	add whitespace	2021-08-02 15:10:25 -04:00
Northmoc	873ff52224	kiora_the_tides_fury.txt	2021-08-02 15:10:25 -04:00
Northmoc	87e6af657f	J21 edition update	2021-08-02 15:10:24 -04:00
Michael Kamensky	7f4f0a18f6	Merge branch 'chicken' into 'master' ... Chicken à la King in editions fix See merge request core-developers/forge!5165	2021-08-02 13:01:39 +00:00
Michael Kamensky	8db5c771dc	Merge branch 'TRT-master-patch-45006' into 'master' ... Update forge-gui/res/cardsfolder/v/vanish_into_memory.txt See merge request core-developers/forge!5166	2021-08-02 13:01:29 +00:00
Bug Hunter	47d103f493	Update forge-gui/res/cardsfolder/v/vanish_into_memory.txt	2021-08-02 11:40:48 +00:00
paul_snoops	bf3379279d	Chicken à la King in editions fix	2021-08-02 11:03:50 +01:00
Alumi	6d72415556	Merge branch 'renderer_minor_fix' into 'master' ... Minor fix of size calculation for rendering split cards See merge request core-developers/forge!5164	2021-08-02 09:53:37 +00:00
Lyu Zong-Hong	f824c33a85	Minor fix of size calculation for rendering split cards	2021-08-02 18:51:27 +09:00
Michael Kamensky	ddf8eeb5c9	Merge branch 'art_crop' into 'master' ... Support art crop in Card Image Renderer See merge request core-developers/forge!5150	2021-08-02 08:21:25 +00:00
Alumi	2c9b3f648d	Support art crop in Card Image Renderer	2021-08-02 08:21:23 +00:00
Michael Kamensky	d5388b8831	Merge branch 'fix_token_crash' into 'master' ... Fix token related crash See merge request core-developers/forge!5162	2021-08-02 07:00:05 +00:00
leriomaggio	0e5611cfea	Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring	2021-08-02 07:49:18 +01:00
Bug Hunter	a3a6bd20a5	Merge branch 'TRT-master-patch-94208' into 'master' ... Update forge-gui/res/cardsfolder/h/hazorets_monument.txt See merge request core-developers/forge!5163	2021-08-02 06:37:04 +00:00
Bug Hunter	90ffdcba11	Update forge-gui/res/cardsfolder/h/hazorets_monument.txt	2021-08-02 06:36:38 +00:00
Lyu Zong-Hong	1cd8255ab6	Fix token related crash	2021-08-02 14:29:53 +09:00
Michael Kamensky	ab869853ac	Merge branch 'j21_31' into 'master' ... Fixing/adding some goofy Skeletons See merge request core-developers/forge!5154	2021-08-02 04:00:09 +00:00
Northmoc	8bdf7fe388	fix typo in AI hint	2021-08-01 20:58:27 -04:00
Bug Hunter	e71c05a985	Merge branch 'TRT-master-patch-35684' into 'master' ... Update forge-gui/res/cardsfolder/e/exploding_borders.txt See merge request core-developers/forge!5161	2021-08-01 17:20:37 +00:00
Bug Hunter	416f877100	Update forge-gui/res/cardsfolder/e/exploding_borders.txt	2021-08-01 17:20:01 +00:00
Michael Kamensky	e74e89b737	Merge branch 'manalki' into 'master' ... ManaSpent: check source at time it produced See merge request core-developers/forge!5158	2021-08-01 16:58:22 +00:00
Bug Hunter	2ded193dda	Merge branch 'TRT-master-patch-11670' into 'master' ... Update forge-gui/res/cardsfolder/p/peregrination.txt See merge request core-developers/forge!5160	2021-08-01 15:48:16 +00:00
Bug Hunter	6a4c35272b	Update forge-gui/res/cardsfolder/p/peregrination.txt	2021-08-01 15:47:58 +00:00
tool4EvEr	45ca346703	ManaSpent: check source at time it produced	2021-08-01 16:42:30 +02:00
Bug Hunter	0f431a21a6	Merge branch 'aifix' into 'master' ... AI: Fix MDFC check See merge request core-developers/forge!5159	2021-08-01 14:40:55 +00:00
tool4EvEr	1639a07e07	AI: Fix MDFC check	2021-08-01 16:41:04 +02:00
Anthony Calosa	8bd1222b90	Merge branch 'restart' into 'master' ... RestartGameEffect: Fully clean Blessing & Monarch See merge request core-developers/forge!5157	2021-08-01 07:36:01 +00:00
tool4EvEr	75f674cfca	Fix target	2021-08-01 09:13:55 +02:00
tool4EvEr	c2e4b8fab0	Fully clean Blessing & Monarch	2021-08-01 09:09:35 +02:00
Bug Hunter	7a615c3a7c	Merge branch 'fixnpe' into 'master' ... Fix NPE See merge request core-developers/forge!5156	2021-08-01 06:53:21 +00:00
tool4EvEr	0114d8c9db	Fix NPE	2021-08-01 08:53:07 +02:00
Michael Kamensky	9f39857dad	Merge branch 'master' into 'master' ... Added puzzle PS_AFR01 See merge request core-developers/forge!5155	2021-08-01 05:06:51 +00:00
Michael Kamensky	32a6c7e001	- Added puzzle PS_AFR01.	2021-08-01 08:05:54 +03:00
Michael Kamensky	07d71143b6	Merge branch 'tramplePW' into 'master' ... Trample over PW as Variant of Trample See merge request core-developers/forge!5153	2021-08-01 04:53:54 +00:00
Michael Kamensky	2873fe6dd3	Merge branch 'legendary' into 'master' ... LegendaryRuleAi: Support SacMe See merge request core-developers/forge!5146	2021-08-01 03:42:51 +00:00
Bug Hunter	b7b647746e	LegendaryRuleAi: Support SacMe	2021-08-01 03:42:51 +00:00
Northmoc	426acedb76	flameskull.txt add Condition	2021-07-31 22:31:24 -04:00
Northmoc	72eb2b4409	boneyard_aberration.txt	2021-07-31 22:31:07 -04:00
Northmoc	1500729128	bone_rattler.txt add ImmediateTrigger	2021-07-31 22:30:50 -04:00
Sol	d53270514f	Merge branch 'npeguard' into 'master' ... Add NPE Guard See merge request core-developers/forge!5152	2021-08-01 02:13:14 +00:00
Hans Mackowiak	c7e6076f8b	Trample over PW as Variant of Trample	2021-08-01 01:40:26 +02:00
tool4EvEr	d6aa6ac4c1	Add NPE Guard	2021-07-31 20:26:59 +02:00
Michael Kamensky	fd03367ac4	Merge branch 'crashfix' into 'master' ... Fix crash with The Monarch See merge request core-developers/forge!5151	2021-07-31 17:49:27 +00:00
tool4EvEr	168cc31955	Fix crash with The Monarch	2021-07-31 19:21:45 +02:00
Michael Kamensky	cb7d8e572c	Merge branch 'fix' into 'master' ... fix vengeful_ancestor.txt second trigger See merge request core-developers/forge!5149	2021-07-31 15:04:13 +00:00