Commit Graph

47891 Commits

Author SHA1 Message Date
Hans Mackowiak
c75cab4b75 remove old methods 2021-02-20 08:07:40 +01:00
Hans Mackowiak
9978cccfb2 Card: removed some CardCollections, use them from CastSA, fixed Improvise 2021-02-20 08:07:40 +01:00
Hans Mackowiak
d85407ea70 remove Player as parameter for the functions 2021-02-20 08:07:40 +01:00
Hans Mackowiak
62b10fe79b SpellRestrictions: restrict non special mana abilities when special is used 2021-02-20 08:07:40 +01:00
Hans Mackowiak
000c5cd889 Convoke Improvise Delve: do them as Special Actions 2021-02-20 08:07:33 +01:00
Anthony Calosa
ca57bfe982 Merge branch 'master' into 'master'
[Mobile] Update Border Mask Option

See merge request core-developers/forge!3939
2021-02-20 07:02:16 +00:00
Anthony Calosa
5055931cbc [Mobile] Border Mask Option
- Full > cards have round corners (both .fullborder and .full cards)
- Crop > .fullborder cards will be cropped to look like .full cards
- Off > no changes (for user who use png images use Off)
2021-02-20 14:58:42 +08:00
Michael Kamensky
7137bcb5ef Merge branch 'master' into 'master'
Rankle, Master of Pranks: improve logic a little

See merge request core-developers/forge!3938
2021-02-20 06:25:25 +00:00
Michael Kamensky
7c75781138 - Rankle, Master of Pranks: improve logic a little 2021-02-20 09:24:43 +03:00
Michael Kamensky
3138d6b3fc Merge branch 'Williams-master-patch-81850' into 'master'
Early Strixhaven Edition file

See merge request core-developers/forge!3920
2021-02-20 05:01:30 +00:00
Michael Kamensky
d41a064ba1 Merge branch 'master' into 'master'
Fix some card sets in draft cube files.

See merge request core-developers/forge!3937
2021-02-20 04:40:26 +00:00
Michael Kamensky
4a3403a7ec Merge branch 'boosterbox' into 'master'
Move Booster Box to Editions File

See merge request core-developers/forge!3936
2021-02-20 04:39:46 +00:00
Michael Kamensky
d40c76a099 - Fix some card sets in draft cube files. 2021-02-20 07:38:52 +03:00
friarsol
846e89e522 Move Booster Box to Editions File 2021-02-19 23:37:48 -05:00
Michael Kamensky
77a14c7d71 Merge branch 'Williams-master-patch-33748' into 'master'
Add STX Charms

See merge request core-developers/forge!3917
2021-02-20 04:29:42 +00:00
Michael Kamensky
415faa9a04 Merge branch 'manaEffect' into 'master'
ExpressPay different ComboMana if possible

See merge request core-developers/forge!3893
2021-02-20 04:22:03 +00:00
Bug Hunter
df0d651101 ExpressPay different ComboMana if possible 2021-02-20 04:22:02 +00:00
Michael Kamensky
e8ca2a4050 Merge branch 'targetWithEQX' into 'master'
cards: better rules conform for cards that use X in cost and target with cmcEQX

See merge request core-developers/forge!3932
2021-02-20 04:15:41 +00:00
Hans Mackowiak
a846c33db4 cards: better rules conform for cards that use X in cost and target with cmcEQX 2021-02-20 00:47:46 +01:00
Anthony Calosa
8ebe59e3fd Merge branch 'master' into 'master'
[Mobile] Adjust avatar size for QuestTournamentsScreen

See merge request core-developers/forge!3931
2021-02-19 22:57:57 +00:00
Anthony Calosa
e17c93fedb Merge remote-tracking branch 'core/master' 2021-02-20 06:57:10 +08:00
Anthony Calosa
1ef87f9e68 [Mobile] Adjust avatar size for QuestTournamentsScreen 2021-02-20 06:54:57 +08:00
John
a124db0344 Update Strixhaven School of Mages.txt 2021-02-19 22:03:02 +00:00
Anthony Calosa
e490267cb2 Merge branch 'master' into 'master'
[Mobile] Add Avatar Image on Quest Tournament Current Match (Landscape Mode)

See merge request core-developers/forge!3929
2021-02-19 21:14:19 +00:00
Anthony Calosa
6b4a72a99f [Mobile] Add Avatar Image on Quest Tournament Current Match (Landscape Mode) 2021-02-20 05:12:57 +08:00
John
5fe73b6e93 Update silverquill_command.txt 2021-02-19 20:46:20 +00:00
John
ba3337395e Update quandrix_command.txt 2021-02-19 20:46:14 +00:00
John
5e3873e994 Update witherbloom_command.txt 2021-02-19 20:46:07 +00:00
John
77d922fa0a Update prismari_command.txt 2021-02-19 20:45:33 +00:00
John
77e2ccbb78 Update lorehold_command.txt 2021-02-19 20:45:06 +00:00
John
d614185a76 Update quandrix_command.txt 2021-02-19 20:44:05 +00:00
John
c675e54986 Update prismari_command.txt 2021-02-19 20:43:56 +00:00
John
f08b41a2f5 Update lorehold_command.txt 2021-02-19 20:43:49 +00:00
John
9d1f1300a2 Update silverquill_command.txt 2021-02-19 20:43:45 +00:00
Michael Kamensky
fccccc1b66 Merge branch 'khmtranslations' into 'master'
Update Kaldheim (KHM) card translations

See merge request core-developers/forge!3927
2021-02-19 20:34:59 +00:00
Michael Kamensky
eeacd06869 Merge branch 'master' into 'master'
Enable the now-supported cards in one of the Old School draft cubes.

See merge request core-developers/forge!3928
2021-02-19 20:34:29 +00:00
Michael Kamensky
635c7c74a4 - Enable the now-supported cards in one of the draft cubes. 2021-02-19 23:33:43 +03:00
John
56066bf91b Update witherbloom_command.txt 2021-02-19 20:25:05 +00:00
John
e7fcdfad9b Update witherbloom_command.txt 2021-02-19 20:22:51 +00:00
klaxnek
b73e6897ab Update Kaldheim (KHM) card translations 2021-02-19 21:21:57 +01:00
John
03685a426a Update lorehold_command.txt 2021-02-19 20:21:27 +00:00
Michael Kamensky
1ad70e0486 Merge branch 'master' into 'master'
AI: Don't respond to own stack unless actually planning to copy the spell. Fix Sensei's Divining Top AI.

See merge request core-developers/forge!3926
2021-02-19 20:09:21 +00:00
Michael Kamensky
be18bd93d9 - Don't respond to own stack unless actually planning to copy the spell.
- Fix Sensei's Divining Top AI not synchronizing abilities properly.
2021-02-19 23:08:24 +03:00
Michael Kamensky
14fbb2eda8 Merge branch 'modalGamestates' into 'master'
Support for MDFC in gamestates

See merge request core-developers/forge!3925
2021-02-19 19:13:00 +00:00
tool4EvEr
cc98e67108 Support for MDFC in gamestates 2021-02-19 19:44:58 +01:00
Michael Kamensky
605f99cc6a Merge branch 'fixCommanderGamestate' into 'master'
Fix CommanderEffect when loading gamestate

See merge request core-developers/forge!3922
2021-02-19 18:36:02 +00:00
Bug Hunter
c186a9453e Fix CommanderEffect when loading gamestate 2021-02-19 18:36:01 +00:00
Anthony Calosa
776880a74f Merge branch 'master' into 'master'
[Mobile] Ensure text visibility when using altPlayerLayout (Landscape Mode)

See merge request core-developers/forge!3924
2021-02-19 17:56:24 +00:00
Anthony Calosa
16c9f63219 Merge remote-tracking branch 'core/master' 2021-02-20 01:54:36 +08:00
Anthony Calosa
c4ab2e2b44 [Mobile] Ensure text visilibility when using altPlayerLayout (Landscape Mode) 2021-02-20 01:54:24 +08:00