Commit Graph

42286 Commits

Author SHA1 Message Date
Hanmac
773f2b280f Loyalty: use String Property for X 2019-08-01 21:16:07 +02:00
Michael Kamensky
e509931f34 Merge branch 'patch-3' into 'master'
Updated cards, by sorting them into alphabetical order.

See merge request core-developers/forge!1999
2019-08-01 14:08:22 +00:00
Viktor Azorius
89c5df5eed Updated cards, by sorting them into alphabetical order. 2019-08-01 14:08:22 +00:00
Michael Kamensky
e193ca9873 Merge branch 'fix-drakuseth' into 'master'
Fix an issue with multitargeting the same card while UniqueTargets is set.

Closes #1113

See merge request core-developers/forge!1998
2019-08-01 14:08:09 +00:00
Michael Kamensky
88ed810e4a Fix an issue with multitargeting the same card while UniqueTargets is set. 2019-08-01 14:08:09 +00:00
Michael Kamensky
a6d30137df Merge branch 'gui-mobile-desktop-cursorkeys' into 'master'
Mobile Backport: Cursor keys emulate swipe gestures

See merge request core-developers/forge!1997
2019-07-31 05:10:03 +00:00
Peter
782c594938 Mobile Backport: Cursor keys emulate swipe gestures
First we touch the screen and later swipe (fling) in the direction of the key pressed
2019-07-30 17:24:37 +02:00
Michael Kamensky
8a6a317f56 Merge branch 'typofix3' into 'master'
fix another batch of oracle text typos

See merge request core-developers/forge!1995
2019-07-30 12:39:16 +00:00
Michael Kamensky
4fba4522ba Merge branch 'hqpicdownloaderfix01' into 'master'
Fix HQ Pics Downloader - Backface images

See merge request core-developers/forge!1996
2019-07-30 12:38:57 +00:00
Peter
b23f3d9acc Fix: We need to pass &face=back to API in order to download backface
images correctly.
2019-07-30 14:24:54 +02:00
kms70847
7b83c72e06 fix another batch of oracle text typos 2019-07-30 07:24:48 -04:00
Peter
3c23019577 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-07-30 12:16:15 +02:00
Hans Mackowiak
61c42275e6 Dash: reworked and better Haste part 2019-07-30 12:05:29 +02:00
kms70847
200e191f14 When adding cards to library, insert "closest to top" card last 2019-07-30 12:05:29 +02:00
Michael Kamensky
dd8ba357aa Merge branch 'master' into 'master'
Added puzzle PS_M203 - Possibility Storm - Magic Core Set 2020 03.

See merge request core-developers/forge!1994
2019-07-30 08:32:28 +00:00
Agetian
eab262aa7e - Added puzzle PS_M203. 2019-07-30 11:30:26 +03:00
Michael Kamensky
9b62afa7e8 Merge branch 'master' into 'master'
Added SS2 edition (Signature Spellbook: Gideon)

See merge request core-developers/forge!1993
2019-07-30 08:22:08 +00:00
Agetian
bbe324a790 - Added SS2 edition (Signature Spellbook: Gideon) 2019-07-30 11:20:03 +03:00
Michael Kamensky
91327b7310 Merge branch 'controllerInWeirdZonesFix' into 'master'
Cards in graveyards (etc) are always controlled by their owners

See merge request core-developers/forge!1991
2019-07-30 05:37:04 +00:00
Michael Kamensky
d9899636c7 Merge branch 'nicerLondonMulliganMessage' into 'master'
Show the number of cards you need to put back when London mulliganning

See merge request core-developers/forge!1990
2019-07-30 03:27:17 +00:00
Michael Kamensky
01f179168c Merge branch 'hqpicdownloader' into 'master'
Add Download HQ Card Pictures from Scryfall

See merge request core-developers/forge!1983
2019-07-30 03:19:29 +00:00
Michael Kamensky
1c0736d7be Merge branch 'android-language-selector' into 'master'
Android: Add Language selector in Settings

See merge request core-developers/forge!1984
2019-07-30 03:19:18 +00:00
Michael Kamensky
c48b1ea225 Merge branch 'reboundTypoFix' into 'master'
Rebound: "it's manacost" -> "its mana cost"

See merge request core-developers/forge!1992
2019-07-30 03:17:46 +00:00
kms70847
89da830c6c Rebound: "it's manacost" -> "its mana cost" 2019-07-29 23:03:58 -04:00
kms70847
b9cf836c1a Fix for https://git.cardforge.org/core-developers/forge/issues/619 2019-07-29 22:48:54 -04:00
kms70847
60c2119f16 Show the number of cards you need to put back when London mulliganning 2019-07-29 22:01:34 -04:00
Michael Kamensky
df3996f22a Merge branch 'master' into 'master'
Fix ChooseCardEffect crashing for e.g. Curse of the Pierced Heart on a planeswalker

See merge request core-developers/forge!1989
2019-07-29 16:43:21 +00:00
Agetian
37fe37d5d9 - Fix ChooseCardEffect crashing for e.g. Curse of the Pierced Heart on a planeswalker 2019-07-29 19:42:12 +03:00
Michael Kamensky
6fa513fefd Merge branch 'gainControlRework' into 'master'
ControlGain: without addExtrinsicKeyword

See merge request core-developers/forge!1988
2019-07-28 19:55:49 +00:00
Hanmac
6cf5a08be2 Card: remove non hidden extrinsic keyword 2019-07-28 20:00:11 +02:00
Hanmac
599e0bbe4c ControlGain: without addExtrinsicKeyword 2019-07-28 17:47:13 +02:00
Michael Kamensky
6f52632c68 Merge branch 'scrollRackReorder' into 'master'
When adding cards to library, insert "closest to top" card last

See merge request core-developers/forge!1986
2019-07-28 12:21:05 +00:00
Michael Kamensky
c14ec0380c Merge branch 'dashRework' into 'master'
Dash: reworked and better Haste part

See merge request core-developers/forge!1985
2019-07-28 12:21:01 +00:00
Hans Mackowiak
af021e7d2a Dash: reworked and better Haste part 2019-07-28 12:21:01 +00:00
kms70847
e94cc348c0 When adding cards to library, insert "closest to top" card last 2019-07-27 19:16:00 -04:00
Peter
198cb4f90a Android: Add Language selector in Settings 2019-07-27 10:17:30 +02:00
Peter
1d8e7a0cb3 Add Download HQ Card Pictures from Scryfall 2019-07-26 18:39:38 +02:00
swordshine
0826f0c01f Merge branch 'patch' into 'master'
Fix the token color of Ajani's Pridemate

See merge request core-developers/forge!1982
2019-07-26 08:58:40 +00:00
swordshine
1e127aa163 Fix the token color of Ajani's Pridemate 2019-07-26 16:58:21 +08:00
Michael Kamensky
a055c54ff7 Merge branch 'epicSplice' into 'master'
EffectSource: now they can know about the SpellAbility that did the Effect for Epic

Closes #1101

See merge request core-developers/forge!1981
2019-07-26 05:47:21 +00:00
Hans Mackowiak
b2fc1844be EffectSource: now they can know about the SpellAbility that did the Effect for Epic 2019-07-26 05:47:21 +00:00
Michael Kamensky
72e5b7dfaa Merge branch 'master' into 'master'
Don't check Morph Down for playability if the card is already on the battlefield

Closes #1107

See merge request core-developers/forge!1980
2019-07-26 05:10:02 +00:00
Agetian
553106741c - Don't check Morph Down for playability if the card is already on the battlefield to avoid side effects. 2019-07-26 08:09:20 +03:00
swordshine
ed842b4fd5 Merge branch 'patch' into 'master'
Update banned list

See merge request core-developers/forge!1979
2019-07-25 14:51:22 +00:00
swordshine
e5473b4193 Update banned list 2019-07-25 22:50:24 +08:00
swordshine
d2b2ef4114 Merge branch '1108-gargos-triggered-from-pulse-of-murasa' into 'master'
Resolve "Gargos triggered from Pulse of Murasa"

Closes #1108

See merge request core-developers/forge!1977
2019-07-25 14:27:57 +00:00
swordshine
7b9ffa7d27 Merge branch 'patch' into 'master'
Fix two cards

See merge request core-developers/forge!1978
2019-07-25 14:27:49 +00:00
swordshine
c9c5f8a0da Fix two cards 2019-07-25 22:27:24 +08:00
Hans Mackowiak
0dbd45edb2 Gargos, Vicious Watcher: fix Target Trigger 2019-07-25 08:39:38 +00:00
Sol
12519605d6 Merge branch 'playCopyCMCFix' into 'master'
PlayEffect: set CopiedPermanent to fix CMC

See merge request core-developers/forge!1976
2019-07-25 01:07:50 +00:00