Commit Graph

53916 Commits

Author SHA1 Message Date
Northmoc
0df5526452 add ReplaceLifeReduced 2021-09-11 23:12:22 -04:00
Northmoc
314df20711 enduring_angel_angelic_enforcer.txt 2021-09-11 23:12:21 -04:00
Northmoc
b13f4f4ae2 faithful_mending.txt 2021-09-11 23:10:02 -04:00
Northmoc
abbe687419 vampire_socialite.txt (Suthro) 2021-09-11 23:10:02 -04:00
leriomaggio
fb092c77a4 BUG FIX for Smart Card Art selection
This subtle bug occurred whenever the algorithm for smart card art selection wanted to add a card with multiple arts and the number of cards per art to add was not even. To avoid zeros, the cardsPerArtIndex was set at least to one, and so the rest - leading then to adding too many (extra) cards not originally present in the deck.

Thanks to @Snoops for the heads up.
2021-09-12 00:56:44 +01:00
Bug Hunter
c03fc6cfd0 Update forge-gui/res/cardsfolder/r/riftmarked_knight.txt 2021-09-11 19:41:15 +00:00
Mark Wiggans
bcaf23c5ff Have ImageCache recognize images with white corners and crop them out 2021-09-11 11:32:37 -04:00
leriomaggio
f8d5eae4ce Removed unused import
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-11 16:03:42 +01:00
leriomaggio
0d022c0f7e Latest changes to DeckImporter UI using HTML text and Statistics borrowed from Deck Editor.
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-11 13:48:35 +01:00
leriomaggio
91246ecd83 Latest translation and UI of DeckImport (removing unused labels)
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-11 13:47:53 +01:00
leriomaggio
98dd5f4b8b Replacing "replace deck" with "create new deck" command
The new one makes things a bit self explanatory than "replace deck" since the current deck isn't actually replaced (i.e. not eliminated).

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-11 13:46:16 +01:00
Anthony Calosa
a5aa29f65e Merge branch 'kevlahnota-master-patch-56985' into 'master'
Update Forge.java

See merge request core-developers/forge!5325
2021-09-11 10:25:05 +00:00
Anthony Calosa
2dd5a49e62 Update Forge.java 2021-09-11 10:23:49 +00:00
Michael Kamensky
1328b0bc7d Merge branch 'MID_update' into 'master'
MID update

See merge request core-developers/forge!5324
2021-09-11 09:35:46 +00:00
Michael Kamensky
def434bdb7 Merge branch 'cleanup' into 'master'
Minor Cleanup

See merge request core-developers/forge!5322
2021-09-11 09:35:17 +00:00
Michael Kamensky
e781825f31 Merge branch 'Meerkov-master-patch-21940' into 'master'
Unban Orcish Artillery

See merge request core-developers/forge!5321
2021-09-11 09:34:21 +00:00
Michael Kamensky
88658dcf87 Merge branch 'Meerkov-master-patch-67925' into 'master'
AI Ban: False Orders

See merge request core-developers/forge!5320
2021-09-11 09:33:57 +00:00
paul_snoops
1bb053adaf MID update 2021-09-11 10:29:04 +01:00
Anthony Calosa
5db87cf0a1 Merge branch 'master' into 'master'
[Mobile] Disable cardBG Texture for Android 9 and below

See merge request core-developers/forge!5323
2021-09-11 09:18:05 +00:00
Anthony Calosa
01b80cfc78 Merge remote-tracking branch 'remotes/core/master' 2021-09-11 17:14:17 +08:00
Anthony Calosa
eddbc1e94a [Mobile] Disable cardBG Texture for Android 9 and below
on Android 10+ (4 GB RAM) it works fine however Android 9 and below with at least 4 GB RAM, it crashes at startup if it tries to read and load the big texture file. Needs investigation
2021-09-11 17:13:20 +08:00
tool4EvEr
052b73bda2 Minor Cleanup 2021-09-11 10:26:01 +02:00
Meerkov
49fdfdbe61 Unban Orcish Artillery 2021-09-11 08:15:36 +00:00
Meerkov
cefc86b13f The AI doesn't know how to use this card, and currently it's clogging up AI decks in LEB. 2021-09-11 08:04:08 +00:00
Michael Kamensky
1e359236ae Merge branch 'master' into 'master'
Net Decks Archive Updates

See merge request core-developers/forge!5319
2021-09-11 03:22:13 +00:00
Churrufli
d327e789c1 Net Decks Archive Updates 2021-09-10 20:41:21 +02:00
leriomaggio
455acffeab Update to SmartCardArt accounting for any preferred art.
If there is any preferredArt, update will never be applied.
The scenario is: if card was originally without any specified edition, AND there is preferred art, that would've been returned in the first place.

Thus, if the smartCardArt optimisation is enabled, any card with the preferred art won't be updated iff edition and artIndex coincide.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-10 18:23:36 +01:00
Grimm
6d2dd7ad92 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-09-10 17:41:33 +02:00
Grimm
639cd42c43 Added some comments, cleaned up names and code 2021-09-10 17:36:05 +02:00
leriomaggio
e90b0323b7 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-09-10 16:10:13 +01:00
Michael Kamensky
fb24fe1d3d Merge branch 'artpreference-carddb-fix' into 'master'
Re-add to carddb the integration with CardPreferences on Mobile version

See merge request core-developers/forge!5316
2021-09-10 13:52:19 +00:00
leriomaggio
ade839bec4 Removed from Deck controls on Deck Sections as now the DeckSection validation mechanism has been already integrated when loading deck.
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-10 14:27:31 +01:00
leriomaggio
3d3ed1a281 Merge remote-tracking branch 'upstream/master' into artpreference-carddb-fix 2021-09-10 14:22:14 +01:00
leriomaggio
edfbbfb789 CardPreferences to work with latest setPreferredArt API in CardDb w/ backward compatibility 2021-09-10 14:10:21 +01:00
leriomaggio
27ab4c35a3 Re-add to carddb the integration with CardPreferences on Mobile version
On Mobile Forge Port (only) there is the possibility to set a preferred art for a card, from card catalog.
Once a card art is selected, it will always be returned for that specific art whenever no other specific edition is specified.
This commit adds changes to cardDb setPreferredArtMethod (API) and CardRequest.fromString to work with any preferred art (if any).

CardRequests reflects this change by adding another (private) constructor which expects to create a CardRequest from a preferredArt entry in the form of (CardName|SetCode|ArtIndex)
2021-09-10 14:09:25 +01:00
leriomaggio
9d235924ec Re-add to carddb the integration with CardPreferences on Mobile version
On Mobile Forge Port (only) there is the possibility to set a preferred art for a card, from card catalog.
Once a card art is selected, it will always be returned for that specific art.
This commit adds changes to cardDb setPreferredArtMethod (API) and CardRequest.fromString to work with any preferred art (if any).

CardRequests reflects this change by adding another (private) constructor which expects to create a CardRequest from a preferredArt entry in the form of (CardName|SetCode|ArtIndex)
2021-09-10 13:26:30 +01:00
Michael Kamensky
9faae6009e Merge branch 'master' into 'master'
Update formats

See merge request core-developers/forge!5315
2021-09-10 11:38:22 +00:00
Snoops
6b52b796e9 Merge branch 'format_updates' into 'master'
Format updates

See merge request paul_snoops/forge!1
2021-09-10 10:16:40 +00:00
Snoops
b62d9fd375 Update Vintage.txt 2021-09-10 10:10:23 +00:00
Snoops
7305f8e949 Update Legacy.txt 2021-09-10 10:03:46 +00:00
Snoops
e19062267f Update Standard.txt 2021-09-10 09:54:23 +00:00
Snoops
bd989f1e1d Update Extended.txt 2021-09-10 09:48:06 +00:00
Snoops
45ff8c8919 Update Oathbreaker.txt 2021-09-10 09:46:37 +00:00
Snoops
e686eaa0de Update Commander.txt 2021-09-10 09:38:44 +00:00
Snoops
58d660a682 Update Pauper.txt 2021-09-10 09:01:35 +00:00
Hans Mackowiak
63cc173c79 Merge branch 'flashbackCostFix' into 'master'
GameActionUtil: fix Flashback cost so it only replaces ManaCost

See merge request core-developers/forge!5310
2021-09-10 05:19:45 +00:00
Hans Mackowiak
7d7964aae3 GameActionUtil: fix Flashback cost so it only replaces ManaCost 2021-09-10 05:19:44 +00:00
Michael Kamensky
5dae60be29 Merge branch 'mid_9' into 'master'
MID - 9 Sep

See merge request core-developers/forge!5312
2021-09-10 04:09:29 +00:00
Michael Kamensky
8e8a383771 Merge branch 'fix' into 'master'
Small keyword fix

See merge request core-developers/forge!5313
2021-09-10 04:04:00 +00:00
Sol
39cd84f7f3 Update guardian_of_faith.txt 2021-09-10 03:52:52 +00:00