Commit Graph

41274 Commits

Author SHA1 Message Date
austinio7116
bd23f13dbc More spoilers from forgescribe 2019-05-25 15:05:19 +01:00
austinio7116
7ce5f9a94c Remove unsupported Slice onto instant/sorcery for now 2019-05-25 15:01:18 +01:00
austinio7116
4306c16e57 Updated modern horizons edition file 2019-05-25 15:01:18 +01:00
austinio7116
36db4d8d14 Some of today's spoilers from forgescribe - untested 2019-05-25 15:01:18 +01:00
Michael Kamensky
ab982a7ebd Merge branch 'master' into 'master'
AnimateAllAi: implement an "Always" logic hook for cards that are beneficial to activate

Closes #1004

See merge request core-developers/forge!1708
2019-05-25 05:06:46 +00:00
Agetian
8caf66ecea - AnimateAllAi: implement an "Always" logic hook for cards that are generally beneficial to activate. 2019-05-25 08:05:03 +03:00
Michael Kamensky
6c6cdbe9d7 Merge branch 'master' into 'master'
Fix a logic error in RearrangeTopOfLibrary AI

Closes #1005

See merge request core-developers/forge!1707
2019-05-25 04:06:55 +00:00
Agetian
1c0f98e55a - Fix a logic error in RearrangeTopOfLibrary AI 2019-05-25 07:05:18 +03:00
Michael Kamensky
08b426b49c Merge branch 'master' into 'master'
Fix Ob Nixilis's Cruelty.

Closes #1003

See merge request core-developers/forge!1706
2019-05-25 04:01:12 +00:00
Agetian
9cd92946b0 - Fix Ob Nixilis's Cruelty. 2019-05-25 07:00:41 +03:00
austinio7116
13eb77fb78 Updated modern horizons edition file tokens 2019-05-24 22:59:30 +01:00
austinio7116
66eccbf287 Updated modern horizons edition file 2019-05-24 22:57:54 +01:00
austinio7116
84de707081 More spoilers from forgescribe 2019-05-24 22:51:52 +01:00
Michael Kamensky
ade5107200 Merge branch 'ai-clone-legendary' into 'master'
Make the AI consider the NonLegendary flag on AF Clone and AF CopyPermanent

Closes #999

See merge request core-developers/forge!1704
2019-05-24 16:00:49 +00:00
austinio7116
d34a216176 Remove unsupported Slice onto instant/sorcery for now 2019-05-24 16:56:36 +01:00
swordshine
c8f21c2c8a Merge branch 'patch' into 'master'
Update some scripts

See merge request core-developers/forge!1705
2019-05-24 03:52:42 +00:00
swordshine
e020fce608 Update some scripts 2019-05-24 11:52:20 +08:00
swordshine
ca8cb7c312 Merge branch 'patch-13' into 'master'
Umezawa's Charm

See merge request core-developers/forge!1703
2019-05-24 03:45:38 +00:00
swordshine
dccb60c541 Merge branch 'patch-12' into 'master'
Feaster of Fools

See merge request core-developers/forge!1701
2019-05-24 03:45:32 +00:00
swordshine
112ba12e6d Merge branch 'patch-11' into 'master'
Mother Bear

See merge request core-developers/forge!1700
2019-05-24 03:45:10 +00:00
swordshine
2e175c3adb Merge branch 'patch-9' into 'master'
Bazaar Trademage

See merge request core-developers/forge!1698
2019-05-24 03:44:16 +00:00
Agetian
86480dde6f - Make the AI consider the NonLegendary flag on AF Clone and AF CopyPermanent 2019-05-24 06:17:48 +03:00
Charles Baker
96fedcea5c Umezawa's Charm 2019-05-24 02:59:30 +00:00
Michael Kamensky
b31dce4a59 Merge branch 'master' into 'master'
Fix Liliana's Triumph (both the card and the AI)

See merge request core-developers/forge!1702
2019-05-24 02:46:33 +00:00
Agetian
2b04494256 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-24 05:45:24 +03:00
Charles Baker
dd7f3f008c Feaster of Fools 2019-05-24 02:45:13 +00:00
Agetian
4c98b135be - Fix Defined declaration on Liliana's Triumph (also takes care of the AI issues with it). 2019-05-24 05:44:00 +03:00
Charles Baker
fa711fb1e1 Mother Bear 2019-05-24 02:32:41 +00:00
swordshine
69be7a0f7a Merge branch 'patch-10' into 'master'
Mox Tantalite

See merge request core-developers/forge!1699
2019-05-24 02:29:57 +00:00
swordshine
6112f17339 Merge branch 'patch-8' into 'master'
Collected Conjuring

See merge request core-developers/forge!1697
2019-05-24 02:27:45 +00:00
Charles Baker
08706e17f4 Mox Tantalite 2019-05-24 02:25:10 +00:00
Charles Baker
4b0a80adaf Bazaar Trademage 2019-05-24 02:24:06 +00:00
Charles Baker
619bf7bd02 Update collected_conjuring.txt 2019-05-24 02:17:36 +00:00
Charles Baker
e31856994f Collected Conjuring 2019-05-24 02:03:47 +00:00
swordshine
d4ac3153ce Merge branch 'master' into 'master'
Moving hard-coded text to res files

See merge request core-developers/forge!1632
2019-05-24 00:35:11 +00:00
swordshine
fac735edc7 Merge branch 'urza-mh1' into 'master'
Added Urza, Lord High Artificer.

See merge request core-developers/forge!1696
2019-05-24 00:33:54 +00:00
Agetian
2daf92608c - AI logic support for Urza, Lord High Artificer.
- Minor fix.
2019-05-23 21:51:39 +03:00
Agetian
009909042b - Added Urza, Lord High Artificer. 2019-05-23 21:40:41 +03:00
austinio7116
1abc000deb Updated modern horizons edition file 2019-05-23 18:39:43 +01:00
austinio7116
4d84ee6beb Some of today's spoilers from forgescribe - untested 2019-05-23 18:33:18 +01:00
Churrufli
191488089e Update en-US.properties 2019-05-23 13:23:33 +00:00
swordshine
a099cb8916 Merge branch 'master' into 'master'
Update some scripts

See merge request core-developers/forge!1694
2019-05-23 06:06:49 +00:00
swordshine
8bd6b6393e Update some scripts 2019-05-23 14:06:33 +08:00
swordshine
bb75ce6030 Merge branch 'patch-5' into 'master'
Astral Drift

See merge request core-developers/forge!1689
2019-05-23 05:59:39 +00:00
swordshine
b7828a8a61 Merge branch 'mh1spoilers' into 'master'
Some of today's MH1 spoilers from forgescribe

See merge request core-developers/forge!1688
2019-05-23 05:59:22 +00:00
swordshine
aac5a857a1 Merge branch 'patch-7' into 'master'
Good-Fortune Unicorn

See merge request core-developers/forge!1691
2019-05-23 03:49:54 +00:00
Michael Kamensky
f838cc2b20 Merge branch 'master' into 'master'
Tweak and merge Indigo Dragon's card patch.

See merge request core-developers/forge!1693
2019-05-23 03:38:23 +00:00
Agetian
3de494d6ac - Fixed Ultimate on Jace, Arcane Strategist. 2019-05-23 06:37:35 +03:00
Agetian
210e9484a0 Merge branch 'patch-2' of git.cardforge.org:Indigo_Dragon/forge into agetian-master 2019-05-23 06:36:46 +03:00
Michael Kamensky
25d8d7c338 Merge branch 'master' into 'master'
Improve AI targeting logic for Transmogrifying Wand.

Closes #994

See merge request core-developers/forge!1692
2019-05-23 03:28:26 +00:00