external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,537 Commits 31 Branches 187 Tags
0762d0877a322170874fc89fa6b40b98b04e94d0
Commit Graph

53537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TRT
0762d0877a Fix for Dewdrop Spy 2021-10-19 17:29:09 +02:00
Michael Kamensky
016001fba2 Merge branch 'stranger' into 'master' 
Stranger Things

See merge request core-developers/forge!5556
 2021-10-19 13:49:32 +00:00
Michael Kamensky
d752e6dea3 Merge branch 'aifix' into 'master' 
AttachAi: Add chkAIDrawback for Halvar

See merge request core-developers/forge!5588
 2021-10-19 13:48:55 +00:00
TRT
75b3363a51 Add chkAIDrawback for Halvar 2021-10-19 15:11:09 +02:00
Michael Kamensky
b0e07cd284 Merge branch 'aifix' into 'master' 
Fix Muse Vessel + Hexproof

See merge request core-developers/forge!5587
 2021-10-19 11:31:47 +00:00
TRT
386c30a8ae Fix NPE 2021-10-19 12:56:46 +02:00
TRT
c2d44efbc5 Fix Muse Vessel + Hexproof 2021-10-19 12:05:33 +02:00
Michael Kamensky
cc0d4eedfd Merge branch 'pwcombat' into 'master' 
Smarter check for AI if specific attacker should go for PW

See merge request core-developers/forge!5585
 2021-10-19 04:05:05 +00:00
Michael Kamensky
30416e87ab Merge branch 'fix' into 'master' 
Dragon's Fire tweaks

See merge request core-developers/forge!5586
 2021-10-19 04:04:57 +00:00
Northmoc
61673b05f4 support "OptionalGenericCostPaid" 2021-10-18 18:53:56 -04:00
Northmoc
15a3d1ee9d dragons_fire.txt streamline 2021-10-18 18:53:08 -04:00
Northmoc
e6823049c5 will_the_wise.txt 2021-10-18 18:42:57 -04:00
Northmoc
c1df6ddf87 max_the_daredevil.txt 2021-10-18 18:20:10 -04:00
Northmoc
cbaf707822 lucas add AI hint 2021-10-18 18:15:24 -04:00
tool4EvEr
f21c6867c6 Clean up 2021-10-18 23:01:36 +02:00
tool4EvEr
baf89b344c Update script 2021-10-18 22:39:11 +02:00
tool4EvEr
3653b800a4 Multiplayer improvements 2021-10-18 22:15:53 +02:00
tool4EvEr
ae68e6b9b2 Clean up 2021-10-18 22:00:23 +02:00
TRT
ea65f77d16 Simple check for AI if specific attacker should go for PW 2021-10-18 20:49:31 +02:00
Michael Kamensky
ff43491d07 Merge branch 'reusable-costs-ai-fix' into 'master' 
Improve Clay Golem AI behavior, switch CostFlipCoin/CostRollDice to being reusable.

See merge request core-developers/forge!5582
 2021-10-18 16:27:43 +00:00
Michael Kamensky
33566c037c Merge branch 'gauntletfix' into 'master' 
Fix some more NPE related to gauntlets

See merge request core-developers/forge!5583
 2021-10-18 16:27:26 +00:00
Northmoc
d095dc7156 InvestigateEffect - support Optional and RememberInvestigatingPlayers 2021-10-18 10:33:21 -04:00
Northmoc
e29407d868 lucas_the_sharpshooter.txt 2021-10-18 10:00:43 -04:00
TRT
5b72d1f682 Fix some more NPE related to gauntlets 2021-10-18 15:26:09 +02:00
Michael Kamensky
4644305733 - Switch CostFlipCoin and CostRollDice to being reusable. 
- Somewhat improve the AI behavior for Clay Golem.
 2021-10-18 16:22:33 +03:00
Northmoc
338465889a mike_the_dungeon_master.txt 2021-10-18 07:58:02 -04:00
Northmoc
631c9c671d chief_jim_hopper.txt 2021-10-18 07:58:02 -04:00
Northmoc
75e66f9469 dustin_gadget_genius.txt 2021-10-18 07:58:02 -04:00
Northmoc
8a52de252f eleven_the_mage.txt 2021-10-18 07:58:02 -04:00
Northmoc
80171918dd initial Friends forever 2021-10-18 07:58:01 -04:00
Northmoc
e499d9bed8 CardProperty - support BottomLibrary 2021-10-18 07:58:01 -04:00
Northmoc
c641f6950c mind_flayer_the_shadow.txt 2021-10-18 07:58:01 -04:00
TRT
501d5501db Fix Master of the Wild Hunt 2021-10-18 12:01:43 +02:00
Michael Kamensky
5c97a0f835 Merge branch 'johnwilliams7-master-patch-02550' into 'master' 
Update Year of the Ox 2021.txt

See merge request core-developers/forge!5580
 2021-10-18 08:41:22 +00:00
John Williams
487956ec2c Update Year of the Ox 2021.txt 2021-10-18 08:39:08 +00:00
tool4EvEr
c6bf9e3c6d Clean up 2021-10-18 10:21:28 +02:00
Michael Kamensky
cc49f02f09 Merge branch 'disable-in-app-updater' into 'master' 
Disable in-game updater for now

See merge request core-developers/forge!5579
 2021-10-18 03:37:31 +00:00
Michael Kamensky
d55479dc39 Merge branch 'master' into 'master' 
Net Decks Archive Updates

See merge request core-developers/forge!5578
 2021-10-18 03:37:06 +00:00
Churrufli
d3eabbd1d5 Update net-decks-archive-pauper.txt 2021-10-17 23:05:44 +00:00
Churrufli
2f8aaab41e Net Decks Archive Updates 2021-10-18 00:03:11 +02:00
friarsol
399ea54088 Disable in-game uploader for now 2021-10-17 17:40:24 -04:00
Michael Kamensky
1f0e7f7348 Merge branch 'vulns' into 'master' 
update to fix known vulnerabilities

See merge request core-developers/forge!5576
 2021-10-17 13:49:21 +00:00
Michael Kamensky
beefb001b6 Merge branch 'TRT-master-patch-69088' into 'master' 
Update forge-gui/res/cardsfolder/v/volition_reins.txt

See merge request core-developers/forge!5577
 2021-10-17 13:38:21 +00:00
Bug Hunter
afae48e04e Update forge-gui/res/cardsfolder/v/volition_reins.txt 2021-10-17 10:40:17 +00:00
Jamin W. Collins
061ce30d8d fix transitive dependency vulnerability 
* https://snyk.io/vuln/SNYK-JAVA-COMMONSCODEC-561518

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 21:26:21 -07:00
Jamin W. Collins
086118be07 fix transitive dependency vulnerability 
* https://snyk.io/vuln/SNYK-JAVA-ORGTESTNG-174823

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 21:26:11 -07:00
Jamin W. Collins
ce6d142f6e fix transitive dependency vulnerabilites 
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-1048058
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-451097
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-32018
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-31517
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-30647
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-30644
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-30646

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 21:24:46 -07:00
Jamin W. Collins
1aa64bac4a fix transitive dependency vulnerabilites 
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHELOGGINGLOG4J-567761
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHELOGGINGLOG4J-31409

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 21:04:00 -07:00
Jamin W. Collins
920c5bceea upgrade to fix known vulnerabilities 
* https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415
* https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-32236

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 20:54:11 -07:00
Jamin W. Collins
dc2fa6a78e update to fix known vulnerability 
* https://snyk.io/vuln/SNYK-JAVA-COMBEUST-174815

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 20:46:12 -07:00