Commit Graph

55234 Commits

Author SHA1 Message Date
tool4EvEr
095b4f4657 Fix Pramikon applying when no direction was chosen 2022-01-09 12:42:31 +01:00
Anthony Calosa
f70f7c6e9c Merge remote-tracking branch 'core/master' 2022-01-09 19:39:48 +08:00
Michael Kamensky
70859ac8a8 Merge branch 'staticfix' into 'master'
Fix Statics adding statics

See merge request core-developers/forge!6029
2022-01-09 11:30:01 +00:00
Anthony Calosa
c5a143e0e2 Merge remote-tracking branch 'core/master' 2022-01-09 19:22:18 +08:00
Anthony Calosa
4629b7e2fe Merge remote-tracking branch 'core/master' 2022-01-09 19:16:52 +08:00
Michael Kamensky
734a72e438 Merge branch 'master' into 'master'
Net Decks Archive Updates

See merge request core-developers/forge!6028
2022-01-09 11:16:33 +00:00
Anthony Calosa
1a57684a44 Disable missingcards cache for desktop
- for compatibility with autodownloader
2022-01-09 19:06:26 +08:00
tool4EvEr
9b67d0e58e Fix Statics adding statics 2022-01-09 11:18:32 +01:00
Churrufli
c67f8454b7 Net Decks Archive Updates 2022-01-09 08:46:03 +01:00
Michael Kamensky
5cb1c91b85 Merge branch 'butcher' into 'master'
Butcher Orgg also works when blocking

See merge request core-developers/forge!6026
2022-01-09 05:14:49 +00:00
Hans Mackowiak
9ffd9c4734 Merge branch 'cardpatch' into 'master'
Fix keyword capitalization

Closes #2062

See merge request core-developers/forge!6027
2022-01-08 21:17:40 +00:00
tool4EvEr
fa03035315 Fix keyword capitalization 2022-01-08 21:10:43 +01:00
tool4EvEr
07f6d5f1ed Butcher Orgg also works when blocking 2022-01-08 17:57:36 +01:00
Bug Hunter
c0fe556595 Merge branch 'imports' into 'master'
Fix imports

See merge request core-developers/forge!6025
2022-01-08 11:14:26 +00:00
tool4EvEr
5e0c27c8e0 Fix imports 2022-01-08 12:13:44 +01:00
Michael Kamensky
5995c1c834 Merge branch 'blockcost' into 'master'
Fix enforced blocking requirement when blocker can't block without cost

See merge request core-developers/forge!6024
2022-01-08 10:39:57 +00:00
Michael Kamensky
9a2b8f7017 Merge branch 'aifix' into 'master'
Fix some bad params in AI combat trigger prediction

See merge request core-developers/forge!6023
2022-01-08 10:34:06 +00:00
tool4EvEr
2a71833526 Fix enforced blocking requirement when blocker can't block without cost 2022-01-08 11:32:54 +01:00
tool4EvEr
8d1049beac Fix some bad params in AI combat trigger prediction 2022-01-07 23:34:55 +01:00
Bug Hunter
0e58a54834 Merge branch 'fix' into 'master'
add addLeavesPlayCommand to "UntilUnattached"

See merge request core-developers/forge!6022
2022-01-07 19:40:21 +00:00
Northmoc
5c08d221a4 add addLeavesPlayCommand to "UntilUnattached" 2022-01-07 12:31:04 -05:00
Northmoc
a90f04c0fd ChooseCardNameEffect workaround to handle X in "ValidCards" 2022-01-07 12:21:24 -05:00
Northmoc
a1bb89a674 CardFacePredicates let ValidPredicate compare CMC 2022-01-07 12:20:07 -05:00
Northmoc
5531622d3c CloneEffect support "CopyFromChosenName" 2022-01-07 12:18:00 -05:00
Northmoc
658b8ac354 killer_cosplay.txt 2022-01-07 12:17:03 -05:00
Michael Kamensky
aebe6aabf7 Merge branch 'deathtouch' into 'master'
Fix getLethalDamage

See merge request core-developers/forge!6019
2022-01-07 05:03:03 +00:00
tool4EvEr
f8da0bc217 Fix typo 2022-01-06 18:38:55 +01:00
Michael Kamensky
0778dae525 Merge branch 'sld_jan_06' into 'master'
SLD update

See merge request core-developers/forge!6018
2022-01-06 17:05:36 +00:00
tool4EvEr
c09301bcea Fix getLethalDamage 2022-01-06 15:43:44 +01:00
paul_snoops
4864add3d6 SLD update 2022-01-06 13:37:27 +00:00
Michael Kamensky
76232624bc Merge branch 'shuffle' into 'master'
Fix missing Shuffled trigger when library empty

See merge request core-developers/forge!6017
2022-01-05 16:18:00 +00:00
Bug Hunter
befd94516c Fix missing Shuffled trigger when library empty 2022-01-05 16:18:00 +00:00
Michael Kamensky
7e804c11a5 Merge branch 'mill' into 'master'
Fix optional Mill

See merge request core-developers/forge!6016
2022-01-05 16:17:40 +00:00
TRT
62bc1b4ecd Fix optional Mill 2022-01-05 11:57:27 +01:00
Michael Kamensky
886bc51db7 Merge branch 'garth' into 'master'
Cascade fix for Garth

See merge request core-developers/forge!6013
2022-01-05 04:34:17 +00:00
Michael Kamensky
e27307e217 Merge branch 'adventure' into 'master'
Merged Fregnor content and fixed large maps

See merge request core-developers/forge!6014
2022-01-05 04:34:00 +00:00
Michael Kamensky
068b4f21eb Merge branch 'typo' into 'master'
Fix some typos

See merge request core-developers/forge!6015
2022-01-05 04:33:20 +00:00
Michael Kamensky
f8c4a4adf3 Merge branch 'double' into 'master'
Fix Pump & Double

See merge request core-developers/forge!6012
2022-01-05 04:33:12 +00:00
Tim Mocny
2ad1c222b0 Merge branch 'master' into 'typo'
# Conflicts:
#   forge-gui/res/cardsfolder/e/eternal_dominion.txt
2022-01-05 00:16:56 +00:00
Northmoc
63d53cfaeb rockfall_vale.txt fix Produced$ 2022-01-04 19:12:17 -05:00
Grimm
1ac45157bb merged Fregnor content
fixed large maps
added pixmap for player pos on mini map
2022-01-04 23:48:09 +01:00
Grimm
6fd8d94269 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2022-01-04 23:47:51 +01:00
Grimm
e6d2ba2517 merged Fregnor content
fixed large maps
added pixmap for player pos on mini map
2022-01-04 23:47:09 +01:00
tool4EvEr
cca65c6661 Cascade fix for Garth 2022-01-04 23:08:42 +01:00
tool4EvEr
ff3a7e5e73 Fix Pump & Double 2022-01-04 22:42:33 +01:00
Northmoc
91bea1e2a7 eternal_dominion.txt fix Desc 2022-01-04 12:00:14 -05:00
Michael Kamensky
740eea7d95 Merge branch 'goadai' into 'master'
GoadAi: improve targeting for triggers

See merge request core-developers/forge!6010
2022-01-04 08:47:14 +00:00
Michael Kamensky
2c78a06f4e Merge branch 'haunt' into 'master'
Haunt fixes

See merge request core-developers/forge!6009
2022-01-04 08:46:43 +00:00
Bug Hunter
3d0f7fa1de Merge branch 'TRT-master-patch-90059' into 'master'
Update forge-gui/res/cardsfolder/e/eternal_dominion.txt

See merge request core-developers/forge!6011
2022-01-04 08:17:07 +00:00
Bug Hunter
e996849fa7 Update forge-gui/res/cardsfolder/e/eternal_dominion.txt 2022-01-04 08:16:33 +00:00