Commit Graph

46877 Commits

Author SHA1 Message Date
paul_snoops
7d17455a8b Kaladesh Remastered support 2020-11-14 11:36:49 +00:00
Hans Mackowiak
c50f34b356 Merge branch 'expd' into 'master'
Expedition Diviner with static

See merge request core-developers/forge!3147
2020-11-14 10:48:58 +00:00
Tim Mocny
34dd341912 Expedition Diviner with static 2020-11-14 10:48:57 +00:00
Northmoc
ccf34e875a adventurers_guildhouse.txt AI 2020-11-13 23:37:31 -05:00
Michael Kamensky
fbab587aad Merge branch 'cmr13' into 'master'
CMR - 13 Nov

See merge request core-developers/forge!3393
2020-11-14 04:00:54 +00:00
Michael Kamensky
202fafd80f Merge branch 'patch-6' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3394
2020-11-14 04:00:02 +00:00
Michael Kamensky
56c5bdc51c Merge branch 'misfortune' into 'master'
CMR: Wheel of Misfortune and support

See merge request core-developers/forge!3392
2020-11-14 03:59:45 +00:00
Hans Mackowiak
bc56ebb3dd SpellAbilityEffect: Attacking needs to set BandOfAttacker as not blocked 2020-11-14 00:35:10 +01:00
Northmoc
29c34dd14b kwain_itinerant_meddler.txt 2020-11-13 18:21:21 -05:00
Andreas Bendel
769fc48783 Update de-DE.properties
lblDoYouWantEndTurn new
2020-11-13 19:57:53 +00:00
Northmoc
1fb6e80ea9 hamza_guardian_of_arashin.txt 2020-11-13 13:21:26 -05:00
Northmoc
4833e0b93e slurrk - combined trigger! 2020-11-13 12:59:29 -05:00
Northmoc
11af10a102 captain_vargus_wrath.txt 2020-11-13 12:55:30 -05:00
Northmoc
acc235f1b2 slurrk_all_ingesting.txt 2020-11-13 12:55:30 -05:00
Hans Mackowiak
8458efa688 TriggerChangesZone: fix ActiveZone Detection 2020-11-13 18:39:59 +01:00
Hans Mackowiak
9fc68386f6 Merge branch '1632-card-bug-generous-gift-gives-token-to-wrong-player' into 'master'
Resolve "Card Bug: Generous Gift gives token to wrong player"

Closes #1632

See merge request core-developers/forge!3382
2020-11-13 17:24:21 +00:00
Northmoc
0284651488 NotLowest param support 2020-11-13 10:35:50 -05:00
Northmoc
8f4fbcf805 HighestLoseLife AI support 2020-11-13 10:35:49 -05:00
Northmoc
f217cab0b9 wheel_of_misfortune.txt 2020-11-13 10:35:49 -05:00
Hans Mackowiak
cd8b8e8fb2 CardFactory: fix extra Abilities being cloneable 2020-11-13 10:57:10 +01:00
Michael Kamensky
83caf74105 Merge branch 'cmr12' into 'master'
CMR - 12 Nov

See merge request core-developers/forge!3387
2020-11-13 04:44:05 +00:00
Michael Kamensky
4399fa30e5 Merge branch 'cmr11' into 'master'
CMR - 11 Nov

See merge request core-developers/forge!3388
2020-11-13 04:43:35 +00:00
Michael Kamensky
89aed5cf84 Merge branch 'protectionCleanup' into 'master'
Protection: cleanup some cases for Card

See merge request core-developers/forge!3389
2020-11-13 04:43:05 +00:00
Northmoc
fc1757b824 toggo_goblin_weaponsmith.txt and rock.txt 2020-11-12 19:59:06 -05:00
Northmoc
fa9b7affda explosion_of_riches.txt 2020-11-12 18:56:23 -05:00
Northmoc
3e7ba5ff7e explosion_of_riches.txt 2020-11-12 18:37:37 -05:00
Hans Mackowiak
455d32b707 cards: fix jeska thrice reborn 2020-11-12 22:03:57 +01:00
Hans Mackowiak
d9c076c2bc Merge branch '1636-cycle-shark-typhoon-don-t-create-token' into 'master'
Resolve "cycle 'Shark Typhoon' don't create token"

Closes #1636

See merge request core-developers/forge!3390
2020-11-12 10:28:48 +00:00
Hans Mackowiak
fc5ba80531 Shark Typhoon: Fix TriggerZones for Cycled 2020-11-12 10:28:11 +00:00
Hans Mackowiak
a62fc27a21 Protection: cleanup some cases for Card 2020-11-12 09:49:03 +01:00
Northmoc
d314f25882 ardenn_intrepid_archaeologist.txt 2020-11-12 00:17:13 -05:00
Northmoc
6e670def23 anointer_of_valor.txt 2020-11-12 00:17:13 -05:00
Northmoc
40fc81576d reyav_master_smith.txt 2020-11-12 00:16:17 -05:00
Northmoc
dfddffc5c3 sakashimas_will.txt 2020-11-12 00:16:17 -05:00
Northmoc
a03c3b9596 rootweaver_druid.txt 2020-11-12 00:16:16 -05:00
Northmoc
36c7abdb88 alharu_solemn_ritualist.txt (Marvel) 2020-11-12 00:16:16 -05:00
Michael Kamensky
e73111e63a Merge branch 'sakashima' into 'master'
CMR: Sakashima of a Thousand Faces and support

See merge request core-developers/forge!3383
2020-11-12 03:57:47 +00:00
Michael Kamensky
c8d3c0a115 Merge branch 'cmr12' into 'master'
CMR - 12 Nov

See merge request core-developers/forge!3386
2020-11-12 03:57:24 +00:00
Michael Kamensky
514e0d2ed2 Merge branch 'yurlok' into 'master'
CMR: Yurlok of Scorch Thrash and support (Mana burn!)

See merge request core-developers/forge!3381
2020-11-12 03:56:49 +00:00
Northmoc
698c4971ba akroma_vision_of_ixidor.txt 2020-11-11 22:42:45 -05:00
Hans Mackowiak
0b6149265b Merge branch 'benev' into 'master'
CMR: Benevolent Blessing and support for multiple protection exceptions

See merge request core-developers/forge!3385
2020-11-12 00:53:11 +00:00
Northmoc
6163d0c1d5 brudiclad_telchor_engineer.txt whitespace 2020-11-11 17:05:35 -05:00
Northmoc
6536c65c0b brudiclad_telchor_engineer.txt tidy and AI 2020-11-11 17:05:09 -05:00
Northmoc
742c241995 benevolent_blessing.txt + support for multiple protection exceptions 2020-11-11 16:01:03 -05:00
Michael Kamensky
862fd7a0d3 Merge branch 'thalisse' into 'master'
CMR: Thalisse, Reverent Medium and support

See merge request core-developers/forge!3377
2020-11-11 17:01:47 +00:00
Michael Kamensky
de670998ed Merge branch 'obeka' into 'master'
CMR: Obeka, Brute Chronologist and support

See merge request core-developers/forge!3379
2020-11-11 17:01:35 +00:00
Michael Kamensky
4fc16f71a1 Merge branch 'cleanup' into 'master'
Various cleanup

See merge request core-developers/forge!3378
2020-11-11 17:01:28 +00:00
Michael Kamensky
4aa910064d Merge branch 'cmr10' into 'master'
CMR - 10 Nov

See merge request core-developers/forge!3380
2020-11-11 17:01:00 +00:00
Tim Mocny
2af5c0644f Merge branch 'scryReplace' into 'master'
ReplaceScry: RE for Eligeth

See merge request core-developers/forge!3384
2020-11-11 13:54:31 +00:00
Hans Mackowiak
50c460d446 ReplaceScry: RE for Eligeth 2020-11-11 13:12:59 +01:00