external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,109 Commits 33 Branches 187 Tags
08b9b5d66c44ebd2cc80cb00bee8366aab35d47c
Commit Graph

66109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris H
abb2ff3cdf Ring tempts you (#3453) 
* Ring tempts you WIP

* add ring triggers

* Update RingTemptsYouEffect.java

* Add files via upload

* Update TriggerRingbearerChosen.java

* Update token-images.txt

* Update TrackableProperty.java

* Update CardView.java

* Update CardRenderer.java

* Update RingTemptsYouEffect.java

fix crash

* Update Card.java

* Update CardView.java

* Update TrackableProperty.java

* Update StaticAbilityContinuous.java

* Update StaticEffect.java

* Update RingTemptsYouEffect.java

* update sprite_manaicons.png

* Update FSkinProp.java

* Update FSkinImage.java

* Update CardFaceSymbols.java

* Update CardRenderer.java

* update trigger

* update desktop symbol, add aragorn company leader

* update cleanup, add bilbo, add birthday escape

* update cleanup

* add 3 cards

* add five cards

* add two cards

* update aragorn,update bombadil, add two cards

* add ten cards

* Update horses_of_the_bruinen.txt

* add dunedain rangers + cleanup

* Update gollums_bite.txt

* update cleanup

* add six cards

* delete unnecessary file

* Update rangers_firebrand.txt

* add two cards, add RingTemptedYou playerproperty

* update frodo, add three cards

* update sauron, samwise, add two cards

* Update sauron_the_dark_lord.txt

* update validplayer

* add six cards

* update smeagol

* update sauron ransom two piles

* add four cards

* add three cards

* update card scripts

* Update war_of_the_last_alliance.txt

* update scripts, update ringbearer

* update CardDetailUtil

* remove unused param

* Update affected

* remove unnecesary variables

* update

* update scripts

* update RingTemptsYouEffect

* fix cantblockby RingTemptsYouEffect.java

* The Ring: use numTemptYou for RingLevel

* Update dunedain_rangers.txt

* Update jaces_defeat.txt

* update lord of the nazgul

* fix theRing CardView

* update ringEffect, update translation

* update translation

* update gamestate

* replace switch with if else

* fix effect

* update gamestate, translation

* update restartgameeffect, remove unneeded clearRingBearer

---------

Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
Co-authored-by: Hans Mackowiak <hanmac@gmx.de>
 2023-07-26 20:07:41 +03:00
Simisays
202b8b3913 Update gollum_scheming_guide.txt 2023-07-26 18:48:54 +02:00
Simisays
f050352be7 Update gollum_scheming_guide.txt 2023-07-26 18:44:05 +02:00
Simisays
0cfc6289a2 Update gollum_scheming_guide.txt 2023-07-26 13:29:01 +02:00
Anthony Calosa
69748ab0fb Update gwaihir_greatest_of_the_eagles.txt 
- closes #3533
 2023-07-26 16:39:24 +08:00
Anthony Calosa
09f2ea9b38 Merge pull request #3486 from jjayers99/master 
Adventure updates
 2023-07-26 15:10:34 +08:00
Anthony Calosa
7e9efa6edf indent 2023-07-26 14:58:47 +08:00
Anthony Calosa
c7bbf11797 update landscape layout 2023-07-26 14:55:32 +08:00
jjayers99
916c647382 Adventure updates 2023-07-26 00:51:57 -04:00
TabletopGeneral
0acf7af5c2 Merge branch 'Card-Forge:master' into master 2023-07-25 21:40:29 -07:00
Anthony Calosa
dcb0ca59ed Update sam_loyal_attendant.txt 2023-07-26 07:13:07 +08:00
Anthony Calosa
2aa4cf3e81 Merge pull request #3528 from kevlahnota/newmaster2 
update CardTranslation
 2023-07-26 07:10:57 +08:00
Anthony Calosa
a3815713b3 Merge pull request #3532 from tool4ever/carth 
Fix Carth the Lion not affecting X loyalty abilities
 2023-07-26 07:10:38 +08:00
Anthony Calosa
0822d95d73 Merge branch 'master' into newmaster2 2023-07-26 07:06:37 +08:00
Anthony Calosa
23813c8b67 Merge pull request #3531 from Simisays/quickfix 
[[Adventure]] path fixes for 3 maps
 2023-07-26 06:47:44 +08:00
Anthony Calosa
f074aac848 partial support for token name translation 2023-07-26 06:44:21 +08:00
tool4EvEr
9483676a13 Fix Carth the Lion not affecting X loyalty abilities 2023-07-25 23:25:02 +02:00
Simisays
310730624b update 2023-07-25 20:41:19 +02:00
Simisays
1d6caa1ad8 LTR Landroval, Horizon Witness and Horn of the Mark (#3529) 
* update

* update
 2023-07-25 18:07:19 +03:00
Hans Mackowiak
e2cee2d208 Update taunting_sliver.txt 2023-07-25 16:50:24 +02:00
Anthony Calosa
495db72540 update CardTranslation 2023-07-25 20:39:07 +08:00
TabletopGeneral
121dd3a2c5 Merge branch 'Card-Forge:master' into master 2023-07-24 20:11:17 -07:00
Anthony Calosa
adfd7e7745 Merge pull request #3525 from Simisays/sailintowest 
LTC Sail into the West
 2023-07-25 05:38:15 +08:00
Anthony Calosa
e739e922ca Merge pull request #3517 from Simisays/ADVENTUREREWORK 
[Adventure] Evil Grove/ Djinn Palace / CryptGraveyard map rework
 2023-07-25 05:06:06 +08:00
Anthony Calosa
969c6a5d2b Merge pull request #3527 from tool4ever/landroval 
Landroval support
 2023-07-25 04:54:31 +08:00
Simisays
b4b342eb4c LTR Faramir Prince of Ithilien (#3521) 2023-07-24 20:09:20 +00:00
tool4EvEr
94211bc2c4 Clean up 2023-07-24 21:56:16 +02:00
tool4EvEr
604d565815 Landroval support 2023-07-24 21:55:27 +02:00
Simisays
b9b759bad2 Create sail_into_the_west.txt 2023-07-24 15:03:01 +02:00
Anthony Calosa
c267503bb6 Merge pull request #3524 from kevlahnota/newmaster2 
remove translation
 2023-07-24 21:02:12 +08:00
Anthony Calosa
8018483529 remove translation 
-should fix ai effect logic
-translation should be done somewhere
 2023-07-24 20:57:04 +08:00
Simisays
5fbd264c0b update 2023-07-24 12:41:19 +02:00
Simisays
31b6713091 Merge remote-tracking branch 'upstream/master' into ADVENTUREREWORK 2023-07-24 12:35:27 +02:00
tool4ever
8f1d8ce265 Remove special case of StackInstances sharing the same SpellAbility object (#3490) 
* Each activated ability needs its own instance

* Don't need LKI since each SA is unique

* Clean default param

* Fix Dawnglow Infusion

* Fix ability counting

* Avoid color words

* Fix AI

* Be a bit smarter with copying

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-07-24 10:19:15 +03:00
tool4ever
d01d9d486f Support Faramir, Prince of Ithilien (#3520) 
* Fix Curse of Vitality

* Support Faramir, Prince of Ithilien

* Fix cards

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-07-24 10:17:25 +03:00
Simisays
e04f50814f update 2023-07-23 21:50:26 +02:00
Simisays
5ccf6a50dd update 2023-07-23 13:09:34 +02:00
Anthony Calosa
245a5c5885 Merge pull request #3515 from Card-Forge/copyTraitsByText 
Card: store created CardTraits by Text Change: Volrath’s Shapeshifter
 2023-07-23 15:22:04 +08:00
Anthony Calosa
7a3ec0b8e8 Update AdventureDeckEditor.java 2023-07-23 14:35:59 +08:00
Anthony Calosa
62cfedd9db Update AdventureDeckEditor.java 2023-07-23 13:56:05 +08:00
Hans Mackowiak
74d5ad8edc fix intrinsic for Text changes 2023-07-22 22:39:52 +02:00
Simisays
db2ecbed3c update 2023-07-22 21:43:15 +02:00
Anthony Calosa
7f8925aa8e Update faramir_steward_of_gondor.txt 2023-07-23 00:56:37 +08:00
Hans Mackowiak
5c4d1ce92b Card: store created CardTraits by Text Change: Volrath’s Shapeshifter 2023-07-22 17:45:47 +02:00
Paul Hammerton
0316c689fc Merge pull request #3514 from paulsnoops/quickfix 
Edition update: CMM
 2023-07-22 13:17:46 +01:00
paulsnoops
647c991b3a Edition update: CMM 2023-07-22 13:14:31 +01:00
Paul Hammerton
8a0be83b33 Merge pull request #3513 from paulsnoops/update_editions 
Edition update: WHO
 2023-07-22 10:48:36 +01:00
paulsnoops
c9bc1d9dc7 Edition update: WHO 2023-07-22 10:42:53 +01:00
Simisays
eed448daea Create gollum_scheming_guide.txt 2023-07-22 11:02:55 +02:00
Anthony Calosa
574ee9733d update tests 2023-07-22 14:04:04 +08:00