external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,672 Commits 33 Branches 187 Tags
5e90679d76b2080e01a78a8cf0c46f1d5370db8c
Commit Graph

42672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
kms70847
e94cc348c0 When adding cards to library, insert "closest to top" card last 2019-07-27 19:16:00 -04:00
klaxnek
d717c0b260 Add card translation info (card, type, oracle and flavor). 
It reads the translation file from res/language/cardname-languagecode.txt
The translation file is generated via a script using Scryfall info (from big json file).
 2019-07-27 12:13:30 +02: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
Hans Mackowiak
3368a45455 PlayEffect: set CopiedPermanent to fix CMC 2019-07-25 01:07:50 +00:00
Michael Kamensky
80df2b0275 Merge branch 'add-khans-expanded-cube' into 'master' 
Add Elliot Raff's Khans Expanded Cube (MTGO)

See merge request core-developers/forge!1975
 2019-07-24 10:19:24 +00:00
pfirpfel
b73bd5a46c Add Elliot Raff's Khans Expanded Cube (MTGO) 2019-07-24 12:00:14 +02:00
Michael Kamensky
f7b0a0d9ab Merge branch '1091-vivien-arkbow-ranger-unable-to-complete-plus-ability-with-0-targets' into 'master' 
Resolve "Vivien, Arkbow Ranger unable to complete plus ability with 0 targets"

Closes #1091

See merge request core-developers/forge!1974
 2019-07-24 05:34:29 +00:00
Hans Mackowiak
440f215a14 Resolve "Vivien, Arkbow Ranger unable to complete plus ability with 0 targets" 2019-07-24 05:34:29 +00:00
Michael Kamensky
0a52238816 Merge branch 'typofix2' into 'master' 
Fix typos in the oracle text of various cards

See merge request core-developers/forge!1972
 2019-07-24 04:14:43 +00:00
Michael Kamensky
d19366da46 Merge branch 'workshopNewline' into 'master' 
Cardfiles saved in the workshop should end with a newline

See merge request core-developers/forge!1973
 2019-07-24 04:13:46 +00:00
kms70847
be52002a48 Cardfiles saved in the workshop should end with a newline 2019-07-23 20:51:06 -04:00
kms70847
1db0cd99c2 Fix typos in the oracle text of various cards 2019-07-23 19:46:38 -04:00
Michael Kamensky
222a0ee16e Merge branch 'master' into 'master' 
Added puzzle PS_M202 - Possibility Storm - Magic Core Set 2020 02

See merge request core-developers/forge!1971
 2019-07-23 18:27:06 +00:00
Agetian
64c8edd520 - Added puzzle PS_M202. 2019-07-23 21:26:17 +03:00
swordshine
496124cc1f Merge branch 'patch' into 'master' 
Fix two cards

See merge request core-developers/forge!1970
 2019-07-23 11:23:43 +00:00
swordshine
58227bd11b Fix two cards 2019-07-23 19:23:16 +08:00
swordshine
50ee2a78ad Merge branch 'patch' into 'master' 
Add two ELD cards

See merge request core-developers/forge!1969
 2019-07-23 02:57:14 +00:00