external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,094 Commits 32 Branches 187 Tags
bc85d9fcbe01c3be80426c76b36b78692901f21c
Commit Graph

55094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
bc85d9fcbe Merge branch 'melee' into 'master' 
Fix Melee

See merge request core-developers/forge!6034
 2022-01-11 16:21:06 +00:00
Bug Hunter
de938dd3e7 Fix Melee 2022-01-11 16:21:03 +00:00
Michael Kamensky
3e341b8903 Merge branch 'unf_kc' into 'master' 
UNF: Killer Cosplay

See merge request core-developers/forge!6021
 2022-01-11 04:42:39 +00:00
Hans Mackowiak
9c028e65d6 Merge branch 'TRT-master-patch-34800' into 'master' 
Update forge-gui/res/cardsfolder/n/null_champion.txt

Closes #2063

See merge request core-developers/forge!6032
 2022-01-10 04:58:46 +00:00
Northmoc
eb8fa774ea killer_cosplay.txt cmcEQ -> ManaCost= 2022-01-09 19:48:42 -05:00
Northmoc
fc81f7e7d7 ChooseCardNameEffect: cmcEQ -> ManaCost 2022-01-09 19:47:53 -05:00
Northmoc
28aebca071 CardFacePredicates: cmcEQ -> ManaCost 2022-01-09 19:46:59 -05:00
Bug Hunter
2a307595f8 Update forge-gui/res/cardsfolder/n/null_champion.txt 2022-01-09 21:00:25 +00:00
Michael Kamensky
f40045b8ef Merge branch 'pramikon' into 'master' 
Fix Pramikon applying when no direction was chosen

See merge request core-developers/forge!6031
 2022-01-09 13:42:55 +00:00
Anthony Calosa
8b0feb12f2 Merge branch 'master' into 'master' 
Disable missingcards cache for desktop

See merge request core-developers/forge!6030
 2022-01-09 11:58:58 +00:00
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