Commit Graph

40656 Commits

Author SHA1 Message Date
Rob Schnautz
94ab23f09f back matter 2019-03-25 18:46:25 +00:00
Rob Schnautz
286e5721f7 back matter 2019-03-25 18:35:24 +00:00
Rob Schnautz
eb5899ac15 back matter 2019-03-25 18:24:47 +00:00
Rob Schnautz
a1fca42b57 back matter 2019-03-25 17:53:53 +00:00
Rob Schnautz
16314d5ebc Merge branch 'MED-patch' into 'master'
Mythic Edition patch

See merge request core-developers/forge!1485
2019-03-25 16:53:08 +00:00
Rob Schnautz
d5fe891440 Fix MCI code and card numbers (MPS points to Kaladesh Inventions) 2019-03-25 16:50:28 +00:00
Rob Schnautz
13d99e209b Fix MCI code (MPS points to Kaladesh Inventions) 2019-03-25 16:48:26 +00:00
Rob Schnautz
9946155c71 Merge branch 'cherry-pick-ff7def5f' into 'master'
Amonkhet Invocations patch

See merge request core-developers/forge!1484
2019-03-25 16:43:49 +00:00
Rob Schnautz
6a6ca3f403 Fix MCI code (MPS points to Kaladesh Inventions)
(cherry picked from commit ff7def5f5afd7a07991caf2549f5fb92f9a85186)
2019-03-25 16:42:43 +00:00
Michael Kamensky
1c0d95b930 Merge branch 'draft-bugs' into 'master'
Resolve #921, #922

Closes #921 and #922

See merge request core-developers/forge!1478
2019-03-25 03:53:44 +00:00
Michael Kamensky
271b940723 Merge branch 'quest-pets-redux' into 'master'
Always create an empty map for tokenNormalized

See merge request core-developers/forge!1483
2019-03-25 03:52:52 +00:00
Michael Kamensky
8eecccff0b Merge branch 'aura-corner-case' into 'master'
resolve #923

Closes #923

See merge request core-developers/forge!1479
2019-03-25 03:52:43 +00:00
Adam Pantel
18f32a1657 Fix draft duplicates bug 2019-03-24 21:32:48 -04:00
Adam Pantel
5cd5020595 Fix draft bots running conspiracies 2019-03-24 21:32:14 -04:00
Chris H
5aee626661 Always create an empty map for tokenNormalized 2019-03-24 21:00:31 -04:00
Rob Schnautz
f2dae53c11 back matter, premium cards 2019-03-24 19:53:36 +00:00
Rob Schnautz
da93a734fb back matter, premium cards 2019-03-24 19:31:12 +00:00
Rob Schnautz
25042c9814 Back matter, premium cards 2019-03-24 18:20:02 +00:00
Rob Schnautz
a239dbfc01 More deck descriptions. 2019-03-24 17:24:53 +00:00
Rob Schnautz
1b1502af0d Merge branch 'master' into 'deck-descriptions'
Update from master

See merge request core-developers/forge!1482
2019-03-24 17:04:55 +00:00
Rob Schnautz
6ca034eab9 React to removal of Spike Weaver by using the effect if it's already planning to do later
Don't leave blockers if planning to use fog effect, except the card that will do so. (might need to tap to use it, or might get killed if attacking)
2019-03-24 17:04:53 +00:00
Hans Mackowiak
99456c7bbb Merge branch 'patch-2' into 'master'
Fix download URL for Afterlife spirit token images.

See merge request core-developers/forge!1481
2019-03-24 16:57:08 +00:00
Rob Schnautz
c0d87aecaa author @Hanmac Fix download URL for Afterlife spirit token images. 2019-03-24 16:53:42 +00:00
Michael Kamensky
1d691a5342 Merge branch 'patch-1' into 'master'
Quest pet tokens don't have editions.

See merge request core-developers/forge!1480
2019-03-24 04:07:21 +00:00
Sol
de719b9aa5 There's no such thing as "file1_set" its either "file_set" or "file2_set" 2019-03-24 01:43:16 +00:00
Sol
190a56181e Quest pet tokens don't have editions. 2019-03-24 00:55:24 +00:00
Adam Pantel
ae772e99a7 Enchant fix 2019-03-23 14:35:00 -04:00
Michael Kamensky
e13ddd9666 Merge branch 'master' into 'master'
Added puzzle PS_RNA8 (Possibility Storm - Ravnica Allegiance 08)

See merge request core-developers/forge!1476
2019-03-23 09:52:39 +00:00
Agetian
7890420fb0 - Added puzzle PS_RNA8. 2019-03-23 12:51:38 +03:00
Sol
8d056be356 Merge branch 'patch-1' into 'master'
Set default art index to 1 for tokens

See merge request core-developers/forge!1475
2019-03-22 15:00:21 +00:00
Sol
b594cf2324 Set default art index to 1 for tokens 2019-03-22 15:00:21 +00:00
Michael Kamensky
f048b04c2b Merge branch 'patch-1' into 'master'
Update beckon_apparition.txt

See merge request core-developers/forge!1474
2019-03-22 04:27:50 +00:00
Michael Kamensky
fd1e8c1e7e Merge branch 'token-multiple-art' into 'master'
Allow multiple art for tokens based on edition files

See merge request core-developers/forge!1473
2019-03-22 04:27:45 +00:00
Sol
af0d4b0c48 Update beckon_apparition.txt 2019-03-22 03:08:29 +00:00
Chris H
dc917643b5 Allow multiple art for tokens based on edition files 2019-03-21 20:58:46 -04:00
Sol
6f90d27f38 Merge branch '916-more-tokenscript-problems' into 'master'
Resolve "More tokenscript problems"

Closes #916

See merge request core-developers/forge!1472
2019-03-21 02:50:14 +00:00
Hanmac
80851d515a TokenScript: more fixes 2019-03-20 21:17:32 +01:00
Michael Kamensky
6dfca97bbb Merge branch '915-missing-tokenscript-r_1_1_elemental' into 'master'
Resolve "Missing tokenscript: r_1_1_elemental"

Closes #915

See merge request core-developers/forge!1471
2019-03-20 13:54:06 +00:00
Hans Mackowiak
2a10750fdb Add new file 2019-03-20 13:38:43 +00:00
Michael Kamensky
a1976653f8 Merge branch 'master' into 'master'
Replace RemRandomDeck with the new format.

See merge request core-developers/forge!1470
2019-03-20 12:20:50 +00:00
Agetian
3e2fa43abe - Replace RemRandomDeck with the new format. 2019-03-20 15:20:14 +03:00
Michael Kamensky
e3ae076ab7 Merge branch 'master' into 'master'
Fix Saheeli crashing the AI.

See merge request core-developers/forge!1469
2019-03-20 12:15:24 +00:00
Agetian
64e09020bd - Fix Saheeli crashing the AI. 2019-03-20 15:14:36 +03:00
Sol
cd033aa896 Merge branch '908-mindbreak-trap-exiles-itself' into 'master'
Resolve "Mindbreak Trap Exiles itself"

Closes #908

See merge request core-developers/forge!1467
2019-03-20 12:02:21 +00:00
Hans Mackowiak
0e2222f97c Merge branch 'patch-1' into 'master'
Update gold.txt

Closes #913

See merge request core-developers/forge!1468
2019-03-20 05:33:53 +00:00
Sol
7629144be1 Update gold.txt 2019-03-20 01:11:02 +00:00
Hanmac
dece031e13 SpellAbilityEffect: fix getCards when only spell is targeted 2019-03-19 08:23:09 +01:00
swordshine
611813c141 Merge branch 'patch-2' into 'master'
Update monastery_mentor.txt

Closes #912

See merge request core-developers/forge!1466
2019-03-19 03:58:57 +00:00
Sol
fdc9aea650 Update monastery_mentor.txt 2019-03-19 02:41:39 +00:00
Sol
ccba38d944 Merge branch 'master' into 'master'
Fix to have "old edition images" of the "Elves vs Goblins" duel deck searched in the right folder "DD1" and not "EVG" (which is for the Anthology edition version of the same duel deck)

See merge request core-developers/forge!1465
2019-03-18 12:44:27 +00:00