Michael Kamensky
8d5517ecff
Merge branch 'TRT-master-patch-24147' into 'master'
...
Update forge-gui/res/cardsfolder/p/pirs_whim.txt
See merge request core-developers/forge!5358
2021-09-14 20:29:24 +00:00
Michael Kamensky
eb290dd4a9
Merge branch 'pump_sb' into 'master'
...
Pump auto stackdescription sb improvements
See merge request core-developers/forge!5359
2021-09-14 20:28:53 +00:00
Michael Kamensky
69f560d25f
Merge branch 'MID_cards' into 'master'
...
MID 13 Sep
See merge request core-developers/forge!5346
2021-09-14 20:28:37 +00:00
paul_snoops
d5fa07ebe4
delete blessed_defiance.txt for another MR once working
2021-09-14 21:21:33 +01:00
paul_snoops
991b0783b8
fixes
2021-09-14 21:19:47 +01:00
paul_snoops
8089224fe7
fixes
2021-09-14 21:19:47 +01:00
paul_snoops
521dcdca75
fixes
2021-09-14 21:19:47 +01:00
paul_snoops
76fd4a754d
MID 13 Sep
2021-09-14 21:19:46 +01:00
Bug Hunter
a82bb3b075
Merge branch 'moonveil' into 'master'
...
MID: Moonveil Regent
See merge request core-developers/forge!5353
2021-09-14 17:57:20 +00:00
Northmoc
cac9d8fbf0
moonveil_regent.txt
2021-09-14 13:52:34 -04:00
Northmoc
1c6a460d93
corrections for 1 or 2 keywords
2021-09-14 13:41:58 -04:00
Northmoc
32a14fa82a
Pump auto stackdescription sb improvements
2021-09-14 13:25:17 -04:00
Northmoc
c0727134d2
flare_of_faith.txt
2021-09-14 13:24:08 -04:00
Bug Hunter
91dfad9c9f
Update forge-gui/res/cardsfolder/p/pirs_whim.txt
2021-09-14 14:55:56 +00:00
Northmoc
29c8a6dba2
rootcoil_creeper.txt
2021-09-14 10:30:29 -04:00
Northmoc
b3edb1b0a4
grizzly_ghoul.txt
2021-09-14 10:19:23 -04:00
Michael Kamensky
f2c3d3cd27
Merge branch 'hanmac-isTriggerRemembered' into 'master'
...
CardProperty: add isTriggerRemembered
See merge request core-developers/forge!5355
2021-09-14 10:50:38 +00:00
Michael Kamensky
cb851dd099
Merge branch 'TRT-master-patch-26956' into 'master'
...
Update forge-gui/res/cardsfolder/m/maskwood_nexus.txt
See merge request core-developers/forge!5356
2021-09-14 10:50:12 +00:00
Bug Hunter
660ffadda2
Update forge-gui/res/cardsfolder/m/maskwood_nexus.txt
2021-09-14 08:25:30 +00:00
Hans Mackowiak
f3799d3982
CardProperty: add isTriggerRemembered
2021-09-14 07:51:33 +00:00
leriomaggio
c732289690
Updates to DeckRecognizer (& tests) by using the new methods from StaticData
...
(Any reference to CardDb has been dropped, along with corresponding card fetching methods).
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-14 08:18:24 +01:00
leriomaggio
82372ec5ba
New methods to retrieve cards from all supported databases.
...
The API now includes three new methods to proxy card requests to any available database of cards. These methods are currently used by the DeckRecognizer to match any card request from the Deck Importer - so the API adapts to those particular use cases.
However, method signatures are general enough to be further used elsewhere in forge, if necessary.
The first immediate advantage here is that with this addition, Deck Import automagically extends support to also including custom cards.
Moreover, this avoids DeckRecognizer to have lower-level references to CardDb - therefore, better encapsulation so that any DB interaction is correctly proxied by StaticData.
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-14 08:13:25 +01:00
leriomaggio
d03bdb2773
Disabled benchmark tests to exclude in battery
...
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-14 07:57:13 +01:00
leriomaggio
9562064213
Updated (w/ tests) behaviour for compose with foil request, when input card Name is or isn't foil already
...
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-14 07:56:33 +01:00
Michael Kamensky
41725e7e9f
Merge branch 'flash_format' into 'master'
...
some keyword formatting updates
See merge request core-developers/forge!5350
2021-09-14 03:54:44 +00:00
Michael Kamensky
7591bd6def
Merge branch 'cost' into 'master'
...
Add confirm when discarding hand as payment
See merge request core-developers/forge!5354
2021-09-14 03:54:10 +00:00
Michael Kamensky
ece8f2f2d7
Merge branch 'mid_13' into 'master'
...
MID - 13 Sep
See merge request core-developers/forge!5348
2021-09-14 03:53:51 +00:00
Northmoc
a35be3968b
sludge_monster.txt AITgts
2021-09-13 18:11:11 -04:00
Northmoc
abb6f24327
necrosynthesis.txt
2021-09-13 16:56:07 -04:00
Northmoc
1218986c99
old_stickfingers.txt
2021-09-13 16:38:24 -04:00
Northmoc
ba8daebf98
vanquish_the_horde.txt
2021-09-13 15:50:01 -04:00
Northmoc
d058584278
startle.txt
2021-09-13 15:38:06 -04:00
Northmoc
d175e6dcbd
sunset_revelry.txt
2021-09-13 15:19:38 -04:00
Northmoc
7a458f49f6
hungry_for_more.txt and token
2021-09-13 15:10:50 -04:00
Northmoc
e54b886bab
briarbridge_tracker.txt
2021-09-13 14:50:16 -04:00
tool4EvEr
664a3471c9
Add confirm when discarding hand as payment
2021-09-13 20:40:59 +02:00
Northmoc
7c90200ca3
loyal_gryff.txt
2021-09-13 14:31:28 -04:00
leriomaggio
f8cb6141bd
Further optimised cardDb method with filter using AlwaysTrue + and Chain
...
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-13 18:58:54 +01:00
leriomaggio
a9f1cd3c97
Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format
2021-09-13 18:47:35 +01:00
leriomaggio
de4763cd71
New translation entries (en-US) for DeckImport and the new VStatisticsImporter
...
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-13 18:47:26 +01:00
Northmoc
cf1a637585
chaplain_of_alms_chapel_shieldgeist.txt
2021-09-13 13:43:55 -04:00
Bug Hunter
71eae2f1a8
Merge branch 'commander_ban' into 'master'
...
Commander: Golas banned; Worldfire unbanned
See merge request core-developers/forge!5352
2021-09-13 17:42:55 +00:00
paul_snoops
4f1219b305
Commander: Golas banned; Worldfire unbanned
2021-09-13 18:32:49 +01:00
Northmoc
1e6beae1e1
grafted_identity.txt
2021-09-13 12:27:49 -04:00
Northmoc
e51b4d9abf
some keyword formatting updates
2021-09-13 11:42:52 -04:00
Northmoc
76dbd6311b
nebelgast_intruder.txt
2021-09-13 11:41:48 -04:00
Northmoc
f744404bee
mysterious_tome_chilling_chronicle.txt
2021-09-13 11:41:47 -04:00
Anthony Calosa
aa1c1a10c5
Merge branch 'master' into 'master'
...
[Mobile] Fix card image not loading
See merge request core-developers/forge!5349
2021-09-13 15:07:00 +00:00
Anthony Calosa
ac350a0bfb
[Mobile] Fix card image not loading
2021-09-13 23:01:13 +08:00
Michael Kamensky
5d61f2f938
Merge branch 'mid_12' into 'master'
...
MID - 12 Sep
See merge request core-developers/forge!5337
2021-09-13 14:58:32 +00:00
