Commit Graph

12335 Commits

Author SHA1 Message Date
CCTV-1
602327366b add basic land translation path 2019-09-12 10:58:23 +08:00
swordshine
3f9001267e Add Outlaws' Merriment 2019-09-12 10:39:08 +08:00
CCTV-1
544b653a90 Merge remote-tracking branch 'upstream/master' 2019-09-12 10:31:47 +08:00
swordshine
fdd0814786 Merge branch 'master' into 'master'
add Simplified Chinese cards translation support

See merge request core-developers/forge!2112
2019-09-12 02:30:26 +00:00
CCTV-1
b4f54dd150 update translation 2019-09-12 10:29:10 +08:00
swordshine
d7e0dd3e54 Add forgescribed cards 2019-09-12 10:01:52 +08:00
swordshine
35b887de14 Update Lochmere Serpent 2019-09-12 09:17:49 +08:00
CCTV-1
b5f95ccf77 update de-De es-ES card name translation 2019-09-12 09:10:38 +08:00
CCTV-1
5bf55abd49 add Simplified Chinese cards translation support 2019-09-12 09:08:43 +08:00
swordshine
434027c14f Merge branch 'ui-card-translation' into 'master'
UI Card Translation (desktop and mobile)

See merge request core-developers/forge!1987
2019-09-11 13:27:55 +00:00
CCTV-1
85da019bf8 update translation 2019-09-11 16:43:55 +08:00
swordshine
629fa3344b Merge branch 'mobile-translations02' into 'master'
Mobile: Translate Settings Page

See merge request core-developers/forge!2058
2019-09-11 07:06:58 +00:00
swordshine
3c97a43898 Merge branch 'patch' into 'master'
ELD cards

See merge request core-developers/forge!2107
2019-09-11 06:11:37 +00:00
swordshine
867222ffc2 Merge branch 'master' into 'master'
Forge-Desktop LanguageComboBox content automatic generated

See merge request core-developers/forge!2108
2019-09-11 06:11:32 +00:00
swordshine
51117558ac Merge branch 'update_run_trigger_callers_part_1' into 'master'
Update run trigger callers part 1

See merge request core-developers/forge!2103
2019-09-11 06:11:18 +00:00
swordshine
80f15cadfb Add more forgescribed cards 2019-09-11 13:13:03 +08:00
swordshine
89daf161a5 Add more forgescribed cards 2019-09-11 12:10:51 +08:00
swordshine
b10f0b9366 Add Enchanted Carriage 2019-09-11 09:51:41 +08:00
swordshine
e509f82599 Add forgescribed ELD cards 2019-09-11 09:09:26 +08:00
CCTV-1
a4bed16d2d update translation 2019-09-11 09:07:04 +08:00
Anthony Calosa
5f78608321 Some codes needed to revert 2019-09-09 13:30:53 +08:00
Ryan1729
311bbea70f remove more null literals where overloads that pass null exist 2019-09-08 21:34:46 -06:00
Anthony Calosa
1321bcd125 Revert URL Decode to support older phone 2019-09-08 10:45:13 +08:00
swordshine
e9794036ad Merge branch 'master' into 'master'
Added puzzle PS_M208 - Possibility Storm - Magic Core Set 2020 08

See merge request core-developers/forge!2098
2019-09-08 00:47:16 +00:00
Agetian
d2e7fa62d1 - Added puzzle PS_M208. 2019-09-07 22:39:02 +03:00
Hanmac
4663c5b06f cards: update card scripts for can block additional 2019-09-07 20:50:27 +02:00
Michael Kamensky
f53346eaf7 Merge branch 'master' into 'master'
Big Refactoring + Android Fix for older phones

See merge request core-developers/forge!2092
2019-09-07 17:50:01 +00:00
Anthony Calosa
a0b71d60a1 Revert Android 8 codes to support older Android phones.
Hope I didn't miss any. :)
(tested with Android Marshmallow phone with 2gb RAM and mediatek cpu)
2019-09-07 22:54:53 +08:00
Peter
59f0034be9 Add new English settings translation to chinese (needs translation) 2019-09-07 09:11:43 +02:00
Peter
c690d20604 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into mobile-translations02 2019-09-07 08:56:03 +02:00
Peter
3d53c41208 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-09-07 08:46:19 +02:00
swordshine
a9f367d9de Add Run Away Together 2019-09-07 09:53:21 +08:00
swordshine
2619f87520 Fix two cards 2019-09-07 09:18:43 +08:00
swordshine
2ce27128eb Merge branch 'patch' into 'master'
Fix Garruk's name

See merge request core-developers/forge!2095
2019-09-06 14:04:45 +00:00
swordshine
11d3433b5f Fix Garruk's name 2019-09-06 21:59:12 +08:00
Anthony Calosa
3269d3fd9d Fix gameview when there is no human player 2019-09-06 21:41:05 +08:00
swordshine
14ab1714bd Merge branch 'master' into 'master'
update translation and try to reduce android chinese characters image cache size

See merge request core-developers/forge!2094
2019-09-06 12:58:05 +00:00
swordshine
e8e115ae1a Use a simple template for Silverflame Ritual 2019-09-06 20:51:55 +08:00
swordshine
b4a7a9a3ca Changed the template of Embereth Paladin 2019-09-06 20:04:07 +08:00
CCTV-1
b487cdc1e3 rename to ISO 639 name 2019-09-06 07:36:45 +00:00
CCTV-1
42bfb40eae change half-width to full-width symbol 2019-09-06 06:43:19 +00:00
CCTV-1
3747a05927 change Half-width to full-width symbol 2019-09-06 06:24:46 +00:00
swordshine
56d0982fb1 Add Slaying Fire 2019-09-06 13:36:18 +08:00
swordshine
0f9ed8638b Add Silverflame Ritual 2019-09-06 13:24:14 +08:00
Anthony Calosa
e977420ffa Finalization for Refactoring 2019-09-06 12:55:40 +08:00
Anthony Calosa
f5eb14afaa Merge remote-tracking branch 'remotes/core/master' 2019-09-06 12:39:55 +08:00
swordshine
d3d41d7c1f Add Adamant cards 2019-09-06 12:34:53 +08:00
swordshine
f06304ac1c Update Forgescribed cards 2019-09-06 09:52:39 +08:00
swordshine
19585aa007 Merge branch 'master' into 'master'
Refactor/Code Cleanup

See merge request core-developers/forge!2080
2019-09-06 00:41:16 +00:00
Anthony Calosa
59bf5830fe Big Cleanup 2019-09-06 00:03:04 +08:00