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
Michael Kamensky
15cc56add2
Merge branch 'TRT-master-patch-93812' into 'master'
...
Update forge-gui/res/cardsfolder/b/brain_in_a_jar.txt
See merge request core-developers/forge!5604
2021-10-20 16:33:04 +00:00
Michael Kamensky
50ad8c5204
Merge branch 'flashback' into 'master'
...
Flashback reminder remove "extrawurst"
See merge request core-developers/forge!5603
2021-10-20 16:32:54 +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
Northmoc
58925880b4
Flashback reminder remove "extrawurst"
2021-10-20 10:20:40 -04: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
Michael Kamensky
7d913685d8
Merge branch 'aifix' into 'master'
...
Fix NPE when moving commander created by ApiBased SA (e.g. Hogaak)
See merge request core-developers/forge!5597
2021-10-20 09:32:16 +00:00
Michael Kamensky
a18546065d
Merge branch 'deck-importer-decks-file-format' into 'master'
...
Improved support for Unknown cards in DeckImport
See merge request core-developers/forge!5599
2021-10-20 09:31:35 +00:00
Grimm
419a97affa
Delete .gitlab-ci.yml
2021-10-20 09:01:25 +00: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
Michael Kamensky
2213f7c925
Merge branch 'master' into 'master'
...
Slight tweak to ChooseTypeAi
See merge request core-developers/forge!5596
2021-10-20 04:48:54 +00:00
Michael Kamensky
86431ec6f2
- Slight tweak to ChooseTypeAi
2021-10-20 07:48:21 +03:00
Michael Kamensky
60da1c88f3
Merge branch 'aiETB' into 'master'
...
checkETBeffects: be a bit less greedy when facing death
See merge request core-developers/forge!5593
2021-10-20 04:27:28 +00:00
Michael Kamensky
144a0c6e71
Merge branch 'deck-importer-decks-file-format' into 'master'
...
Small Improvements to Deck Importer
See merge request core-developers/forge!5594
2021-10-20 04:26:59 +00:00
Michael Kamensky
48f894b1ae
- Fix shared params lines.
2021-10-20 07:09:00 +03:00
Michael Kamensky
ee0ad5789c
Merge branch 'master' into 'master'
...
Improve ChooseTypeAi trigger logic
See merge request core-developers/forge!5595
2021-10-20 04:03:57 +00:00
Michael Kamensky
90d18b3096
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-10-20 07:02:35 +03:00
Michael Kamensky
df2ef8ca8c
- Improve ChooseTypeAi trigger logic.
2021-10-20 07:02:16 +03: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
tool4EvEr
3b2ca119db
Fix NPE when moving commander created by ApiBased SA (e.g. Hogaak)
2021-10-20 00:06:56 +02:00
leriomaggio
ca45deb935
Added patch to handle corner case with Conspiracy section as formatted in dec files.
2021-10-19 23:32:51 +02:00
tool4EvEr
25e35e3468
checkETBeffects: be a bit less greedy when facing death
2021-10-19 21:24:36 +02:00
Michael Kamensky
445d655dd3
- Consolidate shared parameters in a variable.
2021-10-19 19:35:35 +03: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
Michael Kamensky
080ed15c28
Merge branch 'aifix' into 'master'
...
Fix for Dewdrop Spy
See merge request core-developers/forge!5592
2021-10-19 15:34:16 +00:00
TRT
0762d0877a
Fix for Dewdrop Spy
2021-10-19 17:29:09 +02: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
Michael Kamensky
d752e6dea3
Merge branch 'aifix' into 'master'
...
AttachAi: Add chkAIDrawback for Halvar
See merge request core-developers/forge!5588
2021-10-19 13:48:55 +00:00
TRT
75b3363a51
Add chkAIDrawback for Halvar
2021-10-19 15:11:09 +02:00
Michael Kamensky
b0e07cd284
Merge branch 'aifix' into 'master'
...
Fix Muse Vessel + Hexproof
See merge request core-developers/forge!5587
2021-10-19 11:31:47 +00:00
TRT
386c30a8ae
Fix NPE
2021-10-19 12:56:46 +02: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
Grimm
287b7b7e7c
sprites to lowercase and added *.sh + *.command
2021-10-19 02:33:34 +02:00
Grimm
0df58969ad
sprites to lowercase and added *.sh + *.command
2021-10-19 02:32:58 +02:00
