Commit Graph

39874 Commits

Author SHA1 Message Date
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
tehdiplomat
deff49452c GRN fixes 2018-09-20 22:11:51 -04:00
Sol
0d7328da92 Merge branch 'guildofravnica' into 'master'
Guilds of Ravnica cards, editions file and block data

See merge request core-developers/forge!927
2018-09-21 01:39:10 +00:00
austinio7116
b3750d98d4 final GRN editions file 2018-09-20 22:17:12 +01:00
austinio7116
a702da5d2f Added 2 missing cards - removed experimenetal frenzy for now 2018-09-20 22:15:33 +01:00
austinio7116
12236efa70 Clean up Knight of Autumn description 2018-09-20 14:32:09 +01:00
austinio7116
57a24ae697 Fixe smelt-ward minotaur name 2018-09-20 13:01:19 +01:00
austinio7116
2cd2ae6968 Fix Devious Cover-Up name 2018-09-20 12:55:07 +01:00
austinio7116
3674ebff1b Fix knight of autumn ETB Trigger 2018-09-20 12:48:52 +01:00
austinio7116
3b2fd67257 Removed duplicate card 2018-09-20 08:34:41 +01:00
austinio7116
b6b270f979 Removed duplicate card 2018-09-20 08:33:08 +01:00
austinio7116
54f1fdb453 Update to Pilfering Imp
(cherry picked from commit 78965c1)
2018-09-19 23:11:10 +01:00
austinio7116
3ceec24a86 Added anyplayer to Nullhide Ferox 2018-09-19 22:44:41 +01:00
austinio7116
0f8d711adf Fixed sworn companions missing cost 2018-09-19 22:41:57 +01:00
austinio7116
8a0fc39d16 Fixed dazzling lights 2018-09-19 22:40:12 +01:00
austinio7116
a69cdf37ae First draft of GRN blockdata and draft rankings 2018-09-19 22:32:38 +01:00
austinio7116
64907dda5c Final GRN editions file 2018-09-19 20:53:33 +01:00
austinio7116
80ed37033b Verdani Shieldmate 2018-09-19 20:27:45 +01:00
austinio7116
b1cd294052 Final day spoilers that forgescribe did well on - only a few minor fixes required 2018-09-19 20:26:08 +01:00
Michael Kamensky
2d1bd4d541 Merge branch 'patch-1' into 'master'
Upate cleanUpTemporaryTriggers to prevent Modification Exception

See merge request core-developers/forge!929
2018-09-19 17:46:45 +00:00
Hans Mackowiak
a28c010b59 Upate cleanUpTemporaryTriggers to prevent Modification Exception 2018-09-19 08:02:54 +00:00