Commit Graph

46877 Commits

Author SHA1 Message Date
Michael Kamensky
4e8ab9a087 Merge branch 'delayedTriggerX' into 'master'
DelayedTriggerEffect: make the trigger remember the spawning Ability

See merge request core-developers/forge!3427
2020-11-23 04:39:00 +00:00
Michael Kamensky
d20ad9f92b Merge branch 'fixes' into 'master'
Fixes - 22 Nov

See merge request core-developers/forge!3426
2020-11-23 04:38:22 +00:00
Hans Mackowiak
aee2bb3ffe DelayedTriggerEffect: make the trigger remember the spawning Ability 2020-11-22 23:01:29 +01:00
Hans Mackowiak
736f527179 CardFactoryUtil: fix Rebound replacement 2020-11-22 22:50:28 +01:00
Northmoc
f4a5001f55 ephemerate.txt cleanup 2020-11-22 16:34:56 -05:00
Hans Mackowiak
b63730141c fix Yidaro Cycling 2020-11-22 22:22:20 +01:00
Northmoc
5e231f4e54 oracle fix 2020-11-22 15:15:45 -05:00
Hans Mackowiak
b6dce3dd01 Merge branch 'counterfix' into 'master'
CountersPutEffect - lock targeted out of this "if"

See merge request core-developers/forge!3425
2020-11-22 18:40:46 +00:00
Northmoc
b0a1014ce4 lock targeted out of this "if" 2020-11-22 08:46:44 -05:00
Michael Kamensky
b90a377fef Merge branch 'pako-haldan' into 'master'
C20: Pako & Haldan play fetch!!

Closes #1365

See merge request core-developers/forge!2729
2020-11-22 12:29:57 +00:00
Tim Mocny
757c9208d9 C20: Pako & Haldan play fetch!! 2020-11-22 12:29:56 +00:00
Hans Mackowiak
ba37bf2312 PlayerController: fix copy activated abilities 2020-11-22 12:18:13 +01:00
Michael Kamensky
db7291b781 Merge branch 'patch-6' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3424
2020-11-22 05:10:04 +00:00
Michael Kamensky
535f6a806e Merge branch 'cmrdraft' into 'master'
CMR limited housekeeping

See merge request core-developers/forge!3416
2020-11-22 05:10:02 +00:00
Hans Mackowiak
f0ed87eb18 CardFactoryUtil: fix Epic trigger MayChooseTarget 2020-11-21 22:31:11 +01:00
Northmoc
e40a37b6f2 add CMR to blocks.txt 2020-11-21 15:20:05 -05:00
Northmoc
d702eaa015 add CMR Foils and CMR Legendaries 2020-11-21 15:20:05 -05:00
Northmoc
528d664ea1 Adding booster contents 2020-11-21 15:20:04 -05:00
Andreas Bendel
2477eced1e Update de-DE.properties
new "lblHowManyCountersThis" translation
2020-11-21 19:43:36 +00:00
Michael Kamensky
0077b39c53 Merge branch 'taprefactor' into 'master'
ETBTapped refactor (+Archelos)

See merge request core-developers/forge!3403
2020-11-21 06:06:40 +00:00
Michael Kamensky
838787d781 Merge branch 'untypo' into 'master'
typos in Un editions

See merge request core-developers/forge!3423
2020-11-21 06:05:04 +00:00
Northmoc
ae91e7e178 remove static ETBTapped code 2020-11-21 00:23:55 -05:00
Northmoc
a4bd8c29c3 refactor existing static ETBTapped cards to replacement effect 2020-11-21 00:23:55 -05:00
Northmoc
7e5b9d2dd7 archelos_lagoon_mystic.txt 2020-11-21 00:23:54 -05:00
Northmoc
37391f42a0 Add "Untapped" param to ChangeZoneEffect 2020-11-21 00:23:53 -05:00
Northmoc
77f4cb7cc4 typos in Un editions 2020-11-21 00:21:42 -05:00
Hans Mackowiak
91ded04bb2 TokenEffectBase: don't use GameState for Remember there 2020-11-20 22:45:34 +01:00
Hans Mackowiak
bba404ea78 EffectEffect: set ActiveZone for CardTraits when created in CommandZone 2020-11-20 22:38:16 +01:00
Michael Kamensky
1121462d33 Merge branch 'vastwood' into 'master'
CMR/C20: Non-targeting hydras (Vastwood & Stumpsquall)

See merge request core-developers/forge!3414
2020-11-20 04:54:19 +00:00
Michael Kamensky
13b7414790 Merge branch 'klrdraft' into 'master'
enable KLR limited

See merge request core-developers/forge!3417
2020-11-20 04:53:31 +00:00
Michael Kamensky
9a290609b8 Merge branch 'patch-6' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3422
2020-11-20 04:52:56 +00:00
Northmoc
137db4d2ee enable KLR draft 2020-11-19 18:45:16 -05:00
Northmoc
1ec6acb9d6 update zh-CN.properties 2020-11-19 18:41:15 -05:00
Northmoc
3efaf9b78c tidy up code 2020-11-19 18:41:14 -05:00
Northmoc
6ac97e0378 cleanup script 2020-11-19 18:41:13 -05:00
Northmoc
02d888c6d5 + MinChoiceAmount 2020-11-19 18:41:13 -05:00
Northmoc
24a2a569f7 CountersPutEffect almost there 2020-11-19 18:41:12 -05:00
Northmoc
5dc9faa45c new prompt 2020-11-19 18:41:12 -05:00
Northmoc
f33c48ab2f stumpsquall_hydra.txt 2020-11-19 18:41:11 -05:00
Northmoc
b08a0ca52d stumpsquall_hydra.txt 2020-11-19 18:41:10 -05:00
Northmoc
aab067f715 vastwood_hydra.txt initial fixes 2020-11-19 18:41:09 -05:00
Andreas Bendel
24c397d5cd Update de-DE.properties
fixed typo
2020-11-19 20:03:09 +00:00
Hans Mackowiak
3ee6dae070 fix missmatching equals type 2020-11-19 11:51:58 +01:00
swordshine
d266249957 Merge branch 'test' into 'master'
Old Fogey fix

See merge request core-developers/forge!3421
2020-11-19 09:43:51 +00:00
paul_snoops
33fd24216b Old Fogey fix 2020-11-19 09:21:30 +00:00
Hans Mackowiak
590f5d775b MagicStack: fix cards fizzle when removing not all targets 2020-11-19 09:50:31 +01:00
Michael Kamensky
ffb69ae5e4 Merge branch 'typo' into 'master'
fix bad label capitalization

See merge request core-developers/forge!3415
2020-11-19 06:48:41 +00:00
Michael Kamensky
c8909de8a9 Merge branch 'double-pick' into 'master'
Double Pick each pass

See merge request core-developers/forge!3420
2020-11-19 06:47:53 +00:00
friarsol
3ba8892c4f Double Pick each pass 2020-11-18 18:13:33 -05:00
Rob Schnautz
1a5cc99249 Merge branch 'token-fix' into 'master'
Update forge-gui/res/cardsfolder/upcoming/blast_from_the_past.txt,...

See merge request core-developers/forge!3418
2020-11-18 22:04:45 +00:00