Commit Graph

52834 Commits

Author SHA1 Message Date
Anthony Calosa
d185f16991 Merge branch 'kevlahnota-master-patch-62431' into 'master'
Update Commander Collection Black.txt

See merge request core-developers/forge!5343
2021-09-13 08:04:54 +00:00
Anthony Calosa
e97cdbb293 Update Commander Collection Black.txt 2021-09-13 08:04:31 +00:00
Michael Kamensky
99fdd4b551 Merge branch 'MID/cards-2' into 'master'
More cards

See merge request core-developers/forge!5335
2021-09-13 03:28:51 +00:00
Stu Bob
9cfc6897c5 More cards:
clarion_cathars
gavony_silversmith
soul_guide_gryff
homestead_courage

Something is wrong with Hedgewitch's Mask the can't be blocked clause doesn't seem to be working.
2021-09-13 03:28:49 +00:00
Michael Kamensky
3785caa9b7 Merge branch 'typo' into 'master'
Minor typos and AI

See merge request core-developers/forge!5340
2021-09-13 03:24:06 +00:00
Michael Kamensky
3b5fe84bb2 Merge branch 'MID/initial-draft-rankings' into 'master'
Initial Draft ranking

See merge request core-developers/forge!5342
2021-09-13 03:19:29 +00:00
Michael Kamensky
33a32517ad Merge branch 'smallfix' into 'master'
Follow up fixes

See merge request core-developers/forge!5336
2021-09-13 03:19:05 +00:00
stubob
01516d2019 Initial Draft ranking from https://draftsim.com/MID-pick-order.php 2021-09-12 20:25:08 -06:00
Northmoc
db34d1f341 covert_cutpurse_covetous_geist.txt add missing triggers 2021-09-12 21:45:32 -04:00
Northmoc
75d7f2abf3 ritual_guardian.txt 2021-09-12 21:20:22 -04:00
Northmoc
257e32a4e3 candlegrove_witch.txt & covetous_castaway_ghostly_castigator.txt 2021-09-12 21:18:07 -04:00
Northmoc
2d1c665fc0 gravebreaker_lamia.txt add AI hints 2021-09-12 20:50:44 -04:00
Northmoc
d5c8b0106d patrician_geist.txt 2021-09-12 20:49:47 -04:00
Northmoc
e24d6a6495 augur_of_autumn.txt 2021-09-12 20:41:39 -04:00
Northmoc
fdec280baa turn_the_earth.txt 2021-09-12 20:41:38 -04:00
Northmoc
2a46e193f3 purifying_dragon.txt 2021-09-12 20:41:37 -04:00
Northmoc
b6c281529c dawnhart_wardens.txt 2021-09-12 20:41:37 -04:00
Northmoc
e4cd251a4b voldaren_ambusher.txt (Suthro) 2021-09-12 20:41:36 -04:00
Northmoc
8257f16a5d ghoulcallers_harvest.txt 2021-09-12 20:41:36 -04:00
Northmoc
bd3ca5115b fleshtaker.txt 2021-09-12 20:41:35 -04:00
Northmoc
2bf4821b8e unnatural_growth.txt 2021-09-12 20:41:35 -04:00
Northmoc
fcd29e27be diregraf_rebirth.txt 2021-09-12 20:41:35 -04:00
Northmoc
074439200f croaking_counterpart.txt 2021-09-12 20:41:34 -04:00
Northmoc
accd7c667e minor typos 2021-09-12 20:40:37 -04:00
Northmoc
daa3a66d5e minor typos 2021-09-12 20:40:37 -04:00
Northmoc
901b715947 fix SpellDesc 2021-09-12 20:40:36 -04:00
tool4EvEr
819c92c28a Follow up fixes 2021-09-12 21:08:23 +02:00
Michael Kamensky
fdc387245b Merge branch 'hiddenKeywords' into 'master'
Card: refactor hidden keywords into Table Structure

See merge request core-developers/forge!5271
2021-09-12 15:48:35 +00:00
Hans Mackowiak
bfc938be57 Card: refactor hidden keywords into Table Structure 2021-09-12 15:48:34 +00:00
Michael Kamensky
5ec5cf0a96 Merge branch 'master' into 'master'
Added puzzles PS_AFR2 - PS_AFR4. Updated GameState to support PS_AFR3, renamed PS_AFR1.

See merge request core-developers/forge!5334
2021-09-12 15:46:24 +00:00
Michael Kamensky
49ea4b99e7 - Added puzzles PS_AFR2 - PS_AFR4.
- Tweaked GameState to allow precasting spells from alternate card faces.
- Renamed puzzle PS_AFR1.
2021-09-12 18:45:13 +03:00
Michael Kamensky
15f1526d95 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-09-12 17:43:54 +03:00
Michael Kamensky
83a7cc8a3e Merge branch 'Meerkov-master-patch-85773' into 'master'
AI Ban Camouflage

See merge request core-developers/forge!5331
2021-09-12 10:07:18 +00:00
Michael Kamensky
3d830f532e Merge branch 'fireball' into 'master'
Fix Fireball

Closes #1970

See merge request core-developers/forge!5333
2021-09-12 10:06:38 +00:00
tool4EvEr
df4c64070d Fix Fireball 2021-09-12 10:29:49 +02:00
Anthony Calosa
2e437dcbae Merge branch 'master' into 'master'
[Mobile] Fix blinking card images while using online image fetcher

See merge request core-developers/forge!5332
2021-09-12 07:58:05 +00:00
Anthony Calosa
6f0ba03d24 [Mobile] Fix blinking card images while using online image fetcher
- also cache card list for faster lookup
2021-09-12 15:52:57 +08:00
Meerkov
615ec642d2 AI Ban Camouflage 2021-09-12 06:20:52 +00:00
Michael Kamensky
8149cbb507 Merge branch 'white-corners' into 'master'
Crop out white corners when importing images

Closes #1965

See merge request core-developers/forge!5326
2021-09-12 03:45:15 +00:00
Michael Kamensky
410df067bd Merge branch 'TRT-master-patch-19508' into 'master'
Update forge-gui/res/cardsfolder/r/riftmarked_knight.txt

See merge request core-developers/forge!5327
2021-09-12 03:44:07 +00:00
Michael Kamensky
29a274ed93 Merge branch 'quick-fix-smart-card-art' into 'master'
BUG FIX for Smart Card Art selection

See merge request core-developers/forge!5329
2021-09-12 03:43:51 +00:00
Michael Kamensky
6f45745c6d Merge branch 'mid_10' into 'master'
MID - 11 Sep

See merge request core-developers/forge!5330
2021-09-12 03:42:58 +00:00
Michael Kamensky
bbbfe8ddb1 Merge branch 'cost_formats' into 'master'
Update some cost and prompt formats

See merge request core-developers/forge!5314
2021-09-12 03:42:37 +00:00
Michael Kamensky
d00c5c81a6 Merge branch 'ea_ae' into 'master'
Enduring Angel // Angelic Enforcer and support

See merge request core-developers/forge!5317
2021-09-12 03:42:11 +00:00
Northmoc
6e0b6a2b9e counter name to lower case in prompt 2021-09-11 23:13:46 -04:00
Northmoc
957e3ebfb0 Various typos and formatting fixes 2021-09-11 23:13:45 -04:00
Northmoc
cfc143f398 improve CostRemoveCounter prompt formatting 2021-09-11 23:13:45 -04:00
Northmoc
23967b3d85 improve CostRemoveAnyCounter prompt formatting 2021-09-11 23:13:44 -04:00
Northmoc
db988abb4f Change SimpleString to comma for multiple parts 2021-09-11 23:13:44 -04:00
Northmoc
60d4d14320 SetLife instead of GainLife 2021-09-11 23:12:23 -04:00