Commit Graph

41820 Commits

Author SHA1 Message Date
Agetian
8115e09a18 - Added M20 planeswalker achievements by Marek14 2019-06-27 19:25:39 +03:00
Agetian
77e3d9dbc6 - Disable the ability for the AI that it can't pay the cost for (on a RemAIDeck card) 2019-06-27 19:15:21 +03:00
Michael Kamensky
d39eb5b26a Merge branch 'm20rankings' into 'master'
Preparing for M20 constructed and draft formats - rankings scraped from draftsim

See merge request core-developers/forge!1915
2019-06-27 03:24:54 +00:00
Michael Kamensky
c719e03b94 Merge branch 'updatedshopimages' into 'master'
Updated product images for recent sets - already present in FTP

See merge request core-developers/forge!1914
2019-06-27 03:24:06 +00:00
austinio7116
6a54481d97 Preparing for M20 constructed and draft formats - rankings scraped from draftsim
(cherry picked from commit c452ac2)
2019-06-26 23:35:25 +01:00
austinio7116
05a736bcbe Switched to correct naming convention 2019-06-26 23:04:09 +01:00
austinio7116
aa7a9c09af Updated product images for recent sets - already present in FTP 2019-06-26 17:16:29 +01:00
swordshine
1367a4465f Merge branch 'master' into 'master'
Fix Nightpack Ambusher

See merge request core-developers/forge!1913
2019-06-26 14:46:09 +00:00
swordshine
f5a05cdfb9 Fix Nightpack Ambusher 2019-06-26 22:45:21 +08:00
swordshine
a70b9415d0 Merge branch 'patch-2' into 'master'
Risen Reef: add ForgetChanged so the Land isn't added to Hand if it enters the Battlefield

See merge request core-developers/forge!1912
2019-06-26 07:51:57 +00:00
Hans Mackowiak
ade716a9cf Risen Reef: add ForgetChanged so the Land isn't added to Hand if it enters the Battlefield 2019-06-26 07:51:57 +00:00
Michael Kamensky
9628c8d3fe Merge branch 'lotusFieldFix' into 'master'
Lotus field should add three mana, not one

See merge request core-developers/forge!1911
2019-06-25 14:27:47 +00:00
swordshine
498ab89757 Merge branch 'typoFix' into 'master'
Change the wording of four cards from "remove a +1/+1 counter from Creature...

See merge request core-developers/forge!1909
2019-06-25 14:13:09 +00:00
swordshine
aa203680de Merge branch 'arcadesTypo' into 'master'
add missing "defender" to ability description

See merge request core-developers/forge!1910
2019-06-25 14:12:14 +00:00
kms70847
f1ea190acf Lotus field should add three mana, not one 2019-06-25 10:07:44 -04:00
kms70847
7f3f5276e8 add missing "defender" to ability description 2019-06-25 10:04:00 -04:00
kms70847
82409960d8 Change the wording of four cards from "remove a +1/+1 counter from Creature you Control" to "remove a +1/+1 counter from a creature you control" 2019-06-25 09:48:49 -04:00
Michael Kamensky
cc1179ae6d Merge branch 'master' into 'master'
Added puzzle PS_WAR8 - Possibility Storm - War of the Spark 08

See merge request core-developers/forge!1908
2019-06-25 08:53:21 +00:00
Agetian
7580dd91bb - Added puzzle PS_WAR8 2019-06-25 11:50:29 +03:00
Michael Kamensky
12fad7906b Merge branch 'mh1deckgen' into 'master'
MH1 modern deck generation data

See merge request core-developers/forge!1907
2019-06-25 05:56:28 +00:00
austinio7116
84bcc1418f MH1 modern deck generation data
(cherry picked from commit 3ef010c)
2019-06-25 06:26:25 +01:00
swordshine
0c3868b9cc Merge branch 'precombat-simple' into 'master'
Clean up isPreCombatMain and related

See merge request core-developers/forge!1906
2019-06-25 04:07:25 +00:00
Adam Pantel
2c5699ae17 Clean up isPreCombatMain and related 2019-06-24 22:32:57 -04:00
Michael Kamensky
cd2c66da66 Merge branch 'master' into 'master'
Internationalisation (reverting GroupDef.java andColumnDef.java)

See merge request core-developers/forge!1904
2019-06-24 16:03:06 +00:00
swordshine
feae5779a7 Merge branch 'm20' into 'master'
M20

See merge request core-developers/forge!1903
2019-06-24 11:16:54 +00:00
swordshine
4b0c412547 Add Embodiment of Agonies 2019-06-24 19:11:13 +08:00
swordshine
72da47cc67 Add Loxodon Lifechanter 2019-06-24 13:46:28 +08:00
churrufli
02d59e668f Merge remote-tracking branch 'origin/master' 2019-06-24 07:03:58 +02:00
churrufli
34fcb0cca5 reverting GroupDef.java 2019-06-24 07:03:37 +02:00
Agetian
25112dac67 - Most likely not the best idea in case the AI wants to just sweep the board 2019-06-24 06:54:42 +02:00
Agetian
7746547f18 - Added a couple AI hints 2019-06-24 06:54:42 +02:00
Agetian
05ee9afcac - One of the changes in Lands WRG unneeded 2019-06-24 06:54:42 +02:00
Agetian
25753585a5 - Fix an issue with the theme deck generator hanging on certain decks (-1 -1 BG Counters, Lands WRG) 2019-06-24 06:54:42 +02:00
Agetian
a8d60afd17 - Most likely not the best idea in case the AI wants to just sweep the board 2019-06-24 06:54:34 +02:00
Agetian
34866c9ac2 - Added a couple AI hints 2019-06-24 06:54:34 +02:00
Agetian
caa9e92a3a - One of the changes in Lands WRG unneeded 2019-06-24 06:54:34 +02:00
Agetian
bad2c9bb3f - Fix an issue with the theme deck generator hanging on certain decks (-1 -1 BG Counters, Lands WRG) 2019-06-24 06:54:34 +02:00
churrufli
b91773f73f Moving hard-coded text to res files 2019-06-24 06:54:33 +02:00
churrufli
181aa0f2ab Moving hard-coded text to res files 2019-06-24 06:54:33 +02:00
swordshine
131284d35f Fix Sorin 2019-06-24 12:53:35 +08:00
swordshine
49e9f86f36 Merge branch 'm20' into 'master'
M20

See merge request core-developers/forge!1890
2019-06-24 02:13:33 +00:00
swordshine
d6af23958e Add Dread Presence. 2019-06-24 10:12:28 +08:00
Hans Mackowiak
8a0b8242f0 Player: fix monarch and blessing 2019-06-23 23:57:59 +02:00
Agetian
245c021ed7 - Most likely not the best idea in case the AI wants to just sweep the board 2019-06-23 23:57:59 +02:00
Agetian
c83c77052e - Added a couple AI hints 2019-06-23 23:57:58 +02:00
Agetian
762fe37237 - Somewhat improve the AI for combat pumps coming from permanents 2019-06-23 23:57:58 +02:00
Agetian
1ce2556e99 - Improve the AI for combat pumps when it comes to timing the activation. 2019-06-23 23:57:58 +02:00
Agetian
05b2b95cac - One of the changes in Lands WRG unneeded 2019-06-23 23:57:58 +02:00
Agetian
a677ef2b9a - Fix an issue with the theme deck generator hanging on certain decks (-1 -1 BG Counters, Lands WRG) 2019-06-23 23:57:58 +02:00
Michael D
ac333e7425 Update Hypercube to intended drafting format. 2019-06-23 23:57:58 +02:00