6273 Commits

Author	SHA1	Message	Date
Michael Kamensky	933b147eb4	Merge branch 'clb_abd' into 'master' ... CLB: Ancient Brass Dragon & support See merge request core-developers/forge!6440	2022-03-25 10:40:04 +00:00
Tim Mocny	ae8d4c38c4	CLB: Ancient Brass Dragon & support	2022-03-25 10:40:04 +00:00
TRT	f7d38a7f75	Fix bad refactor	2022-03-25 08:16:28 +01:00
Anthony Calosa	47fe7d4df1	Merge branch 'combatfix' into 'master' ... AttackRequirement: don't filter out attackers with costs too early Closes #2118 See merge request core-developers/forge!6434	2022-03-25 04:42:22 +00:00
Bug Hunter	0a2982ad26	assignAttackersDamage fixes	2022-03-25 04:40:17 +00:00
Michael Kamensky	8a5a39e6c1	Merge branch 'yneo_inch' into 'master' ... YNEO: Inchblade Companion and support See merge request core-developers/forge!6423	2022-03-24 13:38:42 +00:00
Tim Mocny	e3a14343f8	YNEO: Inchblade Companion and support	2022-03-24 13:38:42 +00:00
TRT	6029d1b505	AttackRequirement: don't filter out attackers with costs too early ... They will be checked with collectLegalAttackers before payment would happen anyway	2022-03-24 13:48:39 +01:00
tool4EvEr	5ae86d51f0	Use timestamps	2022-03-23 23:00:45 +01:00
tool4EvEr	6b257fb9fb	MustBlockEffect: fix missing duration	2022-03-23 21:57:27 +01:00
Michael Kamensky	e174973c99	Merge branch 'yneo_jl' into 'master' ... YNEO: Jukai Liberator and support See merge request core-developers/forge!6428	2022-03-23 03:36:10 +00:00
Tim Mocny	9c57904223	YNEO: Jukai Liberator and support	2022-03-23 03:36:09 +00:00
Tim Mocny	787dd561e9	YNEO: Futurist Spellthief and support	2022-03-23 03:36:05 +00:00
TRT	dba5f33ef2	Don't count same creature twice	2022-03-22 12:38:37 +01:00
TRT	2870055f35	Clean up	2022-03-22 11:13:06 +01:00
TRT	575918aed2	reatureAttackedThisTurn: switch to List	2022-03-22 09:44:10 +01:00
Michael Kamensky	6cd8b614a9	Merge branch 'LKIfix' into 'master' ... creatureAttackedThisTurn: switch to LKI See merge request core-developers/forge!6422	2022-03-22 05:43:54 +00:00
tool4EvEr	684175aa96	Clean up	2022-03-21 20:12:39 +01:00
tool4EvEr	4e8effe8d5	creatureAttackedThisTurn: switch to LKI	2022-03-21 20:08:14 +01:00
Michael Kamensky	0586fa6842	Merge branch 'impact' into 'master' ... YNEO: Molten Impact and support See merge request core-developers/forge!6416	2022-03-21 17:36:34 +00:00
Tim Mocny	eaaea4a2b3	YNEO: Molten Impact and support	2022-03-21 17:36:33 +00:00
Hans Mackowiak	583718c2eb	Merge branch 'sentryUpgrade' into 'master' ... Sentry upgrade See merge request core-developers/forge!5944	2022-03-21 05:11:36 +00:00
Hans Mackowiak	c8e5a02487	Sentry upgrade	2022-03-21 05:11:36 +00:00
Michael Kamensky	968ab925e7	Merge branch 'simfix' into 'master' ... Simulation: fix wrong ActivatingPlayer See merge request core-developers/forge!6420	2022-03-21 03:49:17 +00:00
tool4EvEr	b544ae0c9f	Simulation: fix wrong ActivatingPlayer	2022-03-20 20:25:58 +01:00
Michael Kamensky	678d0a0f85	Merge branch 'y22_kamigawa_18_march' into 'master' ... Alchemy: Kamigawa - 19 March See merge request core-developers/forge!6418	2022-03-20 07:38:39 +00:00
paul_snoops	15fae9232c	DefinedName fix	2022-03-19 18:17:57 +00:00
Michael Kamensky	40bbdab3fe	Merge branch '2117-skipphase-needs-better-duration-for-their-next-turn' into 'master' ... Resolve "SkipPhase needs better Duration$ for "their next turn"" Closes #2117 See merge request core-developers/forge!6414	2022-03-19 08:51:34 +00:00
Bug Hunter	ceff5b3e06	Resolve "SkipPhase needs better Duration$ for "their next turn""	2022-03-19 08:51:33 +00:00
Michael Kamensky	3551d27a86	Merge branch 'addturn' into 'master' ... AddTurnAi: wouldExtraTurnBeSkipped See merge request core-developers/forge!6415	2022-03-19 08:51:19 +00:00
tool4EvEr	0ea211567f	AddTurnAi: wouldExtraTurnBeSkipped	2022-03-18 20:49:00 +01:00
TRT	443fa2e761	Fix CostContainsC	2022-03-18 19:01:53 +01:00
TRT	faefab9395	Finish RestrictValid check early if cost is for effect	2022-03-18 19:01:52 +01:00
Michael Kamensky	b317e46353	Merge branch 'NPEfix' into 'master' ... Fix some payment NPE See merge request core-developers/forge!6412	2022-03-18 17:53:53 +00:00
tool4EvEr	0d009ad982	Fix NPE if PW gets removed	2022-03-18 18:34:08 +01:00
TRT	469ada0e4c	Fix some payment NPE	2022-03-18 11:55:21 +01:00
Tim Mocny	a280a46ffd	Y22/J21: Implement Intensity mechanic	2022-03-18 10:43:06 +00:00
TRT	8937d5a97d	fix RestartGame corner case + AI NPE from card changes	2022-03-17 14:13:11 +01:00
Michael Kamensky	6027d060ea	Merge branch 'chosd' into 'master' ... More changeHiddenOriginStackDescription tweaks See merge request core-developers/forge!6407	2022-03-17 08:20:25 +00:00
Tim Mocny	661a1ff43a	More changeHiddenOriginStackDescription tweaks	2022-03-17 08:20:24 +00:00
Bug Hunter	b668e1e618	Improve notNeededAsBlockers	2022-03-17 08:18:51 +00:00
Tim Mocny	bdb43026fb	ChangeZoneEffect changeHiddenOriginStackDescription tweaks	2022-03-16 15:00:09 +00:00
Michael Kamensky	76c07a9963	Merge branch '1111-dismantle-rework' into 'master' ... Resolve "Dismantle Rework" Closes #2092 and #1111 See merge request core-developers/forge!6354	2022-03-14 13:32:50 +00:00
Anthony Calosa	ffafa3ebf1	update GameEventCardRegenerated	2022-03-13 19:37:04 +08:00
Hans Mackowiak	b648c61e61	Merge branch 'diggig' into 'master' ... DigEffects: do tapped before changeZone See merge request core-developers/forge!6387	2022-03-13 09:09:18 +00:00
Bug Hunter	8bace43d05	DigEffects: do tapped before changeZone	2022-03-13 09:09:15 +00:00
Michael Kamensky	bee2705cc5	Merge branch 'grenzo' into 'master' ... changeHiddenOriginResolve: Fix default fallback Closes #2114 See merge request core-developers/forge!6391	2022-03-13 04:25:58 +00:00
Bug Hunter	06d58604d6	changeHiddenOriginResolve: Fix default fallback	2022-03-13 04:25:53 +00:00
Michael Kamensky	6e5df41780	Merge branch 'master' into 'master' ... Added NEO/NEC achievements by Marek14. See merge request core-developers/forge!6393	2022-03-12 19:01:07 +00:00
tool4EvEr	bd888f9382	ETB replacement fix	2022-03-10 17:58:01 +01:00