external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,317 Commits 31 Branches 187 Tags
01be86d88eeaaee4e874f995046edea320c7bdd6
Commit Graph

66317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
4d47931072 Merge branch 'master' into newmaster2 2023-07-29 19:46:53 +08:00
Anthony Calosa
0d6fb1e7fd AdventureDeckEditor minor formatting, prevent NPE 2023-07-29 19:45:31 +08:00
kevlahnota
c9c7ba122a Merge pull request #3554 from klaxnek/klaxnek-patch-escardtranslations 
Update card translations
 2023-07-29 18:58:51 +08:00
klaxnek
edcb2aff0b Updated japanese card translations 2023-07-29 11:37:36 +02:00
Hans Mackowiak
b380e6a12b CountersProliferateEffect: add default cases 2023-07-29 11:26:20 +02:00
klaxnek
b9d8941d28 Update other languages card translations 2023-07-29 11:21:09 +02:00
tool4ever
37d5e9e697 Update call_for_aid.txt 2023-07-29 09:16:44 +00:00
klaxnek
b4f437d10d Update spanish patched card translations 2023-07-29 10:09:14 +02:00
klaxnek
702e7f120f Update spanish card translations 2023-07-29 10:08:17 +02:00
Hans Mackowiak
c15542f949 Regenerate rework (#3385) 
* CardFactoryUtil: remove false keyword

* CardFactoryUtil: remove wrong regenerate Keyword

* CantRegenerate as Static

* ~small fixes

* RegenerationAbility as SubAbility to the Regeneration Effect

* Card: use shieldCount instead of Collection

* remove deprecated trigger

* fix AiLogic vs AILogic

* EffectAi: start of logic for CantRegenerate

* EffectAi: try to do StackPeek for CantRegenerate

* ~ use wither damage

* AI prediction against Damage

* CantRegenerate: begin logic against Combat Damage

* AnimateAi: start logic for Bone Shaman

* fix Runesword
 2023-07-29 10:58:14 +03:00
kevlahnota
7bf4b5c126 Merge pull request #3553 from kevlahnota/newmaster2 
update BuyButton for RewardScene
 2023-07-29 08:09:17 +08:00
kevlahnota
3a8b7e02e3 Merge pull request #3549 from tool4ever/clean28 
Clean up train continues
 2023-07-29 08:08:52 +08:00
Anthony Calosa
f38b907f37 settext count 2023-07-29 08:00:37 +08:00
Anthony Calosa
ae0852dcbe update 2023-07-29 07:49:26 +08:00
Anthony Calosa
b1ff117026 update BuyButton for RewardScene 2023-07-29 07:41:44 +08:00
Simisays
47bb5e67e9 Update gollum_scheming_guide.txt 2023-07-29 00:24:33 +02:00
Simisays
f773a791ba Update gollum_scheming_guide.txt 2023-07-29 00:02:42 +02:00
Northmoc
e7f6d37183 TriggerVote improve with new cards 2023-07-28 16:58:37 -04:00
Northmoc
40e1c17356 random fixes 2023-07-28 16:56:51 -04:00
tool4EvEr
a2c1853536 Clean up even more 2023-07-28 21:38:16 +02:00
Simisays
2c8e79236f Update gollum_scheming_guide.txt 2023-07-28 21:28:20 +02:00
Simisays
8cb9d4f2b0 Update gollum_scheming_guide.txt 2023-07-28 20:00:46 +02:00
Simisays
efb6328e38 Update gollum_scheming_guide.txt 2023-07-28 19:58:29 +02:00
tool4EvEr
70de03381c Clean up 2023-07-28 19:56:08 +02:00
Northmoc
d0777fce21 Secret Council mechanic and cards (#3542) 2023-07-28 17:30:13 +00:00
tool4EvEr
28d2a174c5 Fix script 2023-07-28 18:53:38 +02:00
tool4EvEr
d32cde8889 Clean up train continues 2023-07-28 17:51:15 +02:00
kevlahnota
f6537fdb1a Merge pull request #3547 from kevlahnota/newmaster2 
show quantity of items on Adventure Shop
 2023-07-28 21:53:32 +08:00
Anthony Calosa
c4e22e8ba2 show quantity of items on Adventure Shop 
- closes #3546
 2023-07-28 21:44:49 +08:00
Simisays
0a36c688c8 Update gollum_scheming_guide.txt 2023-07-28 15:25:43 +02:00
tool4ever
5174c42d98 Remove some obsolete code (#3540) 2023-07-28 10:17:40 +00:00
kevlahnota
b15b810e81 Merge pull request #3545 from kevlahnota/newmaster2 
update token
 2023-07-28 17:23:22 +08:00
kevlahnota
9d456a8ea1 Merge pull request #3544 from CCTV-1/master 
updated simplified chinese translation
 2023-07-28 17:22:41 +08:00
Anthony Calosa
ba1a2a171d update token 2023-07-28 17:06:42 +08:00
CCTV-1
8c14e89c26 fix card type translation. 2023-07-28 16:51:18 +08:00
tool4ever
ce7c7b9fc5 Update escape_from_orthanc.txt 2023-07-28 08:43:03 +02:00
tool4ever
8fb16ed545 Update oriq_loremage.txt 2023-07-28 08:42:17 +02:00
tool4ever
c2cb89f3f5 Update crown_of_gondor.txt 2023-07-28 08:41:15 +02:00
Simisays
136a434803 update 2023-07-28 07:26:52 +02:00
tool4ever
718906f339 Update aragorn_company_leader.txt 2023-07-27 19:22:24 +00:00
Simisays
d8909b3f72 Update sauron_the_necromancer.txt 2023-07-27 20:11:09 +02:00
Simisays
4987fcd775 Update sauron_the_necromancer.txt 2023-07-27 17:06:50 +02:00
Simisays
4911475e4a Create sauron_the_necromancer.txt 2023-07-27 17:04:10 +02:00
Simisays
06f7183c9e Merge remote-tracking branch 'upstream/master' into gollu; 2023-07-27 16:25:38 +02:00
Simisays
05528957b2 Update gollum_scheming_guide.txt 2023-07-27 16:25:33 +02:00
Peter Helbing
05d7e28455 set Nazgûl variants as alternate art (#3541) 2023-07-27 17:19:09 +03:00
Agetian
8774566ac0 - Added LTR/LTC achievements by Marek. (#3539) 
- Added puzzles PS_LTR1 and PS_LTR2.
 2023-07-27 12:19:36 +03:00
Northmoc
276fc693a8 MAT: tyvar_the_bellicose.txt + support (#3040) 2023-07-27 07:43:15 +00:00
Chris H
68d8187646 Version update (how do we automate these?) (#3538) 2023-07-27 08:46:22 +03:00
jjayers99
7f88d58f5c Adventure - Bandit map JSON syntax fixes 2023-07-26 22:56:17 -04:00