Commit Graph

42170 Commits

Author SHA1 Message Date
Michael Kamensky
1709d0825c Improve AI considerations for attacking in presence of Exalted 2019-06-06 19:20:03 +00:00
apantel
b7217e1f20 Fix Winds of Abandon 2019-06-06 14:58:24 -04:00
Michael Kamensky
7d2300aa11 Merge branch 'fix-combo-anydifferent' into 'master'
Fix Combo mana with AnyDifferent allowing to produce two mana of the same color.

Closes #1034

See merge request core-developers/forge!1791
2019-06-06 17:49:54 +00:00
Michael Kamensky
854fb12729 Fix Combo mana with AnyDifferent allowing to produce two mana of the same color. 2019-06-06 17:49:54 +00:00
Michael Kamensky
4f49e0acde Merge branch 'master' into 'master'
Fix AI for Epiphany at the Drownyard.

Closes #1038

See merge request core-developers/forge!1794
2019-06-06 14:17:38 +00:00
Agetian
5ee562333a - Fix AI for Epiphany at the Drownyard. 2019-06-06 17:16:27 +03:00
Michael Kamensky
314ddefff1 Merge branch 'targetSameCreatureType' into 'master'
Target: TargetsWithSameCreatureType

See merge request core-developers/forge!1793
2019-06-06 12:27:49 +00:00
Hans Mackowiak
9848775d70 Target: TargetsWithSameCreatureType 2019-06-06 12:27:49 +00:00
Michael Kamensky
9233f778c5 Merge branch 'mhspoilers2' into 'master'
Switched MH1 to use WAR basic lands for limited formats as there are no (non...

See merge request core-developers/forge!1792
2019-06-06 05:57:13 +00:00
austinio7116
f9ffb0e1df Switched MH1 to use WAR basic lands for limited formats as there are no (non snow) basic lands in MH1 2019-06-06 06:29:56 +01:00
Michael Kamensky
795472d82b Merge branch 'patch-31' into 'master'
Giver of Runes

See merge request core-developers/forge!1773
2019-06-06 03:49:23 +00:00
Charles Baker
f1e5d0ac5c Merge branch 'protectionColorless' into 'patch-31'
Protection colorless

See merge request Flair/forge!1
2019-06-05 20:10:46 +00:00
Hans Mackowiak
519d57065d Updated deckgen data
(cherry picked from commit 29f1065)
2019-06-05 20:10:46 +00:00
Michael Kamensky
bb18d8f60b Merge branch 'master' into 'master'
Add a basic AristocratCounters hook for Dreadmalkin (currently doesn't sac planeswalkers).

See merge request core-developers/forge!1790
2019-06-05 18:30:47 +00:00
Agetian
8161bd5f2c - Add a basic AristocratCounters hook for Dreadmalkin (currently doesn't sac planeswalkers).
- Fix division by zero in AristocratCounters logic.
2019-06-05 21:29:29 +03:00
Michael Kamensky
7d2513c0f6 Merge branch 'master' into 'master'
Fix RearrangeTopOfLibraryAi missed triggers.

See merge request core-developers/forge!1789
2019-06-05 10:16:20 +00:00
Agetian
e61441c250 - Fix RearrangeTopOfLibraryAi missed triggers. 2019-06-05 13:15:42 +03:00
Michael Kamensky
b675f1c387 Merge branch 'master' into 'master'
Fix imports.

See merge request core-developers/forge!1788
2019-06-05 09:11:28 +00:00
Agetian
532accd709 - Fix imports. 2019-06-05 12:11:08 +03:00
Michael Kamensky
5e83a2e79d Merge branch 'master' into 'master'
Basic AI for Gideon Blackblade

See merge request core-developers/forge!1787
2019-06-05 09:10:34 +00:00
Agetian
fadd08bd21 - Basic AI for Gideon Blackblade. 2019-06-05 12:09:23 +03:00
austinio7116
4fd360a840 Merge branch 'wardeckgen' into 'master'
Updated deckgen data

See merge request core-developers/forge!1786
2019-06-05 05:30:36 +00:00
austinio7116
01f35cea63 Updated deckgen data
(cherry picked from commit 29f1065)
2019-06-05 06:28:59 +01:00
Michael Kamensky
9d28bf2546 Merge branch 'master' into 'master'
Fix Ahn-Crop Invader AI

Closes #1012

See merge request core-developers/forge!1785
2019-06-05 04:37:31 +00:00
Agetian
de01a88d52 - Fix Ahn-Crop Invader AI 2019-06-05 07:34:44 +03:00
swordshine
e264a92e82 Merge branch 'patch' into 'master'
Implement Return from Extinction

See merge request core-developers/forge!1783
2019-06-05 00:59:56 +00:00
swordshine
a442122c7b Merge branch 'false-order' into 'master'
False Orders and Balduvian Warlord

See merge request core-developers/forge!1758
2019-06-05 00:59:40 +00:00
Adam Pantel
0a3f47e721 Descriptions, Cleanup 2019-06-04 16:20:20 -04:00
apantel
9b1d500073 BlockEffect and related cards 2019-06-04 12:42:43 -04:00
swordshine
ee7f1f4136 Fix Sisay, Weatherlight Captain by Marvel, Dawnbringer 2019-06-04 22:58:27 +08:00
Michael Kamensky
6bbc8d54df Merge branch 'master' into 'master'
Added puzzle PS_WAR5 - Possibility Storm - War of the Spark 05

See merge request core-developers/forge!1784
2019-06-04 14:25:42 +00:00
Agetian
70b12a439a - Added puzzle PS_WAR5. 2019-06-04 17:24:59 +03:00
swordshine
74b84f43cb Fix Return from Extinction 2019-06-04 19:18:06 +08:00
swordshine
523d965571 Merge branch 'last-mh1-charms' into 'master'
Add Return from Extinction, Shatter Assumptions

See merge request core-developers/forge!1770
2019-06-04 10:51:58 +00:00
Michael Kamensky
859c02c881 Merge branch 'patch' into 'master'
Add Valiant Changeling

See merge request core-developers/forge!1782
2019-06-04 10:39:50 +00:00
swordshine
454d644947 Fix a typo 2019-06-04 18:14:02 +08:00
swordshine
8b7b50b85d Add Valiant Changeling 2019-06-04 18:12:00 +08:00
swordshine
4d325d3fa2 Merge branch 'patch' into 'master'
Update String of Disappearances

See merge request core-developers/forge!1781
2019-06-04 08:15:29 +00:00
swordshine
1c7e1a226f Update String of Disappearances 2019-06-04 16:15:07 +08:00
swordshine
5055d42279 Merge branch 'some-missing-mh1-cards' into 'master'
Add String of Disappearances, Aria of Flame

See merge request core-developers/forge!1765
2019-06-04 08:11:21 +00:00
pfirpfel
aa320fccea Add Aria of Flame, String of Disappearances 2019-06-04 10:05:21 +02:00
swordshine
b437347791 Merge branch 'patch' into 'master'
Update some scripts

See merge request core-developers/forge!1779
2019-06-04 07:58:28 +00:00
Michael Kamensky
f8402c2fa5 Merge branch 'master' into 'master'
Fixed Casualties of War description.

See merge request core-developers/forge!1780
2019-06-04 07:58:27 +00:00
Agetian
fce5293eba - Fixed Casualties of War description. 2019-06-04 10:58:03 +03:00
swordshine
d9168ba658 Update some scripts 2019-06-04 15:57:58 +08:00
swordshine
4f2515994f Merge branch 'mhspoilers2' into 'master'
scripts by nikivan plus Glacial Revelation

See merge request core-developers/forge!1774
2019-06-04 07:47:58 +00:00
Michael Kamensky
83b3564f9e Merge branch 'master' into 'master'
Added AI hint for Thundering Ceratok.

See merge request core-developers/forge!1778
2019-06-04 07:26:02 +00:00
Agetian
cb1b6cf2f0 - Added AI hint for Thundering Ceratok. 2019-06-04 10:25:39 +03:00
Michael Kamensky
4a2721a151 Merge branch 'master' into 'master'
Card description patch

See merge request core-developers/forge!1777
2019-06-04 07:19:03 +00:00
Agetian
0a18874567 - Card description patch. 2019-06-04 10:18:36 +03:00