Commit Graph

42170 Commits

Author SHA1 Message Date
Charles Baker
5f3f54b919 Update CONTRIBUTORS.txt 2019-05-20 01:05:17 +00:00
swordshine
5b6655e14b Merge branch 'master' of https://git.cardforge.org/core-developers/forge into patch 2019-05-20 09:03:00 +08:00
swordshine
3413f7447a Merge branch 'patch-10' into 'master'
Cabal Therapist from Modern Horizons

See merge request core-developers/forge!1641
2019-05-20 01:00:44 +00:00
Blacksmith
793514b78e Clear out release files in preparation for next release 2019-05-20 00:46:57 +00:00
Blacksmith
6c945608b3 [maven-release-plugin] prepare for next development iteration 2019-05-20 00:42:07 +00:00
Blacksmith
57786e7c81 [maven-release-plugin] prepare release forge-1.6.25 forge-1.6.25 2019-05-20 00:42:02 +00:00
Blacksmith
d5d8d9e34d Update README.txt for release 2019-05-20 00:39:10 +00:00
Sol
e5dc87fc7a Merge branch 'patch-2' into 'master'
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!1658
2019-05-20 00:33:36 +00:00
Sol
9a644b9ac9 Update ANNOUNCEMENTS.txt 2019-05-20 00:32:28 +00:00
Michael Kamensky
4eb1971bdd Merge branch 'ai-improvements' into 'master'
Assorted AI improvements and fixes

See merge request core-developers/forge!1656
2019-05-19 16:49:42 +00:00
swordshine
606f2b9ca5 Add Serra the Benevolent by nikivan 2019-05-20 00:08:40 +08:00
Agetian
0bf336140a - Sarkhan trigger damage doesn't depend on the number of attackers. 2019-05-19 18:55:00 +03:00
Agetian
ab2d9afbf6 - Basic Teferi's Time Twist AI logic (currently only uses it to flicker-save its permanents) 2019-05-19 18:52:46 +03:00
swordshine
1558bbd3b3 Merge branch 'patch' into 'master'
Fix Sorin

See merge request core-developers/forge!1655
2019-05-19 15:35:47 +00:00
Agetian
ad1c42acfc - AI precaution against attacking into Sarkhan the Masterless 2019-05-19 18:35:39 +03:00
swordshine
297e228b2a Fix Sorin 2019-05-19 23:35:17 +08:00
Agetian
1b773d0ac6 - Fixed a missing reference. 2019-05-19 17:25:50 +03:00
Agetian
84480ddf72 - DamageDealAi: SVars for PayX are now processed per spell ability. Fixes e.g. paying 0 for Explosion.
- Teferi's Time Twist: deckbuilding hint
2019-05-19 17:19:41 +03:00
Michael Kamensky
e19084c413 Merge branch 'patch-14' into 'master'
Teferi's Time Twist

See merge request core-developers/forge!1653
2019-05-19 13:42:34 +00:00
Michael Kamensky
6bdaf70812 Merge branch 'sols-ugin' into 'master'
Ugin the Ineffable

See merge request core-developers/forge!1651
2019-05-19 13:28:54 +00:00
Michael Kamensky
c46e31d8e3 Merge branch 'facedownResetFix' into 'master'
Facedown: fix effects turning cards face down in exile

See merge request core-developers/forge!1654
2019-05-19 13:28:10 +00:00
Hans Mackowiak
08041e14fb Facedown: fix effects turning cards face down in exile 2019-05-19 13:28:10 +00:00
Agetian
dec8621218 - Revert a jury-rigged workaround. 2019-05-19 16:17:50 +03:00
Charles Baker
d1c990f54e Teferi's Time Twist 2019-05-19 04:21:27 +00:00
Agetian
7ef3884d5c - FIXME: modified a check for faceDown inside changeZone so that it works for face down exiled cards. Why is isFaceDown() not working though?
- Added AI hint for Ugin.
2019-05-19 07:15:14 +03:00
Michael Kamensky
b8a0882b66 Merge branch 'master' into 'master'
Don't fall through to other switch cases in CardView to avoid subtle bugs.

See merge request core-developers/forge!1652
2019-05-19 04:03:10 +00:00
Agetian
85b697d54e - Don't fall through to other switch cases in CardView to avoid subtle bugs. 2019-05-19 06:58:37 +03:00
Sol
0fb8ed7f0a Merge branch 'bolasVivien' into 'master'
Bolas's Citadel and Vivien, Champion of the Wilds

See merge request core-developers/forge!1650
2019-05-19 02:36:56 +00:00
Hans Mackowiak
e9ad4be05d - CardView: fall through in case a card in exile is face down, so that all the relevant checks are made. 2019-05-19 02:36:56 +00:00
Sol
1eb9589548 Ugin the Ineffable 2019-05-19 02:06:32 +00:00
Michael Kamensky
39267b4723 Merge branch 'master' into 'master'
Fixed a logic error in DigAi which prevented the AI from paying a X cost for Vivien's Arkbow

Closes #988

See merge request core-developers/forge!1649
2019-05-17 13:27:41 +00:00
Agetian
e93421d4b7 - Fixed a logic error in DigAi which prevented the AI from paying a mana cost e.g. for Vivien's Arkbow. 2019-05-17 16:22:54 +03:00
swordshine
a090479253 Merge branch 'patch-13' into 'master'
Fblthp, the Lost correction

See merge request core-developers/forge!1648
2019-05-16 00:47:49 +00:00
Charles Baker
20eb6777d2 added Legendary type 2019-05-15 22:26:40 +00:00
Michael Kamensky
b00851ed24 Merge branch 'patch-12' into 'master'
Storrev, Devkarin Lich from War of the Spark

See merge request core-developers/forge!1646
2019-05-15 03:25:17 +00:00
Charles Baker
a922697d26 Storrev, Devkarin Lich from War of the Spark 2019-05-15 01:28:59 +00:00
Michael Kamensky
3b605adb4d Merge branch 'war-tricky-cards' into 'master'
Added Ashiok, Dream Render.

See merge request core-developers/forge!1644
2019-05-14 15:22:19 +00:00
Agetian
31d9a1e6b3 - Attempting to consolidate the implementation for "can't search library". 2019-05-14 16:33:09 +03:00
Agetian
3913f7661f - Some AI support for CantSearchLibrary / Ashiok effect. 2019-05-14 12:13:10 +03:00
Michael Kamensky
83be371d1c Merge branch 'patch-8' into 'master'
Fade Away from Exodus

See merge request core-developers/forge!1634
2019-05-14 08:35:47 +00:00
Agetian
72d623784a - Added Ashiok, Dream Render. 2019-05-14 08:38:24 +03:00
Michael Kamensky
681446cba4 Merge branch 'master' into 'master'
Added puzzle PS_WAR2 (Possibility Storm - War of the Spark 02)

See merge request core-developers/forge!1643
2019-05-14 05:25:52 +00:00
Agetian
5eb56e0d0e - Added puzzle PS_WAR2. 2019-05-14 07:27:46 +03:00
Agetian
b45ab00cf6 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-14 07:15:56 +03:00
Michael Kamensky
5ce0340240 Merge branch 'activationLimitStatic' into 'master'
Card: store activations in Card

See merge request core-developers/forge!1640
2019-05-13 14:39:11 +00:00
Hans Mackowiak
8e5e8e1759 Card: store activations in Card 2019-05-13 14:39:11 +00:00
Charles Baker
00bd55f063 Add new file 2019-05-11 18:19:37 +00:00
Agetian
ad80eaa4e9 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-11 20:15:48 +03:00
Michael Kamensky
8f0457f0fa Merge branch 'master' into 'master'
A couple card fixes.

Closes #981

See merge request core-developers/forge!1639
2019-05-11 04:34:17 +00:00
Michael Kamensky
e22bf5944b - Fixed Band Together.
- Adding a couple missing references to Incubation Druid.
2019-05-11 04:34:17 +00:00