external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,274 Commits 32 Branches 187 Tags
43b51c4795c823828e7b9e6988ec277b22e74266
Commit Graph

41274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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