Michael Kamensky
d246fce768
Merge branch 'twosat-master-patch-57305' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!5736
2021-11-03 19:57:11 +00:00
Andreas Bendel
569c802591
Update de-DE.properties
...
translated the new soundset lines
2021-11-03 19:56:07 +00:00
Michael Kamensky
18068df90c
Merge branch 'vow_3' into 'master'
...
VOW: 3 Nov
See merge request core-developers/forge!5734
2021-11-03 19:31:27 +00:00
Northmoc
4385a022dd
cemetery_protector.txt add DeckHints
2021-11-03 14:57:36 -04:00
Northmoc
3d0751eb6a
laid_to_rest.txt
2021-11-03 14:57:14 -04:00
Michael Kamensky
6c78256341
Merge branch 'conquest-classic-and-new' into 'master'
...
Planar Conquest: "Classic" original versions of several planes
See merge request core-developers/forge!5733
2021-11-03 18:30:29 +00:00
Michael Kamensky
7264965b32
- Add Classic versions of Ravnica, Theros, and Zendikar planes - with original events and without newer sets, for those who prefer the "pure" versions.
2021-11-03 21:22:07 +03:00
Michael Kamensky
ae35db2856
Merge branch 'vow_2' into 'master'
...
VOW: 2 Nov
See merge request core-developers/forge!5728
2021-11-03 18:10:12 +00:00
Northmoc
0605cb7543
radiant_grace_radiant_restraints.txt
2021-11-03 12:55:04 -04:00
Northmoc
bab727d624
grooms_finery.txt
2021-11-03 12:55:03 -04:00
Northmoc
89d7686efa
bloodsworn_squire_bloodsworn_knight.txt
2021-11-03 12:55:03 -04:00
Northmoc
997f0a070e
necroduality.txt
2021-11-03 12:55:02 -04:00
Northmoc
e2952d19ec
frenzied_devils.txt
2021-11-03 12:55:02 -04:00
Northmoc
fb84c400dc
fearful_villager_fearsome_werewolf.txt
2021-11-03 12:55:01 -04:00
Northmoc
304c8517ac
lunar_rejection.txt
2021-11-03 12:55:01 -04:00
Northmoc
524139f1ac
cloaked_cadet.txt
2021-11-03 12:55:00 -04:00
Northmoc
1e84a16a66
angelic_quartermaster.txt
2021-11-03 12:54:59 -04:00
Northmoc
4e4b1a4870
lantern_flare.txt
2021-11-03 12:51:37 -04:00
leriomaggio
9f563616e4
Card Art optimisation algorithm for DeckImport
...
The card art optimisation algorithm integrated into DeckImportController leverages (in terms of general logic) on the card art optimisation in Deck.
However, several are differences in terms of context and interactions so a specialised implementation is needed.
First, the smart card art optimisation has been added as an option in DeckImport. Therefore, smart card art is not a static game option to be used when loading decks with cards with no edition, but also as an option to tweak the deck list.
The second specialisation required is that this implementation takes into account any game format constraint (in terms of allowed sets for optimisation).
Last but not least, the current deck in editor (if any) will be also considered during optimisation.
In particular, when _importing cards_ in current deck (therefore, when not creating a new deck with the deck list) will also take into account the pools of current deck so that harmonisation will already consider where cards will be imported to.
2021-11-03 16:46:30 +00:00
leriomaggio
3184f90e62
Created new method in DeckController to return current deck in editor.
...
This method will be invoked by DeckImport (desktop) to pass on current deck in editor (if any) to the DeckImportController.
This deck will be eventually used as part of the smart card optimisation.
2021-11-03 16:39:51 +00:00
leriomaggio
a93eb31629
Changes to Token to replace card, new filter on types as for cardToken importable, and getText method to be dynamic for card tokens.
2021-11-03 16:32:44 +00:00
leriomaggio
4e355a7589
New entries for smart card art in Deck Import
...
(Italian translation is the only one submitted)
2021-11-03 16:31:05 +00:00
Michael Kamensky
bff581066d
Merge branch 'tidy' into 'master'
...
Tidy up one thing!
See merge request core-developers/forge!5729
2021-11-03 15:37:53 +00:00
Michael Kamensky
f82f55a132
Merge branch 'disturb' into 'master'
...
Disturb mechanic: specifically looking for Auras
See merge request core-developers/forge!5730
2021-11-03 15:37:00 +00:00
Northmoc
1c4b28f827
basris_acolyte.txt better TgtPrompt
2021-11-03 11:31:58 -04:00
Northmoc
8b1eb0ee2e
specifically looking for Auras
2021-11-03 10:28:32 -04:00
Michael Kamensky
b972f04089
Merge branch 'master' into 'master'
...
Added puzzle PS_MID3.
See merge request core-developers/forge!5727
2021-11-03 10:34:08 +00:00
Michael Kamensky
8083b88680
- Added puzzle PS_MID3.
2021-11-03 13:33:17 +03:00
Michael Kamensky
bd0191e63e
Merge branch 'sound-profiles' into 'master'
...
Selectable sound sets
See merge request core-developers/forge!5724
2021-11-03 10:08:09 +00:00
Michael Kamensky
607c1d41d4
Merge branch 'master' into 'master'
...
AICheckSVar: check in separate ways for AB/DBs and for REs
See merge request core-developers/forge!5726
2021-11-03 10:02:25 +00:00
Michael Kamensky
8cb079e2f9
- Tweak AICheckSVar implementation for abilities and REs.
2021-11-03 12:59:08 +03:00
Michael Kamensky
dc9dddb81f
Revert "- Refactor AI SVar checking for both abilities and replacement effects."
...
This reverts commit 10cddb7c19
2021-11-03 12:57:21 +03:00
Michael Kamensky
778d714ccd
- Don't require restart when changing sound sets.
2021-11-03 12:27:44 +03:00
Michael Kamensky
affedb7fe1
Merge branch 'olivia' into 'master'
...
Fix Discard not counting as effect
Closes #1937
See merge request core-developers/forge!5722
2021-11-03 09:08:51 +00:00
Michael Kamensky
8c4f2ba58b
Merge branch 'master' into 'master'
...
Minor Performance
See merge request core-developers/forge!5725
2021-11-03 08:14:09 +00:00
Anthony Calosa
1ef45fe3a5
Merge remote-tracking branch 'core/master'
2021-11-03 15:55:34 +08:00
Anthony Calosa
de74c9e62d
Minor Performance
...
- Clear image cache if necessary (prevent clearing if the downloaded data is not image)
- Cache missing cards (prevent finding missing cards unless the user has fetched/downloads an image)
- Clear preselected options for New Gauntlet Match (easier to filter decks for Gauntlet)
2021-11-03 15:50:07 +08:00
Michael Kamensky
a4c21c623f
- Fix imports.
...
- Add the sound set announcement and a couple other announcements as well.
2021-11-03 09:39:46 +03:00
Michael Kamensky
61ce25f2dd
- Change the name "sound profile" to "sound set", which makes more sense.
...
- Reset to Default profile in absence of custom sound sets.
2021-11-03 09:33:01 +03:00
Michael Kamensky
74fbb1ed57
- Mobile settings for the sound profile.
...
- Tweaked the sound profile setting hint.
2021-11-03 09:14:57 +03:00
Michael Kamensky
5aa25f7ad0
- Initial implementation of sound profiles, part 2.
2021-11-03 09:01:53 +03:00
Michael Kamensky
238a3ea17a
- Initial implementation of sound profiles, part 1.
2021-11-03 08:49:52 +03:00
Michael Kamensky
af2ae37451
Merge branch 'adventure' into 'master'
...
Fixed some bugs and save/load
See merge request core-developers/forge!5723
2021-11-03 04:04:15 +00:00
Grimm
81917407b3
Merge remote-tracking branch 'origin/adventure' into adventure
2021-11-03 03:07:53 +01:00
Grimm
0e51edd949
Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure
2021-11-03 03:04:17 +01:00
Grimm
ae80b533e4
Fixed memory leak in UIScene
...
Fixed spelling errors in data
Reworked save/load to get backward compatibility possibilities.
added auto save and quick save.
Fixed card downloads in shops/reward screens
2021-11-03 03:04:02 +01:00
tool4EvEr
89e345e5be
Fix Discard not counting as effect
2021-11-02 23:08:55 +01:00
Michael Kamensky
db81fb9e57
Merge branch 'disturb' into 'master'
...
VOW: Disturb Enchantments should target (and a few cards)
See merge request core-developers/forge!5712
2021-11-02 19:27:30 +00:00
Michael Kamensky
7adfe45cc4
Merge branch 'modifying' into 'master'
...
orderCardsByTheirOwners: Fix modifying original collection
See merge request core-developers/forge!5720
2021-11-02 19:26:54 +00:00
Michael Kamensky
78c8c9f958
Merge branch 'toxrill' into 'master'
...
VOW: Toxrill, the Corrosive
See merge request core-developers/forge!5719
2021-11-02 19:26:22 +00:00
