55469 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Kamensky	3e55983ee3	Merge branch 'blocking' into 'master' ... Improve detection of blocking requirements See merge request core-developers/forge!6039	2022-01-14 04:43:13 +00:00
Bug Hunter	84a9972034	Improve detection of blocking requirements	2022-01-14 04:43:13 +00:00
Hans Mackowiak	37e8c41b7e	Merge branch 'volrath' into 'master' ... Fix Mirage Mirror copying Shifting Sky turning all colorless See merge request core-developers/forge!6042	2022-01-13 08:56:58 +00:00
TRT	387e14ff0b	Fix Mirage Mirror copying Shifting Sky turning all colorless	2022-01-13 09:35:20 +01:00
Michael Kamensky	3e4faa7760	Merge branch 'mana' into 'master' ... Fix generating Chosen mana when no choice was made See merge request core-developers/forge!6040	2022-01-13 04:27:48 +00:00
tool4EvEr	7e5061eae9	Fix generating Chosen mana when no choice was made	2022-01-12 22:49:07 +01:00
Michael Kamensky	0fc621eb4d	Merge branch 'guifix' into 'master' ... Fix crash when assigning damage to defender See merge request core-developers/forge!6038	2022-01-12 19:24:09 +00:00
Michael Kamensky	bd76214bf6	Merge branch 'van_maa' into 'master' ... Vanguard: Maelstrom Archangel Avatar See merge request core-developers/forge!6033	2022-01-12 19:23:59 +00:00
TRT	94f54f8e71	Fix crash when assigning damage to defender	2022-01-12 13:57:50 +01:00
Michael Kamensky	e3593ad8ac	Merge branch 'attack' into 'master' ... Fix War's Toll + Dueling Grounds See merge request core-developers/forge!6036	2022-01-12 05:05:25 +00:00
Bug Hunter	151742f4fd	Fix War's Toll + Dueling Grounds	2022-01-12 05:05:24 +00:00
Northmoc	ae58554d16	make existing "doesNotShareNameWith " more flexible	2022-01-11 13:14:47 -05:00
Northmoc	75a35a3236	light_paws_emperors_voice.txt use existing param	2022-01-11 13:13:23 -05:00
Michael Kamensky	bc85d9fcbe	Merge branch 'melee' into 'master' ... Fix Melee See merge request core-developers/forge!6034	2022-01-11 16:21:06 +00:00
Bug Hunter	de938dd3e7	Fix Melee	2022-01-11 16:21:03 +00:00
Northmoc	89fbf0bdf8	CardProperty support "DifferentName_"	2022-01-11 10:50:52 -05:00
Northmoc	d142af2f42	light_paws_emperors_voice.txt	2022-01-11 10:50:28 -05:00
Michael Kamensky	3e341b8903	Merge branch 'unf_kc' into 'master' ... UNF: Killer Cosplay See merge request core-developers/forge!6021	2022-01-11 04:42:39 +00:00
Northmoc	899b20cd48	RevealEffect - support RevealToAll for when targetplayer should also see stuff	2022-01-10 16:30:58 -05:00
Northmoc	d4a51dad4b	RevealEffect - support RevealAll for when cards are not in hand	2022-01-10 16:28:45 -05:00
Northmoc	ea79b3346b	PlayerControllerHuman: allow custom Reveal messages	2022-01-10 16:26:32 -05:00
Northmoc	f3f6ebcc75	maelstrom_archangel_avatar.txt improve Reveal and Choose	2022-01-10 16:25:15 -05:00
Northmoc	343bf1e4d9	ChooseCardNameEffect support AtRandom with ValidCards and ManaCost=Imprinted	2022-01-10 00:22:43 -05:00
Northmoc	487cd79522	PlayEffect add "ZoneRegardless" override param	2022-01-10 00:21:14 -05:00
Northmoc	3e8c30e6a7	PumpEffect - support ClearNotedCardsFor param	2022-01-10 00:20:47 -05:00
Northmoc	94d58fa131	Player - add clearNotesForName function	2022-01-10 00:20:03 -05:00
Northmoc	2afa7ce661	MakeCardEffect - allow made cards to be tokens	2022-01-10 00:18:32 -05:00
Northmoc	20ae37ad78	maelstrom_archangel_avatar.txt	2022-01-10 00:17:49 -05:00
Hans Mackowiak	9c028e65d6	Merge branch 'TRT-master-patch-34800' into 'master' ... Update forge-gui/res/cardsfolder/n/null_champion.txt Closes #2063 See merge request core-developers/forge!6032	2022-01-10 04:58:46 +00:00
Northmoc	eb8fa774ea	killer_cosplay.txt cmcEQ -> ManaCost=	2022-01-09 19:48:42 -05:00
Northmoc	fc81f7e7d7	ChooseCardNameEffect: cmcEQ -> ManaCost	2022-01-09 19:47:53 -05:00
Northmoc	28aebca071	CardFacePredicates: cmcEQ -> ManaCost	2022-01-09 19:46:59 -05:00
Bug Hunter	2a307595f8	Update forge-gui/res/cardsfolder/n/null_champion.txt	2022-01-09 21:00:25 +00:00
Michael Kamensky	f40045b8ef	Merge branch 'pramikon' into 'master' ... Fix Pramikon applying when no direction was chosen See merge request core-developers/forge!6031	2022-01-09 13:42:55 +00:00
Anthony Calosa	8b0feb12f2	Merge branch 'master' into 'master' ... Disable missingcards cache for desktop See merge request core-developers/forge!6030	2022-01-09 11:58:58 +00:00
tool4EvEr	095b4f4657	Fix Pramikon applying when no direction was chosen	2022-01-09 12:42:31 +01:00
Anthony Calosa	f70f7c6e9c	Merge remote-tracking branch 'core/master'	2022-01-09 19:39:48 +08:00
Michael Kamensky	70859ac8a8	Merge branch 'staticfix' into 'master' ... Fix Statics adding statics See merge request core-developers/forge!6029	2022-01-09 11:30:01 +00:00
Anthony Calosa	c5a143e0e2	Merge remote-tracking branch 'core/master'	2022-01-09 19:22:18 +08:00
Anthony Calosa	4629b7e2fe	Merge remote-tracking branch 'core/master'	2022-01-09 19:16:52 +08:00
Michael Kamensky	734a72e438	Merge branch 'master' into 'master' ... Net Decks Archive Updates See merge request core-developers/forge!6028	2022-01-09 11:16:33 +00:00
Anthony Calosa	1a57684a44	Disable missingcards cache for desktop ... - for compatibility with autodownloader	2022-01-09 19:06:26 +08:00
tool4EvEr	9b67d0e58e	Fix Statics adding statics	2022-01-09 11:18:32 +01:00
Churrufli	c67f8454b7	Net Decks Archive Updates	2022-01-09 08:46:03 +01:00
Michael Kamensky	5cb1c91b85	Merge branch 'butcher' into 'master' ... Butcher Orgg also works when blocking See merge request core-developers/forge!6026	2022-01-09 05:14:49 +00:00
Hans Mackowiak	9ffd9c4734	Merge branch 'cardpatch' into 'master' ... Fix keyword capitalization Closes #2062 See merge request core-developers/forge!6027	2022-01-08 21:17:40 +00:00
tool4EvEr	fa03035315	Fix keyword capitalization	2022-01-08 21:10:43 +01:00
tool4EvEr	07f6d5f1ed	Butcher Orgg also works when blocking	2022-01-08 17:57:36 +01:00
Bug Hunter	c0fe556595	Merge branch 'imports' into 'master' ... Fix imports See merge request core-developers/forge!6025	2022-01-08 11:14:26 +00:00
tool4EvEr	5e0c27c8e0	Fix imports	2022-01-08 12:13:44 +01:00