51595 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
paul_snoops	789af729b2	Merge branch 'master' of https://git.cardforge.org/core-developers/forge into small_fix ... Conflicts: forge-gui/res/editions/Dungeons & Dragons Adventures in the Forgotten Realms Commander.txt	2021-07-18 13:29:57 +01:00
Alumi	95d459d0e6	Merge branch 'update_oracle_book' into 'master' ... Update oracle text of The Book of Vile Darkness See merge request core-developers/forge!5056	2021-07-18 12:14:57 +00:00
Lyu Zong-Hong	44f518db90	Update oracle text of The Book of Vile Darkness	2021-07-18 21:13:59 +09:00
Michael Kamensky	259a84561d	Merge branch 'update_the_book_of_vile_darkness' into 'master' ... Update The Book of Vile Darkness See merge request core-developers/forge!5054	2021-07-18 11:35:55 +00:00
Michael Kamensky	0d7fb25471	Merge branch 'afc_16' into 'master' ... AFC - 16 Jul See merge request core-developers/forge!5042	2021-07-18 11:35:24 +00:00
paul_snoops	a26fef98eb	AFC edition tokens fixes	2021-07-18 12:16:04 +01:00
Lyu Zong-Hong	c0fc97e81f	Update The Book of Vile Darkness	2021-07-18 19:14:04 +09:00
Alumi	b29f744b45	Merge branch 'effectEmblem' into 'master' ... Effect Emblem See merge request core-developers/forge!5052	2021-07-18 09:06:49 +00:00
Hans Mackowiak	e753d45b42	Update getDefinedCards for how it get Valid* cards so the syntax is consistent with other Valid script. Also remove the hacky way to set Effect as mutable for Raging River and Plague of Vermin	2021-07-18 09:06:47 +00:00
Michael Kamensky	52160c9e60	Merge branch 'AFC_cards' into 'master' ... AFC card scripts 17 Jul See merge request core-developers/forge!5048	2021-07-18 05:33:09 +00:00
Michael Kamensky	71ff068101	Merge branch 'patch_hofri_delina' into 'master' ... Update Hofri and Delina to be conformant with oracle text See merge request core-developers/forge!5053	2021-07-18 05:32:06 +00:00
Wendell Wilkerson	13214a04a5	a couple more	2021-07-18 00:29:57 -05:00
Lyu Zong-Hong	9c7704c6bd	Update Hofri and Delina to be conformant with oracle text	2021-07-18 13:28:47 +09:00
Wendell Wilkerson	ca7b05c472	next batch of AFC cards	2021-07-17 22:46:06 -05:00
Sol	f5aee89476	Update planar_ally.txt	2021-07-18 03:25:16 +00:00
paul_snoops	7180295a1f	AFC card scripts 17 Jul	2021-07-17 22:37:14 +01:00
Michael Kamensky	0b3def285a	Merge branch 'afc_roll_dice_part2' into 'master' ... Add more AFC Roll Dice cards See merge request core-developers/forge!5047	2021-07-17 18:27:11 +00:00
Michael Kamensky	6b3ab5edf9	Merge branch 'master' into 'master' ... Added puzzle PS_MH21. See merge request core-developers/forge!5050	2021-07-17 18:24:10 +00:00
Michael Kamensky	4dda484173	- Added puzzle PS_MH21.	2021-07-17 21:23:09 +03:00
paul_snoops	20387ffce0	AFC card scripts 17 Jul	2021-07-17 15:22:31 +01:00
Northmoc	3665ca5c2b	fix typo	2021-07-17 09:48:50 -04:00
paul_snoops	eb8ac6336a	AFC card scripts 17 Jul	2021-07-17 11:04:24 +01:00
Lyu Zong-Hong	d3487231f5	Add more AFC Roll Dice cards	2021-07-17 18:09:15 +09:00
Michael Kamensky	6996a172e8	Merge branch 'emergency' into 'master' ... emergency_powers.txt remove unneeded See merge request core-developers/forge!5046	2021-07-17 03:30:28 +00:00
Michael Kamensky	f05ede87fc	Merge branch 'mutate_was_cast' into 'master' ... Handle mutate and wasCast interaction See merge request core-developers/forge!5044	2021-07-17 03:29:13 +00:00
Alumi	f14de1c2c1	Handle mutate and wasCast interaction	2021-07-17 03:29:13 +00:00
Michael Kamensky	0188463b7e	Merge branch 'negative' into 'master' ... Fix pumps from reveal See merge request core-developers/forge!5045	2021-07-17 03:28:48 +00:00
Northmoc	6e2dd8f267	catti_brie_of_mithral_hall.txt	2021-07-16 21:48:46 -04:00
Northmoc	6d8be55032	neverwinter_hydra.txt	2021-07-16 18:32:59 -04:00
Northmoc	5e7adf6383	emergency_powers.txt remove unneeded	2021-07-16 15:48:16 -04:00
tool4EvEr	d89bff8554	Fix pumps from reveal	2021-07-16 21:15:04 +02:00
Sol	cafdc40348	Update treasure_chest.txt	2021-07-16 18:21:10 +00:00
Michael Kamensky	bc4e9ef4ac	Merge branch 'AFC_Cards_20210715' into 'master' ... First batch of AFC cards 15 Jul 2021 See merge request core-developers/forge!5037	2021-07-16 18:02:12 +00:00
Northmoc	d6d66e782f	refactor Minn illusion token name	2021-07-16 13:57:33 -04:00
Northmoc	b5990e92db	u_1_1_illusion_other_illusions.txt token for Minn	2021-07-16 13:57:10 -04:00
Northmoc	33d969db8f	minn_wily_illusionist.txt	2021-07-16 13:56:34 -04:00
Northmoc	f4dcf10e41	wild_endeavor.txt	2021-07-16 10:33:27 -04:00
Northmoc	7599a24ed9	reckless_endeavor.txt	2021-07-16 10:32:54 -04:00
Wendell Wilkerson	83554b032f	Merge branch 'master' into AFC_Cards_20210715	2021-07-16 09:25:21 -05:00
Wendell Wilkerson	2b12d56f17	fixes from MR threads	2021-07-16 09:24:13 -05:00
Northmoc	77a73c04a4	correct for Source that is LKI (coming from ImmediateTrigger, etc)	2021-07-16 09:52:39 -04:00
Northmoc	26364aaf3f	ChooseCardEffect support for "ChoiceTitleAppendDefined"	2021-07-16 09:52:38 -04:00
Northmoc	80ae0484b8	nihiloor.txt	2021-07-16 09:52:38 -04:00
Michael Kamensky	ca65ff229f	Merge branch 'Williams-master-patch-20669' into 'master' ... Update Love Your LGS 2021.txt See merge request core-developers/forge!5040	2021-07-16 13:24:53 +00:00
Michael Kamensky	38298d4b60	Merge branch 'vish' into 'master' ... vish_kal_blood_arbiter.txt tidy up See merge request core-developers/forge!5043	2021-07-16 13:24:29 +00:00
Michael Kamensky	d6c180e0da	Merge branch 'fear' into 'master' ... Small fix for Crippling Fear See merge request core-developers/forge!5041	2021-07-16 13:24:15 +00:00
Northmoc	a54bb82c84	fey_steed.txt refine targeting	2021-07-16 08:38:31 -04:00
tool4EvEr	9a5fdce071	Small fix for Crippling Fear	2021-07-16 13:21:38 +02:00
Hans Mackowiak	da338f02c3	fix Xorn	2021-07-16 12:06:45 +02:00
Michael Kamensky	07a8f78c27	Merge branch 'tasha' into 'master' ... Tasha's Hideous Laughter: Fix infinite loop when lib empties See merge request core-developers/forge!5039	2021-07-16 09:51:23 +00:00