Commit Graph

46850 Commits

Author SHA1 Message Date
Michael Kamensky
b385ac22d1 Merge branch 'araumi' into 'master'
CMR: Araumi and support

See merge request core-developers/forge!3339
2020-11-06 08:39:12 +00:00
Michael Kamensky
7d53d35446 Merge branch 'cmr4' into 'master'
CMR - 4 Nov

See merge request core-developers/forge!3337
2020-11-06 08:38:37 +00:00
Michael Kamensky
424e63d54b Merge branch 'patch-8' into 'master'
Update borderlessCardList.txt

See merge request core-developers/forge!3340
2020-11-06 08:36:06 +00:00
Anthony Calosa
110adc4c83 Update borderlessCardList.txt 2020-11-05 22:41:46 +00:00
Northmoc
1f3dc0ac57 - remove Keyword:CardManaCost when targeted card has no mana cost 2020-11-05 16:06:44 -05:00
Michael Kamensky
2d6933ebff Merge branch 'triggerfix' into 'master'
Fix TriggerTapsForMana Produced param

See merge request core-developers/forge!3338
2020-11-05 19:32:51 +00:00
Michael Kamensky
a2d8ff51f3 Merge branch 'master' into 'master'
Loading Overlay for Deck Editor

See merge request core-developers/forge!3335
2020-11-05 19:28:12 +00:00
Hans Mackowiak
386260ea0d fix spell ability copies only on stack when spells 2020-11-05 20:22:32 +01:00
Northmoc
1d97a96e8f - clean up code a little 2020-11-05 13:56:48 -05:00
Northmoc
26cf4d8b4c araumi_of_the_dead_tide.txt 2020-11-05 13:52:03 -05:00
Northmoc
4a73eb9655 add Encore to list 2020-11-05 13:51:47 -05:00
Northmoc
095ecb5c5b support "CardManaCost" in Pump keywords 2020-11-05 13:51:28 -05:00
Northmoc
f4c13134f4 java fix 2020-11-05 11:29:34 -05:00
Northmoc
5f5b55701a feast_of_succession.txt (medusa) 2020-11-05 08:48:09 -05:00
Northmoc
df054f2a4b elvish_doomsayer.txt (medusa) 2020-11-05 08:48:09 -05:00
Northmoc
6d55add686 new contributors 2020-11-05 08:48:08 -05:00
Northmoc
24ce4e212e sakashimas_protege.txt (Cheese) 2020-11-05 08:48:08 -05:00
Northmoc
412882b733 CMR AI Zombie hint 2020-11-05 08:48:07 -05:00
Northmoc
557fb76412 necrotic_hex.txt fix cost 2020-11-05 08:48:07 -05:00
Northmoc
c2d8bec82e numa_joraga_chieftain.txt 2020-11-05 08:48:07 -05:00
Anthony Calosa
493eff3d27 Loading overlay for Deck Editor 2020-11-05 17:04:45 +08:00
Michael Kamensky
e131da0709 Merge branch 'attackingUnify' into 'master'
SpellAbilityEffect: unify Attacking options

See merge request core-developers/forge!3333
2020-11-05 04:13:02 +00:00
Sol
373b32af09 Merge branch 'valakut' into 'master'
valakut_exploration.txt ruling conformance

See merge request core-developers/forge!3334
2020-11-04 21:32:35 +00:00
Northmoc
7c435f4f4e valakut_exploration.txt ruling conformance 2020-11-04 16:08:58 -05:00
Hans Mackowiak
a59071dbd6 Merge branch 'slashfix' into 'master'
add CardProperty IsNotCommander (fixes Slash the Ranks for AI)

See merge request core-developers/forge!3332
2020-11-04 19:46:14 +00:00
Tim Mocny
85357aba2c add CardProperty IsNotCommander (fixes Slash the Ranks for AI) 2020-11-04 19:46:14 +00:00
Hans Mackowiak
feefe62047 SpellAbilityEffect: unify Attacking options 2020-11-04 20:43:40 +01:00
Michael Kamensky
b664c2393e Merge branch 'zara' into 'master'
CMR: Zara and ChangeZoneEffect support

See merge request core-developers/forge!3330
2020-11-04 15:41:21 +00:00
Michael Kamensky
063fe04b9f Merge branch '1568-znr-copy-permanent-spell' into 'master'
Resolve "ZNR: Copy Permanent Spell"

Closes #1370 and #1568

See merge request core-developers/forge!3232
2020-11-04 08:56:41 +00:00
Hans Mackowiak
9b040b063b - DelayedTriggerAi: port over AILogic NarsetRebound and SpellCopy (the latter doesn't quite work yet and the spell somehow magically fizzles with no trace). 2020-11-04 08:56:41 +00:00
Michael Kamensky
d5639f5395 Merge branch 'hans' into 'master'
CMR: Hans and support

See merge request core-developers/forge!3324
2020-11-04 04:24:56 +00:00
Michael Kamensky
5cf50c3fb2 Merge branch 'gor_muldrak' into 'master'
CMR: Gor Muldrak and support

See merge request core-developers/forge!3329
2020-11-04 04:24:12 +00:00
Michael Kamensky
d9a5ea3bea Merge branch 'cmr3' into 'master'
CMR - 3 Nov

See merge request core-developers/forge!3331
2020-11-04 04:23:21 +00:00
Michael Kamensky
f7d4e803f2 Merge branch 'cmr2' into 'master'
CMR - 2 Nov

See merge request core-developers/forge!3328
2020-11-04 04:21:39 +00:00
Northmoc
114727e51f hullbreacher.txt (medusa) 2020-11-03 18:30:10 -05:00
Northmoc
73c5e06e94 esior_wardwing_familiar.txt (medusa) 2020-11-03 18:29:54 -05:00
Northmoc
1b8342af64 laboratory_drudge.txt simpler 2020-11-03 14:35:40 -05:00
Northmoc
85658fb259 laboratory_drudge.txt 2020-11-03 14:34:08 -05:00
Northmoc
5137086633 mnemonic_deluge.txt minor tweaks 2020-11-03 13:57:19 -05:00
Northmoc
37ad7daa3a port_razer.txt (medusa) 2020-11-03 11:34:41 -05:00
Hans Mackowiak
0cd02662f9 CantPlayLand: fix MDFC 2020-11-03 13:10:05 +01:00
Northmoc
15fc7c4d60 AI update 2020-11-03 01:40:51 -05:00
Northmoc
54e59bc17c zara_renegade_recruiter.txt and ChangeZoneEffect support 2020-11-03 01:35:52 -05:00
Michael Kamensky
2dd6f4ca63 Merge branch 'cascadeFix' into 'master'
Cascade: fix Maelstrom Nexus and Golos

See merge request core-developers/forge!3326
2020-11-03 04:41:14 +00:00
Michael Kamensky
08938cd41e Merge branch 'master' into 'master'
update chinese characters

See merge request core-developers/forge!3327
2020-11-03 04:40:54 +00:00
Northmoc
55a62fb27d sweet_gum_recluse.txt 2020-11-02 22:03:44 -05:00
Northmoc
16e1212413 keleth_sunmane_familiar.txt 2020-11-02 22:03:28 -05:00
Northmoc
2d8d42ef4c rograkh_son_of_rohgahh.txt 2020-11-02 21:46:38 -05:00
Northmoc
4ce9b75fde livio_oathsworn_sentinel.txt and aegis counter 2020-11-02 21:41:49 -05:00
Northmoc
2a459361df ghen_arcanum_weaver.txt (Benjamin) 2020-11-02 18:32:07 -05:00