46850 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Kamensky	bc867d5d37	Merge branch 'setStateLKI' into 'master' ... SetStateEffect: use getCardState to support LKI See merge request core-developers/forge!3558	2021-01-06 04:39:08 +00:00
Hans Mackowiak	b7db7bccfd	SetStateEffect: use getCardState to support LKI	2021-01-05 11:44:55 +01:00
Michael Kamensky	b154f22188	Merge branch 'forcastBoast' into 'master' ... Forecast boast See merge request core-developers/forge!3553	2021-01-05 05:54:12 +00:00
Hans Mackowiak	9e91a0ac09	Forecast boast	2021-01-05 05:54:12 +00:00
Michael Kamensky	ecdf29c1fa	Merge branch 'tawnosfix' into 'master' ... tawnoss_coffin.txt +Duration$ Permanent See merge request core-developers/forge!3557	2021-01-05 05:53:35 +00:00
Northmoc	e85b489ed9	sigrid_god_favored.txt (medusa)	2021-01-04 15:39:42 -05:00
Northmoc	66e542ded7	r_2_3_demon_berserker_menace.txt	2021-01-04 12:42:25 -05:00
Northmoc	a635aa7974	the_bloodsky_massacre.txt (medusa)	2021-01-04 12:39:36 -05:00
Northmoc	2f572eb2e1	toski_bearer_of_secrets.txt (The Cheese Stands Alone)	2021-01-04 12:35:26 -05:00
Northmoc	71124a397e	righteous_valkyrie.txt (Marvel)	2021-01-04 12:16:21 -05:00
Northmoc	79bb3d2638	tawnoss_coffin.txt +Duration$ Permanent	2021-01-04 12:03:48 -05:00
Anthony Calosa	0e537965db	Merge branch 'master' into 'master' ... Upscaled logo & splashscreen for mobile forge See merge request core-developers/forge!3555	2021-01-04 01:45:37 +00:00
Anthony Calosa	7ed634541d	[Mobile] Add upscaled logo & splashscreen	2021-01-04 09:41:22 +08:00
Anthony Calosa	aa15eaf007	Remove Unused Import	2021-01-04 09:38:35 +08:00
Anthony Calosa	1920bc0518	Merge branch 'master' into 'master' ... Fix It That Betrays Closes #1687 See merge request core-developers/forge!3554	2021-01-03 23:26:37 +00:00
Anthony Calosa	408ae43037	Merge remote-tracking branch 'core/master'	2021-01-04 07:25:17 +08:00
Anthony Calosa	606fc3088b	Fix It That Betrays ... closes #1687	2021-01-04 07:24:36 +08:00
Hans Mackowiak	357243f540	Merge branch 'ChooseCardAmount' into 'master' ... Extend ChooseCardEffect amount See merge request core-developers/forge!3551	2021-01-03 18:05:28 +00:00
Hans Mackowiak	e7f7bac7cb	Merge branch 'master' into 'master' ... Add Vow of Torment See merge request core-developers/forge!3552	2021-01-03 18:03:56 +00:00
Hythonia	e727f89eda	Vow of Torment	2021-01-03 16:29:49 +00:00
Michael Kamensky	fb8d096d8d	Merge branch 'patch-6' into 'master' ... Update de-DE.properties See merge request core-developers/forge!3550	2021-01-03 10:24:28 +00:00
tool4EvEr	1e747a96bd	Support for default placeholders	2021-01-03 00:50:01 +01:00
Andreas Bendel	b7e5ee168c	Update de-DE.properties ... translated lblAssignCombatDamageAsChoose	2021-01-02 21:27:43 +00:00
Michael Kamensky	ccb1a4e0b8	Merge branch 'aiSacToReduceCost' into 'master' ... AI: logic for X in Sac cost See merge request core-developers/forge!3540	2021-01-02 05:15:08 +00:00
Hans Mackowiak	7c9ac66e8a	AI: logic for X in Sac cost	2021-01-02 05:15:08 +00:00
Michael Kamensky	ad5569fda0	Merge branch 'artisan' into 'master' ... arcane_artisan.txt fix See merge request core-developers/forge!3549	2021-01-02 04:49:49 +00:00
Sol	b3cc7ed228	Merge branch 'spanishtranslation' into 'master' ... Update Spanish translations See merge request core-developers/forge!3545	2021-01-02 01:50:15 +00:00
Hans Mackowiak	4eff3eac31	DelayedTriggerEffect: fix controller of the trigger	2021-01-01 20:38:04 +01:00
Northmoc	130dae7653	arcane_artisan.txt fix	2021-01-01 13:05:09 -05:00
Michael Kamensky	6841f3c084	Merge branch 'triggerHandlerHostCleanup' into 'master' ... TriggerHandler: remove that host is reset from triggeredCard See merge request core-developers/forge!3547	2021-01-01 07:25:48 +00:00
Michael Kamensky	d51f1c1d5e	Merge branch 'tawnos' into 'master' ... Fix Tawnos's Coffin See merge request core-developers/forge!3546	2021-01-01 07:25:26 +00:00
Hans Mackowiak	560da26ac9	TriggerHandler: remove that host is reset from triggeredCard	2020-12-31 20:14:27 +01:00
Northmoc	c9537b3283	tawnoss_coffin.txt script mechanic updates	2020-12-30 18:59:12 -05:00
Northmoc	f36ff1e3a9	EffectEffect.java - add NoteCounterDefined$ param	2020-12-30 18:57:10 -05:00
Northmoc	a35dbfdb70	CountersNoteEffect.java - rollback the duct tape fix from last time	2020-12-30 18:50:06 -05:00
klaxnek	d572ac87af	Update spanish translations	2020-12-30 14:55:06 +01:00
klaxnek	a38790bda2	Merge remote-tracking branch 'core-developers/master'	2020-12-30 14:32:10 +01:00
Michael Kamensky	0f87709fdc	Merge branch 'khm22' into 'master' ... KHM - 22 Dec See merge request core-developers/forge!3529	2020-12-30 04:51:55 +00:00
Sol	c3b719741e	Merge branch 'ludevic' into 'master' ... Fix: ludevic_necro_alchemist.txt See merge request core-developers/forge!3544	2020-12-30 02:43:49 +00:00
Sol	dde956006c	Merge branch 'delaytrig_tokenmakers' into 'master' ... hazezon_tamar.txt and rukh_egg.txt fix Closes #1686 See merge request core-developers/forge!3543	2020-12-30 02:43:20 +00:00
Sol	76d9fbdb97	Merge branch 'fixException' into 'master' ... Fix Exception by closing Dialog See merge request core-developers/forge!3539	2020-12-30 02:39:32 +00:00
Sol	333aeb35dd	Merge branch 'panglacial' into 'master' ... Panglacial Wurm fix See merge request core-developers/forge!3004	2020-12-30 02:36:32 +00:00
Sol	a74106e621	Merge branch 'orgg' into 'master' ... Butcher Orgg!!! Closes #38 See merge request core-developers/forge!2636	2020-12-30 02:35:29 +00:00
Tim Mocny	f700b9d43b	Butcher Orgg!!!	2020-12-30 02:35:25 +00:00
Northmoc	ab2a16a707	ludevic_necro_alchemist.txt	2020-12-29 19:07:06 -05:00
Northmoc	fd106d789f	hazezon_tamar.txt and rukh_egg.txt fix	2020-12-29 17:29:12 -05:00
Northmoc	53bd5f9067	making Panglacial Wurm work	2020-12-29 16:24:42 -05:00
Northmoc	d043294efd	fire_giants_fury.txt	2020-12-29 16:22:22 -05:00
Northmoc	02a4f2b0a9	gilded_assault_cart.txt	2020-12-29 16:22:21 -05:00
Northmoc	d617b5ed7f	elven_ambush.txt	2020-12-29 16:22:21 -05:00