Commit Graph

38016 Commits

Author SHA1 Message Date
Michael Kamensky
a8977eebcc Merge branch 'assorted-fixes' into 'master'
Nicol Bolas, the Ravager: merge fixes

See merge request core-developers/forge!699
2018-07-01 04:24:37 +00:00
Agetian
060bd0261f - Merge fixes for Nicol Bolas, the Ravager. 2018-07-01 07:23:51 +03:00
austinio7116
989404d4f0 Fixed bolas second ability to correct targets 2018-06-30 19:22:40 +01:00
austinio7116
da23cbf28d Corrected name of bolas in the editions file 2018-06-30 19:02:27 +01:00
austinio7116
43aba315e8 Added planeswalker$ true to +2 ability 2018-06-30 18:59:12 +01:00
Michael Kamensky
7ee51141d6 Merge branch 'autumn_veil' into 'master'
CantBeCounteredBy : make Autumns veil card text changing work

See merge request core-developers/forge!697
2018-06-30 17:12:58 +00:00
Agetian
b215bc6a39 - Autumn's Veil: Make sure the SVar name for effect ability does not contain color names in it so that it's not replaced (which leads to a crash). 2018-06-30 20:03:11 +03:00
Hanmac
ab32251643 ForgeScript: add missing connector to HostCard 2018-06-30 17:50:50 +02:00
Hanmac
c37701ef1e CantBeCounteredBy : make Autumns veil card text changing work 2018-06-30 17:45:04 +02:00
Michael Kamensky
7c97129dcf Merge branch 'NicolBolas' into 'master'
Nicol bolas

See merge request core-developers/forge!696
2018-06-30 13:54:57 +00:00
Michael Kamensky
e510f1de50 - Fixed Nicol Bolas, the Ravager. 2018-06-30 16:53:33 +03:00
austinio7116
0394e4dff7 Nicol Bolas, the Ravager - added InTargetedLibrary for Xcounts 2018-06-30 11:53:01 +01:00
Michael Kamensky
419cfc1f39 Merge branch 'm19' into 'master'
Add green cards

See merge request core-developers/forge!694
2018-06-29 18:15:28 +00:00
Agetian
6b29ad054b - A couple minor fixes. 2018-06-29 21:02:57 +03:00
Michael Kamensky
1456639ba9 Merge branch 'm19draft' into 'master'
M19draft

See merge request core-developers/forge!693
2018-06-29 17:11:02 +00:00
Rob Schnautz
4b9586ad8d Merge branch 'master' into 'm19' 2018-06-29 15:40:15 +00:00
schnautzr
1db51b7cfb Add green cards 2018-06-29 10:36:57 -05:00
maustin
5742c8eb23 Merge remote-tracking branch 'Austin/m19draft' into m19draft
# Conflicts:
#	forge-gui/res/draft/rankings.txt
2018-06-29 15:36:26 +01:00
austinio7116
71778ea3d8 Initial draft rankings for M19 2018-06-29 15:35:09 +01:00
austinio7116
dbbf70cd35 Initial draft rankings for M19 2018-06-29 09:24:48 +01:00
Michael Kamensky
f64293c92d Merge branch 'master' into 'master'
Minor update: added a break statement to GuiChoose.

See merge request core-developers/forge!692
2018-06-29 05:56:17 +00:00
Agetian
fe49c460eb - Added a break statement to GuiChoose. 2018-06-29 08:55:41 +03:00
Michael Kamensky
689d9af022 Merge branch 'changeZoneCauseTrigger' into 'master'
TriggerChangesZone: add ValidCause parameter

See merge request core-developers/forge!691
2018-06-29 05:54:02 +00:00
Hans Mackowiak
9a0c6b2ed0 Merge branch 'cardFacePredicate' into 'master'
CardFacePredicate: use new valid Predicate

See merge request core-developers/forge!690
2018-06-29 05:43:39 +00:00
Agetian
046f1019f5 - Vivien's Invocation: force reveal to controller (for "Look at the top seven cards..."). 2018-06-29 08:43:14 +03:00
Hanmac
543450d859 TriggerChangesZone: add ValidCause parameter 2018-06-29 07:15:28 +02:00
Agetian
eafc717dd8 - GuiChoose (desktop Forge): show the right card face in the card detail panel when choosing a card name. 2018-06-29 08:08:03 +03:00
Michael Kamensky
7b64fa487b Merge branch 'm19' into 'master'
Add red cards

See merge request core-developers/forge!689
2018-06-29 03:39:23 +00:00
Hanmac
d890ee248c CardFacePredicate: use new valid Predicate 2018-06-28 22:40:16 +02:00
schnautzr
d3d84db23d Add red cards 2018-06-28 08:53:16 -05:00
Michael Kamensky
db9114986f Merge branch 'm19scripts_5' into 'master'
M19scripts Chromium and Arcades Elder Dragons

See merge request core-developers/forge!688
2018-06-28 08:41:15 +00:00
austinio7116
815150de4e Update chromium_the_mutable.txt - removed permanent flag 2018-06-28 07:55:25 +00:00
austinio7116
1d797ebe80 M19: Chromium, the Mutable 2018-06-27 21:53:02 +01:00
austinio7116
e65f8e490e M19: Arcades, the Strategist 2018-06-27 21:39:20 +01:00
Michael Kamensky
e91a82c775 Merge branch 'm19_multicolourscripts' into 'master'
M19 multicolourscripts part 1

See merge request core-developers/forge!687
2018-06-27 09:56:28 +00:00
Michael Kamensky
ef751a2e11 Merge branch 'm19' into 'master'
M19 cards

See merge request core-developers/forge!686
2018-06-27 09:53:53 +00:00
Michael Kamensky
9ce48be89b Merge branch 'm19_scripts_4' into 'master'
M19 scripts - remaining artifacts

See merge request core-developers/forge!684
2018-06-27 09:53:27 +00:00
austinio7116
a0b092c544 M19: Aerial Engineer 2018-06-27 08:04:26 +01:00
austinio7116
dce0cfafae M19: Brawl-Bash Ogre 2018-06-27 07:57:50 +01:00
austinio7116
79dd082e00 M19: Draconic Disciple 2018-06-27 07:40:05 +01:00
austinio7116
9cc764188f M19: Heroic Reinforcements 2018-06-27 06:54:18 +01:00
austinio7116
63874041b4 M19: Poison-tip Archer 2018-06-27 06:33:54 +01:00
Michael Kamensky
bfffb5114c Merge branch 'metamorphic-alteration' into 'master'
Metamorphic alteration

See merge request core-developers/forge!685
2018-06-27 05:00:44 +00:00
austinio7116
f8de4ffc2d M19: Psychic Symbiont 2018-06-26 23:57:16 +01:00
austinio7116
d9b1dfef76 M19 Satyr Enchanter 2018-06-26 23:32:12 +01:00
austinio7116
a56e760d36 M19 Regal Bloodlord 2018-06-26 23:31:45 +01:00
austinio7116
69b1e15d4c Arcane Encyclopedia added missed line 2018-06-26 22:25:06 +01:00
schnautzr
91ce89acef The blue cards. 2018-06-26 16:18:39 -05:00
schnautzr
dcb02999b4 Add support for enchantments that make things clones until unattached. 2018-06-26 23:18:17 +02:00
austinio7116
6782adc545 M19 Script Chaos Ward 2018-06-26 21:04:43 +01:00