4900 Commits

Author	SHA1	Message	Date
Adam Pantel	b7bdbcfe72	Fix MayFlashSac	2021-02-28 17:21:46 -05:00
Hans Mackowiak	2280d02617	SpellAbilityRestriction: If the permanent wouldn’t have a morph cost if it were face up, it can’t be turned face up this way.	2021-02-27 11:53:35 +01:00
Hans Mackowiak	e02805e49d	Merge branch 'clonecrash' into 'master' ... CloneStates: fix crash when adding trigger with subs See merge request core-developers/forge!4027	2021-02-26 20:00:46 +00:00
Michael Kamensky	96723983c9	Merge branch 'compressKW' into 'master' ... Card text: only print reminder text once for some basic keywords See merge request core-developers/forge!4024	2021-02-26 19:42:42 +00:00
tool4EvEr	676a0b9b43	CloneStates: fix crash when adding trigger with subs	2021-02-26 20:07:37 +01:00
Hans Mackowiak	87e6974f3f	fix broken fix	2021-02-26 18:39:14 +01:00
tool4EvEr	7bb267818a	Card text: only print reminder text once for some basic keywords	2021-02-26 18:17:44 +01:00
Hans Mackowiak	a84af140f2	fix imports	2021-02-26 18:00:57 +01:00
Michael Kamensky	cebce36055	Merge branch 'svarsOriginalCardState' into 'master' ... CardTraitBase: store the CardState where it was generated from Closes #1738 See merge request core-developers/forge!4019	2021-02-26 15:02:19 +00:00
Hans Mackowiak	2adffd0002	CardTraitBase: store the CardState where it was generated from	2021-02-26 15:02:19 +00:00
Bug Hunter	ad218ee1f0	Fix sacrifice cost with blockedBy target	2021-02-26 15:01:46 +00:00
Michael Kamensky	6014e35c19	Merge branch 'border' into 'master' ... Unset: border color matters See merge request core-developers/forge!4016	2021-02-26 04:06:58 +00:00
friarsol	0cf4b5a261	Fix ante	2021-02-25 20:38:27 -05:00
Adam Pantel	137e31b724	Unset: border color matters	2021-02-25 17:45:11 -05:00
Hans Mackowiak	8ccbffce48	CardProperty: make sharesCreatureTypeWith use DefinedCard	2021-02-25 17:09:35 +01:00
Hans Mackowiak	96532309ce	CardProperty: hasXCost, it should check ManaCost	2021-02-25 17:09:35 +01:00
Michael Kamensky	848635d8e0	Merge branch 'ingame_translation' into 'master' ... Better in-game localization/translation of oracle texts See merge request core-developers/forge!4007	2021-02-25 13:34:35 +00:00
Lyu Zong-Hong	aa1da0c652	Implement better in-game localization/translation	2021-02-25 21:34:52 +09:00
Hans Mackowiak	ba70477ad7	SpellAbility: remove getTriggeringAbility, it is always root	2021-02-25 10:50:19 +01:00
Hans Mackowiak	e428e66623	WrappedAbility: fixed StackDescription	2021-02-25 10:17:20 +01:00
Hans Mackowiak	b99de32027	SpellAbility: fix isTrigger	2021-02-25 09:54:39 +01:00
Michael Kamensky	16402aed09	Merge branch 'facedownfix' into 'master' ... Improve ForetoldByEffect StackDescription See merge request core-developers/forge!3996	2021-02-24 04:10:08 +00:00
tool4EvEr	32908d9bb6	Improve ForetoldByEffect StackDescription	2021-02-23 21:09:49 +01:00
Michael Kamensky	91d27373fe	Merge branch 'cascadefix' into 'master' ... Cascade: update keyword with new text See merge request core-developers/forge!3994	2021-02-23 19:28:02 +00:00
Bug Hunter	a9e3fd867e	Fix Creature dying due to removed counter cost triggering with old LKI	2021-02-23 17:39:08 +00:00
tool4EvEr	d0a23e96c5	Update cascade	2021-02-23 18:35:35 +01:00
Michael Kamensky	a4a3c416f0	Merge branch 'wrath-of-sod' into 'master' ... Wrath of Sod See merge request core-developers/forge!3983	2021-02-23 15:27:07 +00:00
Michael Kamensky	9841807e54	Merge branch 'unset-cards' into 'master' ... More unset cards See merge request core-developers/forge!3923	2021-02-23 11:26:16 +00:00
Adam Pantel	f81fce528c	CMB1 card scripts	2021-02-23 00:49:41 -05:00
Adam Pantel	25e50e9e07	Wrath of Sod	2021-02-22 23:17:12 -05:00
Lyu Zong-Hong	1567fa2f55	Small update to use getPossessedObject() if feasible	2021-02-23 11:46:23 +09:00
tool4EvEr	be26e86737	Fix isKicked	2021-02-22 20:00:48 +01:00
Michael Kamensky	1adc30840f	Merge branch 'tibalt' into 'master' ... Tibalt the Chaotic See merge request core-developers/forge!3960	2021-02-22 14:53:48 +00:00
Lyu Zong-Hong	e1f68bd06c	Update Lang.java so it can support other languages. ... Also translated phase/step names	2021-02-22 19:55:05 +09:00
Adam Pantel	670f8077e9	Tibalt the Chaotic	2021-02-21 14:15:29 -05:00
Hans Mackowiak	0f993d9742	Fix Saga Counters Vs Vorinclex	2021-02-21 16:50:43 +01:00
Michael Kamensky	9b19221b52	- Fix the Planeswalker commander mode	2021-02-20 21:41:31 +03:00
Michael Kamensky	4748a327b7	Merge branch 'topsy' into 'master' ... Topsy Turvy See merge request core-developers/forge!3933	2021-02-20 15:56:28 +00:00
Michael Kamensky	4b6554bf99	Merge branch 'bob' into 'master' ... Bevy of Beebles See merge request core-developers/forge!3934	2021-02-20 15:56:24 +00:00
Michael Kamensky	039504a04e	Merge branch 'fixReplacement' into 'master' ... Merged Commander: Make sure to find right replacement if partner used See merge request core-developers/forge!3945	2021-02-20 15:55:09 +00:00
Lyu Zong-Hong	0a905c77cf	Add Brokkos, Apex of Forever	2021-02-20 22:38:03 +09:00
tool4EvEr	a94278398f	Merged Commander: Make sure to find right replacement if partner used	2021-02-20 13:10:30 +01:00
Adam Pantel	97486d594e	Bevy of Beebles	2021-02-19 23:49:54 -05:00
Michael Kamensky	415faa9a04	Merge branch 'manaEffect' into 'master' ... ExpressPay different ComboMana if possible See merge request core-developers/forge!3893	2021-02-20 04:22:03 +00:00
Bug Hunter	df0d651101	ExpressPay different ComboMana if possible	2021-02-20 04:22:02 +00:00
Adam Pantel	ca09c46d27	Topsy Turvy	2021-02-19 19:10:25 -05:00
Hans Mackowiak	b43d586a22	Merge branch 'fixTypeCount' into 'master' ... Fix MostProminentCreatureType Count See merge request core-developers/forge!3921	2021-02-19 17:46:01 +00:00
tool4EvEr	f777d5e0aa	Fix MostProminentCreatureType Count	2021-02-19 18:00:40 +01:00
Michael Kamensky	a4ffd811b1	- Contract some counter names to fit on the card.	2021-02-19 19:09:58 +03:00
Michael Kamensky	46d0ec4f94	Merge branch 'localization_japanese' into 'master' ... Add Japanese localization and fix split card view See merge request core-developers/forge!3892	2021-02-19 04:05:22 +00:00