Commit Graph

46850 Commits

Author SHA1 Message Date
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
Northmoc
5a7fb36fee update zh-CN.properties 2020-11-11 04:13:49 -05:00
Northmoc
2c675d7efc Support for "AddStaticAbilities" 2020-11-11 04:07:18 -05:00
Northmoc
29933606ed sakashima_of_a_thousand_faces.txt 2020-11-11 04:01:39 -05:00
Hans Mackowiak
b0a82c127e fix Undying and Persist again 2020-11-11 09:14:56 +01:00
Hans Mackowiak
ccd66fc5d8 GameAction: fix clearControllers for the moved card, keep targets in tact 2020-11-11 08:29:24 +01:00
Northmoc
f24c3c321c support mana burn global rule 2020-11-11 02:15:36 -05:00
Northmoc
305cc1a735 yurlok_of_scorch_thrash.txt 2020-11-11 02:14:58 -05:00
Northmoc
ca635297ee lathiel_the_bounteous_dawn.txt 2020-11-11 01:35:33 -05:00
Northmoc
20596945bc promise_of_tomorrow.txt 2020-11-11 01:35:33 -05:00
Northmoc
9ce4f266ce kangees_lieutenant.txt 2020-11-11 01:35:32 -05:00
Northmoc
6485fa456b gilanra_caller_of_wirewood.txt 2020-11-11 01:35:32 -05:00
Northmoc
2fc971332d armored_skyhunter.txt 2020-11-11 01:35:31 -05:00
Northmoc
b2258f748f Add "Do you want to end the turn?" prompt 2020-11-11 01:29:28 -05:00
Northmoc
87e8225949 - add reminder text to StackDesc 2020-11-11 01:28:13 -05:00
Northmoc
a89f2bc1d9 EndTurnEffect - Optional and Defined support 2020-11-11 01:27:11 -05:00
Northmoc
08392d7fab obeka_brute_chronologist.txt 2020-11-11 01:26:34 -05:00
Northmoc
8961960587 aura_finesse.txt 2020-11-10 23:22:33 -05:00
Northmoc
1e6d2e7de2 nicol_bolas_god_pharaoh.txt - tighten up script and stack descriptions 2020-11-10 23:22:32 -05:00
Northmoc
4875dbd462 fix various Stack Descriptions 2020-11-10 23:22:32 -05:00
Northmoc
80dcffacc8 the_prismatic_piper.txt correct Oracle 2020-11-10 23:22:31 -05:00
Michael Kamensky
bfdeeade84 Merge branch 'sphinx2nd' into 'master'
CMR: Sphinx of the Second Sun

See merge request core-developers/forge!3371
2020-11-11 04:08:31 +00:00
Michael Kamensky
0e57d35e16 Merge branch 'nevin' into 'master'
CMR: Nevinyrral, Urborg Tyrant

See merge request core-developers/forge!3372
2020-11-11 04:08:05 +00:00
Michael Kamensky
64cfa70c6e Merge branch 'jared' into 'master'
CMR: Jared, True Hair Metal Band and support for "you can't become monarch"

See merge request core-developers/forge!3376
2020-11-11 04:07:49 +00:00
Michael Kamensky
e59ad09ca1 Merge branch 'fixChangeZoneTriggerNewCard' into 'master'
TriggerChangesZone: add NewCard for leave the battlefield trigger

See merge request core-developers/forge!3373
2020-11-11 04:07:04 +00:00
Hans Mackowiak
f0ed3f095d TriggerChangesZone: add NewCard for leave the battlefield trigger 2020-11-11 04:07:04 +00:00
Northmoc
0639f9c8e5 add Count for TokensCreatedThisTurn 2020-11-10 19:16:21 -05:00
Northmoc
3efb6a7582 thalisse_reverent_medium.txt 2020-11-10 19:14:07 -05:00