48012 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Kamensky	01f213edc0	Merge branch 'master' into 'master' ... Fix inverse logic in AnimateAi See merge request core-developers/forge!3911	2021-02-19 07:29:27 +00:00
Michael Kamensky	a1ea13ac5d	- Fix inverse logic in AnimateAi	2021-02-19 10:28:38 +03:00
Michael Kamensky	1aec4309c9	Merge branch 'master' into 'master' ... Don't miss mandatory activations from triggers in AttachAi See merge request core-developers/forge!3910	2021-02-19 06:56:04 +00:00
Michael Kamensky	b060c6da39	- Don't miss mandatory activations from triggers in AttachAi	2021-02-19 09:55:16 +03:00
Michael Kamensky	6b16bba61f	Merge branch 'master' into 'master' ... Better comment for the Proguard thing See merge request core-developers/forge!3909	2021-02-19 06:52:34 +00:00
Michael Kamensky	73bbb68597	- Better comment for the Proguard thing	2021-02-19 09:51:12 +03:00
Michael Kamensky	cf9aee9602	Merge branch 'master' into 'master' ... Revert an accidental commit. See merge request core-developers/forge!3908	2021-02-19 06:48:49 +00:00
Michael Kamensky	23f8bc40db	- Revert an accidental commit.	2021-02-19 09:48:16 +03:00
Anthony Calosa	860660c504	Merge branch 'master' into 'master' ... [Android] fix compiling error See merge request core-developers/forge!3907	2021-02-19 06:45:43 +00:00
Anthony Calosa	7bbc9ab1f8	[Android] fix compiling error	2021-02-19 14:44:36 +08:00
Michael Kamensky	39af8f656c	Merge branch 'unset-cards' into 'master' ... More unset scripts See merge request core-developers/forge!3890	2021-02-19 05:47:41 +00:00
Adam Pantel	0fe909a6f2	Some un-set and cmb1 scripts	2021-02-18 23:54:39 -05: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
Alumi	92d9bebc58	Add Japanese localization and fix split card view	2021-02-19 04:05:22 +00:00
Michael Kamensky	2f74fc51a1	Merge branch 'oracle' into 'master' ... Most recent Oracle changes See merge request core-developers/forge!3906	2021-02-19 04:04:12 +00:00
Michael Kamensky	501755f894	Merge branch 'fixtypo' into 'master' ... Timely Ward: fix flash targeting See merge request core-developers/forge!3905	2021-02-19 04:02:55 +00:00
Michael Kamensky	01da0e88d3	Merge branch 'fixAItrigger' into 'master' ... Fix AI mandatory trigger See merge request core-developers/forge!3904	2021-02-19 04:02:45 +00:00
Northmoc	53fa576d64	skinshifter.txt and CharmEffect.java support	2021-02-18 19:51:08 -05:00
Northmoc	8c144d788b	quicken.txt, savage_summoning.txt	2021-02-18 19:08:42 -05:00
Northmoc	2c51043ffc	jeska_thrice_reborn.txt	2021-02-18 18:57:39 -05:00
Northmoc	9d049fd3a4	idol_of_endurance.txt	2021-02-18 18:56:09 -05:00
Northmoc	623516cd51	grim_reminder.txt	2021-02-18 18:54:13 -05:00
Northmoc	727bc81ba8	drana_the_last_bloodchief.txt	2021-02-18 18:51:31 -05:00
Northmoc	38b9d4c3f6	chains_of_mephistopheles.txt	2021-02-18 18:49:32 -05:00
tool4EvEr	f5eddde781	Timely Ward: fix flash targeting	2021-02-18 22:06:34 +01:00
tool4EvEr	a67fe0326f	Fix AI mandatory trigger	2021-02-18 20:53:11 +01:00
Anthony Calosa	cbc72ef2e5	Merge branch 'master' into 'master' ... [Mobile] Add yield icon See merge request core-developers/forge!3903	2021-02-18 19:35:21 +00:00
Anthony Calosa	dcac880369	[Mobile] Add yield icon ... -compress some png to save space	2021-02-19 03:31:23 +08:00
Michael Kamensky	03b32998cd	Merge branch 'master' into 'master' ... Fix compile (clean up imports) See merge request core-developers/forge!3902	2021-02-18 19:11:58 +00:00
Michael Kamensky	65a25d6111	- Fix compile (clean up imports)	2021-02-18 22:11:24 +03:00
Michael Kamensky	995c5cf222	Merge branch 'card-fixes' into 'master' ... Missing References$ in Fiend Artisan See merge request core-developers/forge!3900	2021-02-18 19:05:53 +00:00
Anthony Calosa	e2d84ac01e	Merge branch 'master' into 'master' ... [Mobile] get preferred manaicons directly See merge request core-developers/forge!3901	2021-02-18 19:04:50 +00:00
Anthony Calosa	98803d920d	[Mobile] get preferred manaicons directly	2021-02-19 03:03:32 +08:00
Adam Pantel	3d073b144f	Missing References$ in Fiend Artisan	2021-02-18 12:50:05 -05:00
Anthony Calosa	b5e3292a1f	Merge branch 'master' into 'master' ... [Mobile] add icon for copy to clipboard See merge request core-developers/forge!3899	2021-02-18 16:54:44 +00:00
Anthony Calosa	a997d4a57e	[Mobile] add icon for copy to clipboard	2021-02-19 00:53:47 +08:00
Michael Kamensky	6ce143d3cb	Merge branch 'master' into 'master' ... Better CountersAi logic for keyword counters See merge request core-developers/forge!3897	2021-02-18 15:11:48 +00:00
Anthony Calosa	810badd323	Merge branch 'master' into 'master' ... [Mobile] standardize layout for deck editor See merge request core-developers/forge!3896	2021-02-18 15:11:29 +00:00
Michael Kamensky	0116ccdc1d	- Better CountersAi logic for keyword counters	2021-02-18 18:10:53 +03:00
Anthony Calosa	e37c4453d4	[Mobile] standardize layout for deck editor	2021-02-18 23:09:11 +08:00
Michael Kamensky	9df2c344ae	Merge branch 'Williams-master-patch-06579' into 'master' ... OGW Quest Zendikar See merge request core-developers/forge!3894	2021-02-18 14:33:51 +00:00
Michael Kamensky	4a7bfc4a96	Merge branch 'livioV2' into 'master' ... ChangeZoneEffect: add WithCountersType for non Battlefield See merge request core-developers/forge!3895	2021-02-18 14:32:39 +00:00
John	bb4eb98ebc	Update worlds.txt	2021-02-18 14:22:14 +00:00
Hans Mackowiak	38b584d431	ChangeZoneEffect: add WithCountersType for non Battlefield	2021-02-18 15:13:30 +01:00
John	af2c8965df	Update worlds.txt	2021-02-18 14:07:46 +00:00
Michael Kamensky	df61b15f8e	Merge branch 'fixLivio' into 'master' ... Livio, Oathsworn Sentinel: fix first ability by adding Chooser to known origin See merge request core-developers/forge!3886	2021-02-18 09:41:09 +00:00
Hans Mackowiak	a019d6ca5b	ComputerUtilMana: fix predict Mana, TapsForMana + Amount$ X	2021-02-18 07:59:56 +01:00
Michael Kamensky	7443cac601	Merge branch 'excess' into 'master' ... Fix excess damage calculation See merge request core-developers/forge!3883	2021-02-18 05:16:42 +00:00
Michael Kamensky	d47c1a55f8	Merge branch 'iguana' into 'master' ... Impatient Iguana See merge request core-developers/forge!3884	2021-02-18 05:16:06 +00:00
Michael Kamensky	195669fe77	Merge branch 'geometric' into 'master' ... Geometric Weird See merge request core-developers/forge!3879	2021-02-18 05:15:59 +00:00