Commit Graph

17938 Commits

Author SHA1 Message Date
Northmoc
901b715947 fix SpellDesc 2021-09-12 20:40:36 -04: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
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
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
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
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
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
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
60d4d14320 SetLife instead of GainLife 2021-09-11 23:12:23 -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
Bug Hunter
c03fc6cfd0 Update forge-gui/res/cardsfolder/r/riftmarked_knight.txt 2021-09-11 19:41:15 +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
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
Churrufli
d327e789c1 Net Decks Archive Updates 2021-09-10 20:41:21 +02: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
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
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
Northmoc
07bbd32af5 devoted_grafkeeper_departed_soulkeeper.txt 2021-09-09 22:18:27 -04:00
Northmoc
6ebff84f72 curse_of_silence.txt 2021-09-09 22:17:27 -04:00
Northmoc
d390be2812 blast_from_the_past.txt 2021-09-09 21:42:14 -04:00
Northmoc
e22069021c card is now implemented 2021-09-09 20:50:22 -04:00
Northmoc
d82a412480 make all Coven hyphens long 2021-09-09 20:49:41 -04:00