leriomaggio
01d117b07e
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-07-23 22:38:23 +01:00
leriomaggio
b3ce4bf9ff
New Options for Smart Card Art Selection
2021-07-23 22:38:19 +01:00
leriomaggio
f52dbdb996
Requires Restart for Preferred Art was set to the wrong label
2021-07-23 20:01:23 +01:00
leriomaggio
7d2a62714c
Removed repeated/duplicate entries
2021-07-23 19:43:52 +01:00
Michael Kamensky
ef917a91b9
Merge branch 'update_translation_dice_class' into 'master'
...
Fix translation issues for Class and dice rolling cards
See merge request core-developers/forge!5098
2021-07-23 15:59:52 +00:00
Lyu Zong-Hong
b28e32460d
Fix translation issues for Class and dice rolling cards
2021-07-23 23:40:04 +09:00
leriomaggio
f0c584f9d0
FIX bug of DeckViewer on window auto-resize
...
On my laptop, the dimensions of the deck viewer rescaled were ridiculously small, and smaller even than "small deck viewer".
I've removed the scaling factor, which caused the issue.
2021-07-23 10:53:17 +01:00
Michael Kamensky
7dcf2c6131
Merge branch 'afr_update_translation' into 'master'
...
Update translations for AFR release
See merge request core-developers/forge!5096
2021-07-23 09:46:13 +00:00
Michael Kamensky
49fe438790
Merge branch 'afr_oracle_update' into 'master'
...
Update oracles with AFR release
See merge request core-developers/forge!5095
2021-07-23 09:45:57 +00:00
leriomaggio
32d0e14a35
New Preferred Card Art Preference with two separate controllers
...
Now menu settings (on Desktop App) includes the preferred art option selection as separated in two settings.
The former is to decide whether Latest or Original Art should be used; the latter specifies whether only core, exp. and reprint sets should be considered.
All translation files have been updated, aligned, and extended accordingly.
The MAJOR update here is that now options for Art are fully localised too!! (so far only for Desktop App)
2021-07-23 10:45:54 +01:00
Lyu Zong-Hong
f559bd98ef
Update translations for AFR release
2021-07-23 16:19:40 +09:00
leriomaggio
5c27c57f74
New and Refined methods to get and set cart art preferences for all instances of CardDb
2021-07-23 07:57:30 +01:00
leriomaggio
89bdb79d03
New methods (w. tests) to setup card art preferences
...
CardDb now includes a more refined mechanism to set up values for CardArt Preference.
These methods do now support the proper setup for legacy values and string values (as supported previously in mobile version).
Moreover, new methods are now defined to support the new (separated) pair of settings as integrated into the Desktop App.
2021-07-23 07:45:59 +01:00
leriomaggio
6be921c1a2
FIX for CustomCardReader to support instantiation when no custom edition has been found
2021-07-23 07:37:32 +01:00
Lyu Zong-Hong
a3372980e5
Update oracles with AFR release
2021-07-23 15:31:40 +09:00
Lyu Zong-Hong
a42d64353e
Update oracles with AFR release
2021-07-23 15:02:11 +09:00
Michael Kamensky
445826e50e
Merge branch 'NPE' into 'master'
...
Fix some NPE from token table
See merge request core-developers/forge!5089
2021-07-23 04:25:47 +00:00
Michael Kamensky
998873f311
Merge branch 'mathas' into 'master'
...
Fix Mathas
See merge request core-developers/forge!5090
2021-07-23 04:25:07 +00:00
Michael Kamensky
85b2d97a4c
Merge branch 'lorcan' into 'master'
...
Added Lorcan, Warlock Collector
See merge request core-developers/forge!5091
2021-07-23 04:24:49 +00:00
Michael Kamensky
eaa6d6acd6
Merge branch 'master' into 'master'
...
update simplified chinese translation
See merge request core-developers/forge!5092
2021-07-23 04:24:23 +00:00
Michael Kamensky
d1c0d7f49b
Merge branch 'fix_fevered_suspicion' into 'master'
...
Fixed Fevered Suspicion (issue #1934 )
See merge request core-developers/forge!5093
2021-07-23 04:24:14 +00:00
Michael Kamensky
20712cc652
Merge branch 'share_the_spoils' into 'master'
...
Add Share the Spoils
See merge request core-developers/forge!5084
2021-07-23 04:24:00 +00:00
Lyu Zong-Hong
ebcfa5b084
Add ValidSA check to LandPlayed trigger
2021-07-23 11:38:55 +09:00
Wendell Wilkerson
cb2d44a35c
missing Amount$ All added
2021-07-22 21:11:41 -05:00
CCTV-1
62ef92364f
update simplified chinese translation
2021-07-23 10:06:00 +08:00
Lyu Zong-Hong
5d9e0f54a6
Merge branch 'master' into share_the_spoils
2021-07-23 10:38:42 +09:00
paul_snoops
10645c4da8
Added Lorcan, Warlock Collector
2021-07-22 19:52:34 +01:00
tool4EvEr
28ab74ce06
Fix Mathas
2021-07-22 20:48:00 +02:00
tool4EvEr
0c745c51fd
Fix some NPE from token table
2021-07-22 20:14:12 +02:00
Michael Kamensky
e1f3293126
Merge branch 'tidy' into 'master'
...
tidy up dungeon_crawler.txt
See merge request core-developers/forge!5088
2021-07-22 16:48:54 +00:00
Northmoc
fed5b9af3d
tidy up dungeon_crawler.txt
2021-07-22 12:29:03 -04:00
Michael Kamensky
09a4d6f4e2
Merge branch 'kheru' into 'master'
...
Kheru Spellsnatcher: Fix playing MDFC lands
See merge request core-developers/forge!5086
2021-07-22 15:37:30 +00:00
Michael Kamensky
66d37c324f
Merge branch 'TRT-master-patch-88120' into 'master'
...
Update forge-gui/res/cardsfolder/p/precipitous_drop.txt
Closes #1936
See merge request core-developers/forge!5087
2021-07-22 15:36:13 +00:00
Bug Hunter
ff1cd7d01b
Update forge-gui/res/cardsfolder/p/precipitous_drop.txt
2021-07-22 15:08:11 +00:00
tool4EvEr
1665d3ec67
Kheru Spellsnatcher: Fix playing MDFC lands
2021-07-22 13:32:13 +02:00
Alumi
b7534d3c97
Merge branch 'landplay' into 'master'
...
PlayEffect fixes
Closes #1932
See merge request core-developers/forge!5074
2021-07-22 10:53:57 +00:00
Bug Hunter
21e16e24be
PlayEffect fixes
2021-07-22 10:53:56 +00:00
Bug Hunter
85e8446f32
Merge branch 'TRT-master-patch-21564' into 'master'
...
Update forge-gui/res/cardsfolder/t/thieves_tools.txt
See merge request core-developers/forge!5085
2021-07-22 10:11:11 +00:00
Bug Hunter
47337a8414
Update forge-gui/res/cardsfolder/t/thieves_tools.txt
2021-07-22 10:10:39 +00:00
Michael Kamensky
6e41ad9288
Merge branch 'master' into 'master'
...
Ban Commander Only Cards in Limited
See merge request core-developers/forge!5083
2021-07-22 09:45:01 +00:00
Meerkov
b4928378c9
Fix CARDNAME on 6 cards
...
Some spell descriptions were not properly using CARDNAME. This is relevant because Mutate, etc.
2021-07-22 09:45:01 +00:00
Lyu Zong-Hong
996d6011f4
Add Share the Spoils
2021-07-22 16:34:11 +09:00
Alumi
4b5eb736e0
Merge branch 'master' into 'master'
...
Fix CARDNAME on 5 cards
See merge request core-developers/forge!5082
2021-07-22 06:21:18 +00:00
Meerkov
4c08a961d7
Fix CARDNAME on 6 cards
...
Some spell descriptions were not properly using CARDNAME. This is relevant because Mutate, etc.
2021-07-22 06:21:17 +00:00
Michael Kamensky
fcf645e8d0
Merge branch 'master' into 'master'
...
Unban Hasran Ogress & King Suleiman
See merge request core-developers/forge!5081
2021-07-22 04:50:10 +00:00
Meerkov
3b3e4a3d42
Unban Hasran Ogress & King Suleiman
...
Motivation: There are too many cards banned for AI use in the ARN set. It's something like half of the cards. This unbans 2 cards that are viable for the AI to use.
King Suleiman has no AI problems. It kills Efreets and Djinns in ARN, but also kills Changelings in newer sets. There is no reason for this card to be banned.
Hasran Ogress is banned because the AI currently will never attack using it, even when it has mana open. However, you can still do a lot worse than a 2 mana 3/2 defender. Hasran Ogress is better than several walls in Alpha, and allowing the AI to play this card will make the AI decks stronger, even when played as a defender.
2021-07-21 21:48:53 -07:00
Michael Kamensky
b363db47bc
Merge branch 'master' into 'master'
...
Bug Fix: Regenerate Tribal permanents
See merge request core-developers/forge!5079
2021-07-22 04:33:44 +00:00
Meerkov
dbf8ffd4a6
Change + to .
...
Hanmac said to do change this. I didn't test it.
2021-07-21 15:32:54 -07:00
Michael Kamensky
d883bdd67f
Merge branch 'net_decks_archive' into 'master'
...
Net Deck Archive Pauper (Desktop & Android)
See merge request core-developers/forge!5078
2021-07-21 16:55:00 +00:00
leriomaggio
5b500bc568
Updated tests with newest cardart preference + new tests for counterspell for the many reprints.
2021-07-21 17:37:06 +01:00
