Commit Graph

46850 Commits

Author SHA1 Message Date
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
Rob Schnautz
6c862be67d Update forge-gui/res/cardsfolder/upcoming/blast_from_the_past.txt, forge-gui/res/cardsfolder/upcoming/crow_storm.txt, forge-gui/res/cardsfolder/upcoming/earl_of_squirrel.txt, forge-gui/res/cardsfolder/upcoming/form_of_the_squirrel.txt files 2020-11-18 22:03:26 +00:00
Northmoc
1cb21ab124 fix bad label capitalization 2020-11-18 12:32:47 -05:00
Michael Kamensky
6ef6c07391 Merge branch 'comm_plate' into 'master'
StaticAbility mass keyword building updates for CMR (incl Commander's Plate and Rebbec)

See merge request core-developers/forge!3409
2020-11-18 05:28:35 +00:00
Michael Kamensky
a93703ea55 Merge branch 'ofix' into 'master'
explosion_of_riches.txt with ImmediateTrigger

See merge request core-developers/forge!3412
2020-11-18 05:28:03 +00:00
Michael Kamensky
536568164e Merge branch 'unreal' into 'master'
as discussed, a few unsanctioned cards

See merge request core-developers/forge!3413
2020-11-18 05:27:47 +00:00
Michael Kamensky
6e32baf641 Merge branch 'trench' into 'master'
CMR: Trench Behemoth

See merge request core-developers/forge!3398
2020-11-18 05:27:22 +00:00
Rob Schnautz
70ef98364a as discussed, a few unsanctioned cards 2020-11-17 23:50:56 +00:00
Northmoc
59144873b9 move EachCMCAmongDefined up as well 2020-11-17 15:01:16 -05:00
Northmoc
ab8b3e7a09 add EachCMCAmongDefined multiple keyword builder to StaticAbilityContinuous 2020-11-17 15:01:15 -05:00
Northmoc
dcf6537e32 rebbec_architect_of_ascension.txt 2020-11-17 15:01:15 -05:00
Northmoc
a9c1542d24 move Commander color ID keyword builder to correct spot 2020-11-17 15:01:15 -05:00
Northmoc
ed7955306a streamline other Commander color identity references 2020-11-17 15:01:14 -05:00
Northmoc
34a21d309b add keyword "Protection from CommanderColorID" and "Protection from NotCommanderColorID" support to StaticAbilityContinuous.java 2020-11-17 15:01:14 -05:00
Northmoc
940e95781c add ColorSets "getCommanderColorID" and "getNotCommanderColorID" to Player.java 2020-11-17 15:01:14 -05:00
Northmoc
412cadf63a commanders_plate.txt 2020-11-17 15:01:13 -05:00
Northmoc
2458ca8fdb explosion_of_riches.txt with ImmediateTrigger 2020-11-17 14:34:24 -05:00
Tim Mocny
26b100d62f Merge branch 'ofix' into 'master'
Alharu Oracle fix

See merge request core-developers/forge!3411
2020-11-17 17:07:45 +00:00
Northmoc
859dcf8360 Alharu Oracle fix 2020-11-17 12:04:55 -05:00
Hans Mackowiak
650a0f0101 Merge branch 'attackIfHaste' into 'master'
CombatUtil: turn 'can attack as if Haste' into Static Ability check

See merge request core-developers/forge!3410
2020-11-17 06:48:47 +00:00
Hans Mackowiak
f4df565e55 CombatUtil: turn 'can attack as if Haste' into Static Ability check 2020-11-16 21:16:44 +01:00
Michael Kamensky
caa709f731 Merge branch 'typos' into 'master'
Various small typos and fixes

See merge request core-developers/forge!3408
2020-11-16 18:43:17 +00:00
Michael Kamensky
7842407e34 Merge branch 'kitesail' into 'master'
CMR: kitesail_skirmisher.txt and support

See merge request core-developers/forge!3405
2020-11-16 18:42:56 +00:00
Northmoc
386a525522 hamza_guardian_of_arashin.txt fix 2nd EffectZone 2020-11-16 10:26:52 -05:00
Northmoc
6076f16c69 AI hint while we're at it 2020-11-16 10:26:51 -05:00
Northmoc
1df47ad83f Typos and legion_warboss.txt KW timing 2020-11-16 10:26:51 -05:00
Northmoc
52a84153e7 trench_behemoth.txt final 2020-11-16 10:09:07 -05:00
Tim Mocny
27ef464a20 Merge branch 'fixes' into 'master'
2 small CMR fixes

See merge request core-developers/forge!3407
2020-11-16 12:43:51 +00:00