Commit Graph

4900 Commits

Author SHA1 Message Date
Northmoc
145669bb38 more "this spell" 2020-10-07 16:04:28 -04:00
Northmoc
3c61d6a9e3 lowercase first letter only, after bFlag only 2020-10-07 16:04:27 -04:00
Northmoc
5a9e7ab57d "this spell" instead of "CARDNAME" 2020-10-07 16:04:27 -04:00
Northmoc
45e3feb575 Support "Return" phrasing in StackDesc 2020-10-07 14:35:59 -04:00
Michael Kamensky
db45511859 Merge branch 'twd' into 'master'
Walking Dead Secret Lair (adding NICKNAME)

See merge request core-developers/forge!3215
2020-10-07 04:10:41 +00:00
Northmoc
16c5828b13 rick_steadfast_leader.txt and NICKNAME ReplacementEffect support 2020-10-06 15:36:39 -04:00
Northmoc
24eb24d20d more NICKNAME support 2020-10-06 15:36:39 -04:00
Northmoc
43f1d1a6ac preliminary NICKNAME work 2020-10-06 15:34:16 -04:00
Northmoc
6b1f1536d9 commas in the lists 2020-10-06 15:33:57 -04:00
Tim Mocny
1f29fb7bf3 Lava Burst! Whippoorwill! 2020-10-06 14:59:38 +00:00
Michael Kamensky
bcfd25ce6e Revert "Copy Permanent Spell turns into token"
This reverts commit 1ce1d43e27
2020-10-06 07:21:10 +00:00
Northmoc
83e8afb48c ReplacementEffect.java add EFFECTSOURCE replacement to Description strings 2020-10-05 10:05:12 -04:00
Michael Kamensky
fb16232c9f Merge branch '1605-6-broken-tests-as-of-10-04-2020' into 'master'
Resolve "6 Broken Tests as of 10/04/2020"

Closes #1605

See merge request core-developers/forge!3231
2020-10-05 06:46:22 +00:00
Hans Mackowiak
1ce1d43e27 Copy Permanent Spell turns into token 2020-10-05 08:12:50 +02:00
Hans Mackowiak
011a5dddeb CardType: add flag to show when its used incomplete in Animate Effects 2020-10-05 08:07:18 +02:00
Anthony Calosa
65f0c4dc30 Fix facedown cards ie manifested cards with back side for viewing 2020-10-05 10:45:35 +08:00
Anthony Calosa
d478e9c5a1 Various GUI fixes
Fix choice list card image display for Modal, Split, Adventure and special case for Aftermath.
Fix cards exiled facedown with backside show their original state when viewing the hidden card.
2020-10-05 05:46:29 +08:00
Michael Kamensky
784455c9df Merge branch 'cardTypeMimicFixes' into 'master'
CardType: sanisfySubtypes each time its changed, moved shareTypeWith functions into CardType

See merge request core-developers/forge!3222
2020-10-04 04:13:32 +00:00
Sol
8957bc5fc4 Merge branch 'manyChoices' into 'master'
GUI: make many call getChoices and not order

See merge request core-developers/forge!3217
2020-10-04 01:25:41 +00:00
Hans Mackowiak
e281f1e5ec CardType: sanisfySubtypes each time its changed, moved shareTypeWith functions into CardType 2020-10-03 10:04:10 +02:00
Hans Mackowiak
5854a2ff36 GUI: make many call getChoices and not order 2020-10-03 08:29:57 +02:00
Northmoc
493f90de46 CardFactoryUtil.java - fix CARDNAME substitution in pay alt cost prompts 2020-10-02 14:01:49 -04:00
Northmoc
24fef19087 Align Embalm/Eternalize reminder text with Oracle 2020-10-01 14:47:52 -04:00
Northmoc
73723a345f support for FTP downloads 2020-10-01 14:14:29 -04:00
Michael Kamensky
0ec38f8977 Merge branch 'fixes' into 'master'
A few token-related fixes

See merge request core-developers/forge!3207
2020-10-01 05:04:13 +00:00
Michael Kamensky
b2adfd4a02 Merge branch '1577-znr-charm-effect-tweaks' into 'master'
Resolve "ZNR: Charm Effect tweaks"

Closes #1562, #1570, and #1577

See merge request core-developers/forge!3197
2020-10-01 05:02:41 +00:00
Hans Mackowiak
daf70f7e60 Resolve "ZNR: Charm Effect tweaks" 2020-10-01 05:02:41 +00:00
Hans Mackowiak
e2e15df116 Merge branch 'StoreSVar_Fix' into 'master'
move Count calculation (xPaid) to AbilityUtils

Closes #1599

See merge request core-developers/forge!3206
2020-10-01 04:57:13 +00:00
Northmoc
93301e5727 move Count calculation (xPaid) to AbilityUtils 2020-09-30 20:01:59 -04:00
Northmoc
da40b47920 Myriad keyword : Tapped$ --> TokenTapped$ 2020-09-30 20:00:46 -04:00
Anthony Calosa
5be73af7e9 Fix GenericChoice UI 2020-09-30 21:26:06 +08:00
Michael Kamensky
9b060f1387 Merge branch 'yasharn' into 'master'
ZNR: Yasharn

See merge request core-developers/forge!3204
2020-09-30 05:47:08 +00:00
Northmoc
0257879b99 yasharn_implacable_earth.txt - keyword support 2020-09-29 18:06:58 -04:00
Anthony Calosa
3c76fb4971 [Mobile] Minor Improvement and Fixes
-Add auto game pause when the spectator is viewing zoomed cards (prevents the bug when you're viewing zoomed cards and suddenly the match ends (AI vs AI), you cannot open the zoom overlay until you restart the app again)
-Fix exiled Facedown card should display the hidden image and not the morph image (Gonti, Lord of Luxury, etc)
-Show Winlose Overlay button should only be enabled when match is over otherwise its disabled.
2020-09-29 18:52:27 +08:00
Michael Kamensky
29981fc89c Merge branch '1580-znr-iridescent-hornbeetle-wants-to-count-counters-added-to-creatures' into 'master'
Resolve "ZNR: Iridescent Hornbeetle wants to count counters added to CREATURES"

Closes #1580

See merge request core-developers/forge!3196
2020-09-29 05:10:35 +00:00
Tim Mocny
bc4966e8c1 Oracle Changes 2020-09-28 01:57:15 +00:00
Hans Mackowiak
46e667ba6f Game: store counters put on cards this turn 2020-09-27 14:18:43 +02:00
Michael Kamensky
3745da900a Merge branch 'landPopupPanel' into 'master'
New options introduced to see the popup only for nonbasic lands.

See merge request core-developers/forge!3191
2020-09-26 16:31:23 +00:00
Alessandro Coli
36da6b6c7f New options introduced to see the popup only for nonbasic lands.
Trigger of the popup moved earlier so as the sound will play on its
closure (when the lands enters play) and not on its opening.
2020-09-26 14:24:55 +02:00
Northmoc
24069739c4 MillEffect.java more in line with new language 2020-09-25 22:08:16 -04:00
Northmoc
b62b870a09 punctuation 2020-09-25 09:59:14 -04:00
Sol
3b16aed31d Merge branch 'vine_gecko' into 'master'
ZNR: add vine_gecko with OnlyFirstSpell

See merge request core-developers/forge!3165
2020-09-22 18:25:46 +00:00
Tim Mocny
521bb8212e ZNC 21 Sep 2020-09-22 18:24:33 +00:00
Hans Mackowiak
07fe0d1501 ZNR: add vine_gecko with OnlyFirstSpell 2020-09-22 07:21:12 +02:00
Michael Kamensky
7f33ef8956 Merge branch 'newBranch' into 'master'
Stack Visual Improvement

See merge request core-developers/forge!3167
2020-09-22 04:33:58 +00:00
Anthony Calosa
368036f890 update description 2020-09-22 07:14:33 +08:00
Hans Mackowiak
181e8b897f SpellAbility: make Basic Land Abilities Secondary and remove BasicLandProperty 2020-09-21 13:00:13 +00:00
Anthony Calosa
0efb3ad048 update 2020-09-21 18:59:07 +08:00
Anthony Calosa
be336ed1ec Stack Visual Improvement - Show Mana Symbols instead of text string for mana (B -> {B}, R -> {R}) 2020-09-21 18:47:50 +08:00
Michael Kamensky
49e8ffae13 Merge branch 'moraug' into 'master'
ZNR: Moraug, Fury of Akoum and support

Closes #1571

See merge request core-developers/forge!3163
2020-09-21 05:48:44 +00:00