Commit Graph

53974 Commits

Author SHA1 Message Date
Northmoc
2e9afce987 headless_rider.txt 2021-11-05 09:42:40 -04:00
Northmoc
81e118fa2f markov_retribution.txt 2021-11-05 09:22:59 -04:00
Northmoc
ad0b59d8dc dying_to_serve.txt 2021-11-05 09:08:57 -04:00
Northmoc
2bc48f25ae edgars_awakening.txt 2021-11-05 08:32:04 -04:00
Northmoc
c9a2d28188 honored_heirloom.txt 2021-11-05 08:28:34 -04:00
Northmoc
f81850c0a8 patchwork_crawler.txt 2021-11-05 08:14:05 -04:00
Northmoc
537cd7684b voice_of_the_blessed.txt 2021-11-05 08:13:54 -04: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
Michael Kamensky
3e4ddeed5f Merge branch 'vow_2' into 'master'
VOW: 2 Nov

See merge request core-developers/forge!5717
2021-11-02 19:25:58 +00:00
Michael Kamensky
1271f30a4c Merge branch 'master' into 'master'
Improve AI handling for AICheckSVar

See merge request core-developers/forge!5721
2021-11-02 19:25:47 +00:00
Michael Kamensky
7800d0c6a6 - Tweak a comment. 2021-11-02 22:25:09 +03:00
Michael Kamensky
10cddb7c19 - Refactor AI SVar checking for both abilities and replacement effects. 2021-11-02 22:19:39 +03:00
Michael Kamensky
829b9069e2 - AiController: support AICheckSVar/AISVarCompare for ordinary SAs (abilities). 2021-11-02 22:12:17 +03:00
tool4EvEr
ae69417630 orderCardsByTheirOwners: Fix modifying original collection 2021-11-02 20:06:14 +01:00
Michael Kamensky
4bbdd5951b Merge branch 'ward' into 'master'
Ward only works on Permanents

See merge request core-developers/forge!5718
2021-11-02 18:57:03 +00:00
Northmoc
6949ce45fc allow for -AffectedX and other variations 2021-11-02 14:23:14 -04:00
Northmoc
ba94d8b589 toxrill_the_corrosive.txt 2021-11-02 14:22:34 -04:00
Northmoc
3e9a02d84e toxrill_the_corrosive.txt 2021-11-02 14:22:14 -04:00
tool4EvEr
4ab76d94db Ward only works on Permanents 2021-11-02 19:10:06 +01:00
Northmoc
8ead75042c ulvenwald_oddity_ulvenwald_behemoth.txt 2021-11-02 14:01:56 -04:00
Northmoc
3b17728da4 vilespawn_spider.txt 2021-11-02 13:34:26 -04:00
Michael Kamensky
94defab3ce Merge branch 'vow_1' into 'master'
VOW: 1 Nov

See merge request core-developers/forge!5713
2021-11-02 17:15:59 +00:00
Northmoc
ef36a5f233 Disturb check for Enchantment 2021-11-02 12:42:40 -04:00