Michael Kamensky
2ecefa4921
Merge branch 'master' into 'master'
...
FlipOntoBattlefield: somewhat improve the chance to hit an attachment when targeting the card it's attached to.
See merge request core-developers/forge!5672
2021-10-29 10:40:26 +00:00
Michael Kamensky
b7a4175d61
- FlipOntoBattlefieldEffect: somewhat improve the chance to hit an attachment when targeting the card it's attached to.
2021-10-29 13:39:06 +03:00
Michael Kamensky
7a4423bc90
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-10-29 13:38:30 +03:00
Michael Kamensky
091ea87290
Merge branch 'afr-plane' into 'master'
...
Forgotten Realms plane for Planar Conquest
See merge request core-developers/forge!5503
2021-10-29 10:37:51 +00:00
Michael Kamensky
5f6987a016
- Added an event to the W region.
...
- Finished the W region.
- Slightly improved the Braids, Conjurer Adept Avatar AI logic.
2021-10-29 10:37:50 +00:00
Michael Kamensky
9a419ef97b
Merge branch 'edition_updates' into 'master'
...
Crimson Vow edition updates
See merge request core-developers/forge!5671
2021-10-29 10:37:37 +00:00
leriomaggio
e20b46dde2
Constructed Deck Editor controller updates the decklist cursor to select current deck in editor (if any).
...
The DeckView = when initialised = after editing the current deck in editor, tries to select it in the decklist view. However, at startup this won't be actually successful due to an un-initialised table model.
The issue only happens at startup time, and it is related to the fact that despite any selected item can be set (with the current Deck in editor) - see `populate` - the `update` method that initialise the (table)models is only called afterwards.
Therefore, the update method of Controller has been modified to re-try a selection with current deck in editor.
The whole procedure is skipped if the selected index is different from zero = assuming zero is the default fallback option.
If that's not the case, say the zero first deck should be indeed selected, the selected item shouldn't be activated twice anyway if that's exactly what's already been selected.
2021-10-29 11:25:51 +01:00
paul_snoops
9903a274c2
CC2 date change
2021-10-29 11:22:37 +01:00
paul_snoops
1dcf336f83
Crimson Vow edition updates
2021-10-29 11:20:42 +01:00
leriomaggio
b7b11ffba7
Deck Editor init which is null-aware.
2021-10-29 10:37:43 +01:00
leriomaggio
acb60979b9
Fixed outdated docstrings to avoid annoying IDE warnings
2021-10-29 10:37:12 +01:00
leriomaggio
237a423180
Added caching strategy when (deep) comparing decks
...
Deck model comparison may be triggered a certain number of times, and the new deep-comparison on each part may slow down performance in deck editor. Therefore, a caching strategy has been integrated to avoid comparing the same objects multiple times.
2021-10-29 10:36:34 +01:00
Michael Kamensky
d4b4fc38a4
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-10-29 07:24:38 +03:00
Michael Kamensky
3c5182e15c
Merge branch 'voc_28' into 'master'
...
VOC: 28 Oct
See merge request core-developers/forge!5669
2021-10-29 04:15:45 +00:00
Northmoc
739bb6416e
Wedding Ring trigger support
2021-10-28 22:36:10 -04:00
Northmoc
3bf3f69bdb
wedding_ring.txt
2021-10-28 22:35:49 -04:00
Northmoc
7c3696cc7e
millicent_restless_revenant.txt
2021-10-28 22:08:41 -04:00
Northmoc
ac1d3c1afb
typo fix
2021-10-28 21:49:08 -04:00
Tim Mocny
6505c8c55c
Merge branch 'blood' into 'master'
...
VOW blood token
See merge request core-developers/forge!5670
2021-10-29 00:25:59 +00:00
Northmoc
e69dd1cebe
VOW blood token
2021-10-28 20:25:23 -04:00
Northmoc
9d62cfa710
strefan_maurer_progenitor.txt
2021-10-28 20:24:09 -04:00
leriomaggio
663ebd4120
Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format
2021-10-28 23:20:48 +01:00
leriomaggio
35eca6f038
Better control on Deck save and editor state set + FIX set deck name
...
the loadDeck method now has a better handling of the deck (model) status, also wrt. the state of the UI editor.
If the deck is Stored, the editor will be in "modified - not saved" state.
2021-10-28 23:20:31 +01:00
Anthony Calosa
1ae7a4513d
Merge branch 'fix-smart-card-art-net-decks' into 'master'
...
QuickFIX deckSection validation in Decks that inhibited the smart card art option to trigger
See merge request core-developers/forge!5667
2021-10-28 20:38:20 +00:00
leriomaggio
c465350517
Merge remote-tracking branch 'upstream/master' into fix-smart-card-art-net-decks
2021-10-28 21:36:08 +01:00
leriomaggio
40dac70ebf
QuickFIX deckSection validation in Decks that inhibited the smart card art option to trigger
...
This MR brings a quick FIX to `validateDeferredSections` method in Deck which erroneously considered entries in filtered Card Pool as for the valid deck entries, instead of the original one.
Incidentally this affected only decks with no specified edition, imposing one given by card Db query using default Card Art Preference.
In other word, no card with NO edition was found and smart card art was never triggered.
This now won't be the case!
Another quick fix in `getAllCardNamesWithNoSpecifiedEdition` to skip all sections that are not MAIN | SIDE | Commander for which card art harmonisation is necessary.
2021-10-28 21:35:32 +01:00
Michael Kamensky
d87d609765
Merge branch 'VOW_edition' into 'master'
...
VOW and VOC initial edition files
See merge request core-developers/forge!5664
2021-10-28 19:54:26 +00:00
Michael Kamensky
8f8363f12a
Merge branch 'foiling' into 'master'
...
Fix dropping foil from card when copying
See merge request core-developers/forge!5666
2021-10-28 19:54:20 +00:00
tool4EvEr
2de6fc476c
Fix dropping foil from card when copying
2021-10-28 21:20:45 +02:00
paul_snoops
d1769c12d4
VOW and VOC initial edition files
2021-10-28 19:19:17 +01:00
Michael Kamensky
45ab214cee
Merge branch 'TRT-master-patch-83249' into 'master'
...
Update forge-gui/res/cardsfolder/l/ludevic_necro_alchemist.txt
See merge request core-developers/forge!5663
2021-10-28 14:06:48 +00:00
Bug Hunter
65fd0974ca
Update forge-gui/res/cardsfolder/l/ludevic_necro_alchemist.txt
2021-10-28 13:25:47 +00:00
Michael Kamensky
218c9e4ea1
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-10-28 07:11:01 +03:00
Sol
0892d6de4a
Update kolvori_god_of_kinship_the_ringhart_crest.txt
2021-10-28 01:24:11 +00:00
Michael Kamensky
bae0675d00
Merge branch 'fury' into 'master'
...
Fix Fury
Closes #1995
See merge request core-developers/forge!5662
2021-10-27 18:39:27 +00:00
tool4EvEr
1d0739d728
Fix Fury
2021-10-27 20:38:15 +02:00
Michael Kamensky
4af9cd9034
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-10-27 19:47:39 +03:00
Michael Kamensky
0fd1e9256f
Merge branch 'tidy' into 'master'
...
StackDescription tweaks
See merge request core-developers/forge!5661
2021-10-27 16:34:51 +00:00
Bug Hunter
7e28570ed3
Merge branch 'piles' into 'master'
...
TwoPilesEffect fix
See merge request core-developers/forge!5660
2021-10-27 14:51:34 +00:00
Northmoc
04c52e95e6
MillEffect improve StackDesc
2021-10-27 10:51:24 -04:00
Northmoc
49b54e3d30
DigEffect improve StackDesc
2021-10-27 10:51:02 -04:00
Northmoc
24be7eb802
fact_or_fiction.txt improve StackDesc
2021-10-27 10:50:41 -04:00
Northmoc
9353587b89
TwoPilesEffect fix
2021-10-27 10:47:37 -04:00
Michael Kamensky
cdd4947c15
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-10-27 14:39:29 +03:00
Anthony Calosa
4df02c943e
Merge branch 'master' into 'master'
...
prevent NPE
See merge request core-developers/forge!5659
2021-10-27 05:34:34 +00:00
Anthony Calosa
d921677e60
prevent NPE
2021-10-27 13:33:16 +08:00
Michael Kamensky
1ca7eb6c52
Merge branch 'master' into 'master'
...
Net Decks Archive Updates
See merge request core-developers/forge!5655
2021-10-27 04:22:27 +00:00
Michael Kamensky
7370f2a6cf
Merge branch 'foiling' into 'master'
...
Fix deck loading not restoring foiled status
See merge request core-developers/forge!5656
2021-10-27 04:22:23 +00:00
Michael Kamensky
ac6bdc09e2
Merge branch 'typo' into 'master'
...
sorin_lord_of_innistrad.txt typo
See merge request core-developers/forge!5658
2021-10-27 04:21:54 +00:00
Michael Kamensky
93cd28f40c
Merge branch 'urza' into 'master'
...
Urza, Academy Headmaster
See merge request core-developers/forge!5657
2021-10-27 04:21:39 +00:00
