Commit Graph

42453 Commits

Author SHA1 Message Date
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
Peter
dd607c82b4 Fixed oracleformat function.
Now the resulting translation files are sorted
2019-07-31 18:19:16 +02:00
Peter
e4f41903d4 Changed delimiter from # to | (reminder texts fixed).
Python script now downloads the big json file from scryfall.
Updated spanish and deutsch translations
2019-07-31 17:57:47 +02:00
Peter
00899ff4ce Extract getting translation texts to CardTranslation 2019-07-31 11:59:54 +02:00
Peter
4dc08e04c7 Fix call to new getText function 2019-07-31 11:30:41 +02:00
Peter
23b083d9ab Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-07-31 11:17:26 +02: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
Peter
cb18a369dd Changed oracle translation using the original getText function (before we lost the getText additional hints when translating).
Needs more translation fixes.
Splitted cards (e.g. Grizzled Outcasts) don't update the translated oracle text.
2019-07-30 13:56:41 +02:00
kms70847
7b83c72e06 fix another batch of oracle text typos 2019-07-30 07:24:48 -04:00
Peter
c7b1e764c6 Not needed to read Forge Preferences because the language selected in UI
is passed when preloading translations.
2019-07-30 12:31:14 +02:00
Peter
98cb151929 Merge branch 'master' into ui-card-translation 2019-07-30 12:19:51 +02: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
Peter
668a0c7cc4 Merge remote-tracking branch 'remotes/Forge/master' into ui-card-translation 2019-07-29 08:52:28 +02: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
Peter
b2562cb89c Mobile: Added oracle translation to front card 2019-07-28 14:34:29 +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
Peter
6d126acd7c Added new font characters to mobile port (diacritics).
Deleted removeDiacritics because it's not needed now in mobile port.
2019-07-28 13:55:15 +02:00
Peter
b6b48be445 Add Python script to generate translations card info files.
It needs the big scryfall-all-cards.json from https://archive.scryfall.com/json/scryfall-all-cards.json
2019-07-28 11:04:41 +02:00
Peter
6e3cadac99 Added es-ES and de-DE translation files (generated via python script) 2019-07-28 11:00:47 +02:00
Peter
21141f3b6a Mobile: Preload card translations and show card name and overlay translated 2019-07-28 09:50:49 +02:00
Peter
24f7de8ee1 Show translated card name in card overlay 2019-07-28 09:40:57 +02:00
Peter
4ffb226100 Preload translations in FModel.
Add cardname translations in CardDetailUtil.
Removed translated flavors in CardTranslations.
Only remove diacritics in mobile port.
2019-07-28 09:31:50 +02:00
Peter
eb7168ea97 Changed normalized accents code 2019-07-28 07:55:21 +02:00
Peter
92bbda14ac Revert "Changed normalized accents code"
This reverts commit 86ce46eb
2019-07-28 07:52:45 +02:00
Peter
86ce46eb4e Changed normalized accents code 2019-07-28 07:52:27 +02:00