Commit Graph

41395 Commits

Author SHA1 Message Date
Michael Kamensky
c5e4518779 AI logic to blink-reload a planeswalker using Teferi's Time Twist. 2019-05-21 14:39:33 +00:00
swordshine
cdeb944a57 Merge branch 'patch' into 'master'
Update some scripts

See merge request core-developers/forge!1679
2019-05-21 05:28:12 +00:00
swordshine
bdcca785df Update some scripts 2019-05-21 13:27:54 +08:00
Michael Kamensky
74ddb424f0 Merge branch 'master' into 'master'
Implement some logic support for Finale of Revelation.

Closes #991

See merge request core-developers/forge!1678
2019-05-21 05:21:44 +00:00
swordshine
90851d3446 Merge branch 'patch-23' into 'master'
Morophon, the Boundless

See merge request core-developers/forge!1674
2019-05-21 05:21:43 +00:00
swordshine
564a6b11eb Merge branch 'patch-22' into 'master'
Impostor of the Sixth Pride

See merge request core-developers/forge!1673
2019-05-21 05:18:36 +00:00
swordshine
64f3be6326 Merge branch 'patch-21' into 'master'
Ice-Fang Coatl

See merge request core-developers/forge!1672
2019-05-21 05:18:22 +00:00
Agetian
4e0b252ea0 - Implement some logic support for Finale of Revelation. 2019-05-21 08:18:01 +03:00
swordshine
6afb1838a0 Merge branch 'patch-20' into 'master'
Headless Specter

See merge request core-developers/forge!1671
2019-05-21 05:16:12 +00:00
swordshine
f958dc3267 Merge branch 'patch-19' into 'master'
Goblin War Party

See merge request core-developers/forge!1670
2019-05-21 05:14:55 +00:00
swordshine
c2c035997a Merge branch 'patch-18' into 'master'
Force of Vigor

See merge request core-developers/forge!1669
2019-05-21 05:13:40 +00:00
Charles Baker
be1c3defba Morophon, the Boundless 2019-05-21 04:04:40 +00:00
Charles Baker
f37f42e328 Impostor of the Sixth Pride 2019-05-21 04:03:17 +00:00
Charles Baker
855142da75 Ice-Fang Coatl 2019-05-21 04:02:15 +00:00
Charles Baker
d02d1c8e41 Headless Specter 2019-05-21 04:01:04 +00:00
Charles Baker
f3e3ce9e26 Goblin War Party 2019-05-21 04:00:06 +00:00
Charles Baker
c22a3d0657 Force of Vigor 2019-05-21 03:58:37 +00:00
swordshine
bba6009313 Merge branch 'patch' into 'master'
Update some scripts

See merge request core-developers/forge!1667
2019-05-21 02:09:21 +00:00
swordshine
1a42691bbc Update some scripts 2019-05-21 10:08:28 +08:00
swordshine
549d86aa53 Merge branch 'fix-reflmana' into 'master'
Fix the express mana payment sometimes presenting the player with choices which are not legal.

Closes #978

See merge request core-developers/forge!1666
2019-05-21 01:16:16 +00:00
Michael Kamensky
ccc935a025 Fix the express mana payment sometimes presenting the player with choices which are not legal. 2019-05-21 01:16:16 +00:00
Michael Kamensky
f2f2ef09e2 Merge branch 'master' into 'master'
Added an AI hint for God-Eternal Rhonas.

See merge request core-developers/forge!1665
2019-05-20 11:24:25 +00:00
Agetian
29357d05f1 - Added an AI hint for God-Eternal Rhonas. 2019-05-20 14:23:49 +03:00
swordshine
c54625574d Merge branch 'morwardeckgen' into 'master'
More WAR Standard deck generation data

See merge request core-developers/forge!1664
2019-05-20 05:43:58 +00:00
austinio7116
cd28c71336 More WAR Standard deck generation data
(cherry picked from commit 6fc7f55)
2019-05-20 05:46:19 +01:00
Michael Kamensky
836635c15c Merge branch 'master' into 'master'
Change the obsolete comment regarding the macOS version of Forge.

See merge request core-developers/forge!1663
2019-05-20 03:26:51 +00:00
Agetian
ec09353c1c - Change the obsolete comment regarding the macOS version of Forge. 2019-05-20 06:24:37 +03:00
Michael Kamensky
a97b334408 Merge branch 'master' into 'master'
Preparing Forge for Android publish 1.6.25.001 [incremental].

See merge request core-developers/forge!1662
2019-05-20 02:52:18 +00:00
Agetian
8bec57b991 - Preparing Forge for Android publish 1.6.25.001 [incremental]. 2019-05-20 05:51:47 +03:00
swordshine
0efc5f77b9 Merge branch 'patch-17' into 'master'
Deep Forest Hermit

See merge request core-developers/forge!1661
2019-05-20 02:32:34 +00:00
swordshine
8122e2fb67 Merge branch 'patch-16' into 'master'
Force of negation

See merge request core-developers/forge!1660
2019-05-20 02:26:39 +00:00
swordshine
5fdad29080 Merge branch 'patch' into 'master'
Modern Horizons cards

See merge request core-developers/forge!1657
2019-05-20 02:20:21 +00:00
swordshine
170a62d1d7 Merge branch 'master' into 'patch' 2019-05-20 02:19:39 +00:00
swordshine
f353d07ca3 Merge branch 'patch-15' into 'master'
Update CONTRIBUTORS.txt

See merge request core-developers/forge!1659
2019-05-20 02:18:18 +00:00
swordshine
32223f0993 Add Savage Swipe 2019-05-20 10:10:29 +08:00
Charles Baker
e07f06a452 Update force_of_negation 2019-05-20 02:04:06 +00:00
Charles Baker
1b74ae2d33 Add new file 2019-05-20 02:03:25 +00:00
Charles Baker
df6df78550 Add new file 2019-05-20 01:49:40 +00:00
Charles Baker
d7f3cee09e Update CONTRIBUTORS.txt 2019-05-20 01:06:29 +00:00
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