Commit Graph

38934 Commits

Author SHA1 Message Date
Michael Kamensky
20607547df - Fixed Lich's Caress. 2018-07-04 11:20:57 +03:00
Michael Kamensky
661f297bd5 Merge branch 'm19finalfew' into 'master'
Added final missing M19 cards - corrected the name of Isareth the Awakener

See merge request core-developers/forge!722
2018-07-04 08:19:19 +00:00
austinio7116
90ac2f56d8 Fixed doublecast cost 2018-07-04 07:02:39 +01:00
austinio7116
3eb4b933a7 Tezzeret's Strider 2018-07-04 07:02:09 +01:00
austinio7116
d5666fcbd0 Silverbeak Griffin 2018-07-04 06:58:12 +01:00
austinio7116
9561e71299 Court Cleric 2018-07-04 06:56:25 +01:00
austinio7116
55f4d705b0 Corrected the name of Isareth the Awakener 2018-07-04 06:36:30 +01:00
Hanmac
246e3e2bef updated Bolas flip walker 2018-07-04 07:22:55 +02:00
Hanmac
2ba61df85b cards: update flip walker 2018-07-04 07:21:21 +02:00
Hanmac
30be1aab32 Planeswalker: get BaseLoyalty from state, remove damage redirect 2018-07-04 07:21:21 +02:00
Michael Kamensky
865dbbf17a Merge branch 'm19_missing_red' into 'master'
Add Vaevictis Asmadi, the Dire

See merge request core-developers/forge!720
2018-07-04 04:39:12 +00:00
Michael Kamensky
fa5c799905 Merge branch 'master' into 'master'
Fixed Stitcher's Supplier crashing the game, removed unfinished Tezzeret, Cruel Machinist (in separate WIP MR, crashes the game upstream)

See merge request core-developers/forge!721
2018-07-04 04:33:59 +00:00
Agetian
dc094bad11 - Fixed Stitcher's Supplier crashing the game.
- Removed Tezzeret, Cruel Machinist (no code support for EnterFaceDownAs upstream yet, in separate WIP MR)
2018-07-04 07:32:53 +03:00
Sol
0cc7d20b0b Merge branch 'm19fixes2' into 'master'
Removed UST card added by mistake

See merge request core-developers/forge!719
2018-07-04 02:53:47 +00:00
Sol
527e775952 Merge branch 'finalpromos' into 'master'
Final M19 black planeswalker deck cards

See merge request core-developers/forge!718
2018-07-04 02:53:32 +00:00
Sol
43dc22c766 Merge branch 'finalm19cards' into 'master'
PW Deck Cards plus Cryptix Black scripts

See merge request core-developers/forge!711
2018-07-04 02:53:08 +00:00
Chris H
92dca74763 Add Vaevictis Asmadi, the Dire 2018-07-03 22:44:54 -04:00
austinio7116
9738d0e549 Removed UST card added by mistake 2018-07-04 00:15:23 +01:00
maustin
3ed6695f28 Merge branch 'master' into finalm19cards
# Conflicts:
#	forge-gui/res/cardsfolder/s/sarkhans_dragonfire.txt
2018-07-03 22:14:56 +01:00
austinio7116
bbbb10e846 Merge branch 'schnautzcards' into 'master'
Added Schnautzr's promo cards from M19

See merge request core-developers/forge!717
2018-07-03 19:51:46 +00:00
austinio7116
6586d30961 Liliana, the Necromancer 2018-07-03 20:49:19 +01:00
austinio7116
4a86179c1b Arisen Gorgon 2018-07-03 20:26:37 +01:00
austinio7116
dbae78d2f9 Gravewaker 2018-07-03 20:16:38 +01:00
schnautzr
341bdaaf44 Added Schnautzr's promo cards from M19 2018-07-03 19:57:35 +01:00
austinio7116
0f36ae74ad Fixed Isareth the awakener name 2018-07-03 19:36:25 +01:00
austinio7116
e3abd8fb01 Corrected spelling in Demon of Catastrophe's Type 2018-07-03 19:29:02 +01:00
Michael Kamensky
bba0ba7f19 Merge branch 'master' into 'master'
Fixed Leonin Warleader trigger description.

See merge request core-developers/forge!716
2018-07-03 17:51:36 +00:00
Agetian
3a7efd879f - Fixed Leonin Warleader trigger description. 2018-07-03 20:50:38 +03:00
Michael Kamensky
33e3fe12e8 Merge branch 'puzzle-engine' into 'master'
PS_KTKT: Added set defs to basic lands.

See merge request core-developers/forge!715
2018-07-03 16:55:37 +00:00
Agetian
f12c185b18 - PS_KTKT: Added set defs to basic lands. 2018-07-03 19:55:12 +03:00
Michael Kamensky
ca3b717395 Merge branch 'puzzle-engine' into 'master'
Added puzzle PS_KTKT (Khans of Tarkir throwback puzzle).

See merge request core-developers/forge!714
2018-07-03 16:46:09 +00:00
Agetian
b3a277a734 - Added puzzle PS_KTKT (Khans of Tarkir throwback puzzle). 2018-07-03 19:45:05 +03:00
austinio7116
5b684e42e6 Fell Spectre TriggeredCardController fix 2018-07-03 16:56:22 +01:00
Michael Kamensky
e7609f6e43 Merge branch 'master' into 'master'
Fix up the red cards and merge them

See merge request core-developers/forge!713
2018-07-03 15:00:19 +00:00
Michael Kamensky
0a782b24a6 - Fixed Leonin Warleader and Sarkhan's Unsealing. 2018-07-03 17:59:20 +03:00
Chris H
4ccc28a117 Add Sarkhan's Uunsealing 2018-07-03 10:36:07 -04:00
Chris H
73d438de27 Added 4 more M19 cards 2018-07-03 09:43:56 -04:00
austinio7116
9f819527f5 Added Sarkhan Dragonsoul 2018-07-03 08:22:20 +01:00
austinio7116
d584f82516 Fixed exception generating issues in black card scripts 2018-07-03 08:20:18 +01:00
austinio7116
bf5cda35e4 Bone Dragon Fixes 2018-07-03 08:07:40 +01:00
austinio7116
2ee8dd1e37 Added missing oracle text and card type.
Fixed a couple of text errors pre-testing
2018-07-03 07:17:12 +01:00
austinio7116
cea0ffd382 Black Cards from Cryptix 2018-07-03 06:52:21 +01:00
austinio7116
2e7e4299e7 Kargan Dragonrider 2018-07-03 06:41:43 +01:00
austinio7116
a515ab8bdf Sarkhan's Dragonfire 2018-07-03 06:29:31 +01:00
Michael Kamensky
dd9e41f532 Merge branch 'master' into 'master'
Migrate the latest card scripts.

See merge request core-developers/forge!710
2018-07-03 05:14:00 +00:00
Agetian
9a01efe126 - Migrate the latest card scripts. 2018-07-03 08:13:10 +03:00
Michael Kamensky
29fa7f6e7b Merge branch 'pwm19cards' into 'master'
More Planeswalker deck scripts Green/Red

See merge request core-developers/forge!708
2018-07-03 04:47:38 +00:00
Sol
de5fb29e04 Merge branch 'migrate_m19_upcoming' into 'master'
Migrate M19 cards

See merge request core-developers/forge!709
2018-07-03 01:35:27 +00:00
Chris H
119f0e464f Migrate M19 cards 2018-07-02 21:21:20 -04:00
austinio7116
b173ae4dc3 Sarkhan's Whelp 2018-07-02 17:27:08 +01:00