Commit Graph

66835 Commits

Author SHA1 Message Date
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
jjayers99
bdf12e6988 LTR Jumpstart block definition 2023-07-26 22:41:12 -04:00
jjayers99
1625083300 Adventure - tile map movement updates
Prevented a case where losing a match could move players to a position where they could freely move across collision areas.

Halted processing of enemy movement and collisions in dungeons after a match, dialog popup, or reward scene. Activity will remain paused until the player moves to a new position. This should help ensure that players have an opportunity to react in some way before being attacked by mobile enemies as well as reducing possibility of being stuck in infinite battle loops.
2023-07-26 22:38:15 -04:00
GitHub Actions
0b6e5f9983 [maven-release-plugin] prepare for next development iteration 2023-07-26 22:00:13 -04:00
GitHub Actions
294b8c445b [maven-release-plugin] prepare release forge-1.6.57 2023-07-26 22:00:13 -04:00
friarsol
e0d81e2b5f Set java compiler version for release 2023-07-26 22:00:13 -04:00
Simisays
73f98c2999 CMM Guff Rewrites History (#3523) 2023-07-26 20:53:33 +02:00
Simisays
56d416b19e Update vodalian_mindsinger.txt (#3537) 2023-07-26 19:25:27 +02:00
tool4ever
3b832e02fc Clean up (#3536) 2023-07-26 19:21:04 +02:00
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