external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,604 Commits 31 Branches 187 Tags
b6af43ca8fe20fd1fb9650adc00ee542b63f23f7
Commit Graph

65604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kevlahnota
874ccc82ad Merge pull request #3567 from kevlahnota/newmaster2 
cache created sprites
 2023-07-31 19:18:41 +08:00
Anthony Calosa
8653bfcf22 update icons 2023-07-31 19:04:34 +08:00
Anthony Calosa
beb66d5c7d update arena atlas 2023-07-31 18:45:26 +08:00
Anthony Calosa
c4e932c2e2 cache created sprites 2023-07-31 18:21:58 +08:00
kevlahnota
f372b18061 Merge pull request #3562 from Simisays/LOTR25 
LTC 2 cards
 2023-07-31 12:32:31 +08:00
kevlahnota
16d8a69e4c Merge pull request #3566 from kevlahnota/newmaster2 
add Bookmark to GameHUD
 2023-07-31 11:27:50 +08:00
Anthony Calosa
a668b8abf8 update itemSprite, update items 2023-07-31 11:19:36 +08:00
Anthony Calosa
6e3362a330 Merge branch 'master' into newmaster2 2023-07-31 03:30:18 +08:00
Anthony Calosa
d806745cec add Bookmark to GameHUD 2023-07-31 03:21:59 +08:00
Simisays
4fe815872f Update travel_through_caradhras.txt 2023-07-30 20:43:10 +02:00
kevlahnota
54d502549e Merge pull request #3565 from tool4ever/fix30 
Fix xPaid reset
 2023-07-31 02:10:12 +08:00
tool4EvEr
b0ec1d68df Clean up 2023-07-30 18:39:27 +02:00
tool4EvEr
3cf257723d Fix xPaid reset 2023-07-30 18:37:36 +02:00
Simisays
614c2280bd update 2023-07-30 18:07:21 +02:00
kevlahnota
bc918bf3f3 Merge pull request #3534 from Simisays/gollu; 
LTR Gollum, Scheming Guide & Sauron, the Necromancer [Squash merge]
 2023-07-30 20:54:24 +08:00
Paul Hammerton
de7cd0d4f6 Merge pull request #3564 from paulsnoops/edition_updates 
Edition updates: LTR, WHO, new: WOE, WOT
 2023-07-30 13:32:12 +01:00
paulsnoops
ef109cb783 Edition updates: LTR, WHO, new: WOE, WOT 2023-07-30 13:27:06 +01:00
kevlahnota
224377e99a Merge pull request #3563 from Simisays/castlefix 
Fix for white castles not loading
 2023-07-30 20:15:24 +08:00
Simisays
28166054b2 fix 2023-07-30 13:49:40 +02:00
kevlahnota
ef0e5ada1d Merge pull request #3550 from Northmoc/triggervote 
TriggerVote improve with new cards
 2023-07-30 18:40:02 +08:00
Simisays
5d28cb244c update 2023-07-30 11:32:22 +02:00
Simisays
ec9db2eb8d update 2023-07-30 11:01:53 +02:00
Simisays
8435afd503 Update gollum_scheming_guide.txt 2023-07-30 10:27:28 +02:00
Simisays
cb5e05f8ad Update gollum_scheming_guide.txt 2023-07-30 09:54:17 +02:00
Simisays
c57dc6af3b Update gollum_scheming_guide.txt 2023-07-30 09:51:25 +02:00
Simisays
9cb47cd293 Update gollum_scheming_guide.txt 2023-07-30 09:50:34 +02:00
Simisays
dfa1519823 Update gollum_scheming_guide.txt 2023-07-30 09:49:19 +02:00
tool4ever
04b38035f5 Merge branch 'master' into triggervote 2023-07-30 09:05:24 +02:00
Simisays
874c954c26 Update gollum_scheming_guide.txt 2023-07-30 08:35:29 +02:00
Simisays
0c912c946a Update gollum_scheming_guide.txt 2023-07-30 08:34:35 +02:00
Northmoc
97ea9181b1 fixes 2023-07-29 23:11:54 -04:00
kevlahnota
cbc6f7bf98 Merge pull request #3561 from tool4ever/digUntil 
DigUntil is sequential
 2023-07-30 06:05:07 +08:00
tool4EvEr
caf2a206f7 Fix MayPlay + MDFC facedown 2023-07-29 23:20:17 +02:00
kevlahnota
f604cc60ac Merge pull request #3560 from pfirpfel/fix-breaking-fellowship 
Breaking of the Fellowship: Fix mana cost
 2023-07-30 04:19:22 +08:00
tool4EvEr
5db7702d8e DigUntil is sequential 2023-07-29 21:18:52 +02:00
pfirpfel
95e03954c4 Breaking of the Fellowship: Fix mana cost 2023-07-29 21:01:14 +02:00
kevlahnota
83a076f3dd Merge pull request #3557 from kevlahnota/newmaster2 
AdventureDeckEditor minor formatting, prevent NPE
 2023-07-29 20:04:33 +08:00
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