Commit Graph

38934 Commits

Author SHA1 Message Date
Meerkov
5d53321885 Update crystal_seer.txt 2018-09-25 00:40:38 +00:00
Jamin Collins
5a5e1ddac8 Merge branch 'guildofravnica' into 'master'
Some GRN fixes

See merge request core-developers/forge!944
2018-09-25 00:33:27 +00:00
austinio7116
12da68cd77 Whispering Snitch updated to use OnlyFirst rather than an SVar 2018-09-24 19:36:34 +01:00
austinio7116
4f3fe32f89 Corrected Whispering Snitch trigger 2018-09-24 17:26:17 +01:00
austinio7116
6ed4da392e Renamed remaining GRN split cards appropriately 2018-09-24 17:06:54 +01:00
Michael Kamensky
b7f5d6e85e Merge branch 'guilds_fxes' into 'master'
Guilds fxes

See merge request core-developers/forge!941
2018-09-24 04:15:18 +00:00
Michael Kamensky
24e1affd51 Merge branch 'patch-14' into 'master'
Fix another linewrap issue

See merge request core-developers/forge!943
2018-09-24 04:14:14 +00:00
Michael Kamensky
f0d0949ac5 Merge branch 'patch-13' into 'master'
Fix Oracle text line wrap.

See merge request core-developers/forge!942
2018-09-24 04:14:02 +00:00
Meerkov
c3371cf5fa Fix another linewrap issue 2018-09-24 03:52:31 +00:00
Meerkov
c699644a74 Fix Oracle text line wrap. 2018-09-24 03:50:00 +00:00
tehdiplomat
acadff3e04 Fix the Scarab God trigger 2018-09-23 22:56:36 -04:00
tehdiplomat
ac940a6db8 Fix Legion Warboss TokenSCript 2018-09-23 22:44:14 -04:00
tehdiplomat
f6bce3cdb1 More fixes to Pelt Collector 2018-09-23 22:36:09 -04:00
tehdiplomat
ab58ded0a1 Fix Druid of Horns 2018-09-23 22:33:01 -04:00
tehdiplomat
84d3ae83f1 More GUilds fixes 2018-09-23 22:29:19 -04:00
tehdiplomat
52893e54ee Fix cost and name of Response // Resurgence 2018-09-23 22:09:19 -04:00
tehdiplomat
df2028e4f3 Fix Guildmages' Forum 2018-09-23 21:39:07 -04:00
tehdiplomat
8e45262a7a Fix Whispering Snitch 2018-09-23 21:24:37 -04:00
tehdiplomat
ef97991237 Fix Dimir Informant 2018-09-23 21:23:19 -04:00
tehdiplomat
1d89f466ab Fix Concoct 2018-09-23 21:13:18 -04:00
Sol
760c45f9c2 Merge branch 'deck-editor' into 'master'
deck editor fixes

Closes #724

See merge request core-developers/forge!940
2018-09-23 20:22:58 +00:00
Jamin W. Collins
bbf63d9083 fix Quest Draft Editor
Closes: core-developers/forge#724

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-23 13:33:17 -06:00
Jamin W. Collins
781400c0a3 fix Draft mode editor
The recent changes to bring Commander style editors into the normal Deck
Editor tab appear to have broken the drafting editor.  This change set
appears to resolve that issue.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-23 13:04:19 -06:00
Michael Kamensky
9561b75f17 Merge branch 'puzzle-engine' into 'master'
Added puzzles PS_GRN0 and PS_GUEST1.

See merge request core-developers/forge!939
2018-09-23 05:24:52 +00:00
Agetian
f624d76301 - Added puzzles PS_GRN0 and PS_GUEST1. 2018-09-23 08:23:53 +03:00
Michael Kamensky
35b3bc0623 Merge branch 'guilds_fxes' into 'master'
Fixes from Wharrgarble

See merge request core-developers/forge!938
2018-09-23 04:15:27 +00:00
tehdiplomat
939cdb6822 When Planeswalkers aren't on the battlefield, show their base loyalty 2018-09-22 22:58:15 -04:00
tehdiplomat
e4303df238 Fix Niv Mizzet Parun's draw trigger 2018-09-22 22:05:30 -04:00
tehdiplomat
2e09c8230b Dazzling lights spell description 2018-09-22 22:00:50 -04:00
tehdiplomat
c69c81fcd0 Fix Undercity Uprising 2018-09-22 21:58:44 -04:00
tehdiplomat
781aa97546 Fix cost on Find 2018-09-22 21:51:08 -04:00
tehdiplomat
321c6e52c8 Fix Guildgates 2018-09-22 21:39:58 -04:00
tehdiplomat
2d153d58cb Fix Sprouting Renewal 2018-09-22 21:18:07 -04:00
tehdiplomat
a46b05d703 Fixes from Wharrgarble 2018-09-22 21:08:50 -04:00
Michael Kamensky
faa1b1a767 Merge branch 'tokenRE' into 'master'
TokenRE: now can be replaced with TokenScript

See merge request core-developers/forge!936
2018-09-22 18:56:28 +00:00
Hanmac
4508d54543 TokenRE: now can be replaced with TokenScript 2018-09-22 14:33:18 +02:00
Michael Kamensky
65e8fd1842 Merge branch 'guildofravnica' into 'master'
Urban Utopia

See merge request core-developers/forge!933
2018-09-22 03:43:24 +00:00
Michael Kamensky
fc082f77af Merge branch 'more_guilds_fixes' into 'master'
More guilds fixes

See merge request core-developers/forge!935
2018-09-22 03:42:50 +00:00
tehdiplomat
2435767504 Fix Aurelia 2018-09-21 22:49:51 -04:00
tehdiplomat
744c766852 Convert tokens to script 2018-09-21 22:49:39 -04:00
Michael Kamensky
07e43131c2 Merge branch 'master' into 'master'
Preparing Forge for Android publish 1.6.15.003 [incremental].

See merge request core-developers/forge!934
2018-09-21 19:18:17 +00:00
Agetian
a1e87417f0 - Preparing Forge for Android publish 1.6.15.003 [incremental]. 2018-09-21 22:17:49 +03:00
austinio7116
15cd7c4eab Urban Utopia 2018-09-21 19:00:22 +01:00
austinio7116
de224e78fc Merge branch 'master' into 'master'
GRN: Fixed two cards

See merge request core-developers/forge!931
2018-09-21 06:29:24 +00:00
austinio7116
d4324ae9e1 Merge branch 'guildofravnica' into 'master'
GRN fixes

See merge request core-developers/forge!932
2018-09-21 05:31:44 +00:00
austinio7116
a7041fc767 Removed 0 mana cost from lands 2018-09-21 06:30:21 +01:00
swordshine
600f52537e - Fixed two cards 2018-09-21 12:30:39 +08:00
Michael Kamensky
72f28b6c44 Merge branch 'someSmallFixes' into 'master'
Some small fixes

Closes #720, #715, and #691

See merge request core-developers/forge!928
2018-09-21 04:14:12 +00:00
Michael Kamensky
43af9df723 Merge branch 'card_fixes' into 'master'
GRN fixes

See merge request core-developers/forge!930
2018-09-21 04:14:08 +00:00
tehdiplomat
1dcf66175b Skip tokens for edition tracking 2018-09-20 22:49:30 -04:00