Commit Graph

14448 Commits

Author SHA1 Message Date
Michael Kamensky
1deb890f93 Merge branch 'cleanup/added-DB$-space' into 'master'
Cleanup/added db$ space

See merge request core-developers/forge!5341
2021-10-21 17:59:27 +00:00
Stu Bob
efcb45546c Cleanup/added db$ space 2021-10-21 17:59:24 +00:00
Northmoc
947deb4b8d awol.txt 2021-10-21 12:55:08 -04:00
Northmoc
d913d0519a haktos_the_unscarred.txt NICKNAME flag 2021-10-21 12:48:08 -04:00
Northmoc
37036332f7 shoe_tree.txt 2021-10-21 12:46:25 -04:00
Michael Kamensky
158de07d60 Merge branch 'sld_hawkins' into 'master'
SLD Edition for missing Stranger Things Card

See merge request core-developers/forge!5612
2021-10-21 12:37:24 +00:00
Michael Kamensky
c3b860998b Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!5615
2021-10-21 12:37:05 +00:00
Bug Hunter
21b037e2e7 Update forge-gui/res/cardsfolder/t/tevesh_szat_doom_of_fools.txt 2021-10-21 12:35:26 +00:00
CCTV-1
9f0680b20a update new Importer strings. 2021-10-21 19:54:25 +08:00
paul_snoops
83441c6e75 SLD Edition for missing Stranger Things Card 2021-10-21 08:37:30 +01:00
Michael Kamensky
7306f69c4a Merge branch 'twosat-master-patch-36825' into 'master'
Update de-DE.properties

See merge request core-developers/forge!5606
2021-10-21 04:34:54 +00:00
Northmoc
627461546a hawkins_national_laboratory_the_upside_down.txt 2021-10-20 21:07:15 -04:00
Andreas Bendel
f75c457e66 Update de-DE.properties
translated a lot of deck importer related lines
2021-10-20 18:39:44 +00:00
Michael Kamensky
253cf35841 Merge branch 'SLD' into 'master'
SLD Extra Life 2021

See merge request core-developers/forge!5605
2021-10-20 16:33:43 +00:00
paul_snoops
96a604d6e9 SLD Extra Life 2021 2021-10-20 16:25:20 +01:00
Bug Hunter
bda03f44cf Update forge-gui/res/cardsfolder/b/brain_in_a_jar.txt 2021-10-20 14:56:36 +00:00
Michael Kamensky
898f3e91e0 Merge branch 'evoke' into 'master'
tidy up non-mana Evoke costs

See merge request core-developers/forge!5602
2021-10-20 14:07:55 +00:00
Michael Kamensky
a49ab3828e Merge branch 'imp' into 'master'
maddening_imp.txt streamline with IsTriggerRemembered

See merge request core-developers/forge!5601
2021-10-20 14:06:54 +00:00
Northmoc
d51de2a1a1 tidy up non-mana Evoke costs 2021-10-20 10:01:50 -04:00
Northmoc
53670a4dd7 maddening_imp.txt streamline with IsTriggerRemembered 2021-10-20 09:09:20 -04:00
Michael Kamensky
e8d229e3a2 Merge branch 'fix' into 'master'
surtland_elementalist.txt restrict play ability

See merge request core-developers/forge!5600
2021-10-20 12:38:52 +00:00
Northmoc
8c25623ffc surtland_elementalist.txt restrict play ability 2021-10-20 08:25:17 -04:00
leriomaggio
87439388db Improved support for Unknown cards in DeckImport
DeckImport now avoids including non-deck and metadata info in decklist as UnknownText, whilst any line that looks like a card request (i.e. includes a card quantity in the beginning) is interpreted as Unknown card.

This seems a good compromise with showing typo and any mispelling in card list whilst avoiding flooding decklist with unnecessary info.
2021-10-20 10:47:44 +02:00
Michael Kamensky
0d67e7950e Merge branch 'adventure' into 'master'
Adventure mode

See merge request core-developers/forge!5584
2021-10-20 04:54:04 +00:00
Grimm
49f7128240 Restore the adventure merge
This reverts commit e69cf66ec8.
2021-10-20 04:54:01 +00:00
leriomaggio
a67da59564 Unknown/Unrecognised text is not muted anymore and displayed as unknown card.
Added new entry in language files (ITA already translated too)
2021-10-20 00:48:02 +02:00
Michael Kamensky
dc3c117ba8 Merge branch 'custody' into 'master'
Custody Battle refactor

See merge request core-developers/forge!5591
2021-10-19 16:01:38 +00:00
Michael Kamensky
7424f765b0 Merge branch 'twosat-master-patch-42991' into 'master'
Update de-DE.properties

See merge request core-developers/forge!5589
2021-10-19 15:54:17 +00:00
Michael Kamensky
dae1c33a6d Merge branch 'fix' into 'master'
fix larder_zombie.txt

See merge request core-developers/forge!5590
2021-10-19 15:54:13 +00:00
Northmoc
3fe18188ac custody_battle.txt add AI hint 2021-10-19 10:31:18 -04:00
Northmoc
98af39a140 custody_battle.txt refactor 2021-10-19 10:30:45 -04:00
Andreas Bendel
e37d42efa4 Update de-DE.properties
translated lblWouldYouLikeInvestigate
2021-10-19 13:56:59 +00:00
Northmoc
04792a2086 fix larder_zombie.txt 2021-10-19 09:56:22 -04: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
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
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
baf89b344c Update script 2021-10-18 22:39:11 +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
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