Commit Graph

11706 Commits

Author SHA1 Message Date
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
CCTV-1
dc6361d5b9 Update some 'format' translations 2019-09-05 14:34:32 +00:00
Anthony Calosa
efbd2a08eb Updated codes 2019-09-05 20:56:17 +08:00
swordshine
28d2f3cef6 Update forgescribed cards 2019-09-05 20:52:17 +08:00
swordshine
bfe5a5a6a3 Add forgescribed cards 2019-09-05 18:10:53 +08:00
Anthony Calosa
ca28b4d696 Merge remote-tracking branch 'remotes/core/master' 2019-09-05 18:01:47 +08:00
swordshine
f5e55ae2ae Add two cards 2019-09-05 14:31:55 +08:00
swordshine
b07262320e Update Typelists 2019-09-05 09:31:58 +08:00
swordshine
10446c58f8 Merge branch 'patch' into 'master'
ELD cards

Closes #1143

See merge request core-developers/forge!2086
2019-09-05 01:24:49 +00:00
Anthony Calosa
2b0e47dd14 Initial migration 2019-09-05 08:24:58 +08:00
CCTV-1
b7b697b4f2 fix typo 2019-09-04 13:11:14 +00:00
CCTV-1
d11febd7e4 Update 'Oathbreaker' and 'signature spell' translation 2019-09-04 09:29:09 +00:00
CCTV-1
605426cd7a initial commit chinese translation 2019-09-04 06:45:57 +00:00
swordshine
71fca651fc Add three cards 2019-09-04 14:44:31 +08:00
swordshine
157b2c85fe Update Food token and subtype 2019-09-04 13:48:24 +08:00
swordshine
1bb12a2ce6 CLeanup the upcoming folder for the ELD spoiler 2019-09-04 13:43:50 +08:00
swordshine
01094fb4e5 Add a "References$ X" param 2019-09-04 13:27:31 +08:00
swordshine
4931857b8c Update Transmute Artifact 2019-09-04 13:27:31 +08:00
swordshine
26241e3ef8 Add a ForceRevealToController param for Narset, Parter of Veils if no card is valid 2019-09-04 13:27:31 +08:00
Blacksmith
c78bfbe631 Clear out release files in preparation for next release 2019-09-04 01:55:50 +00:00
Blacksmith
10877ca143 [maven-release-plugin] prepare for next development iteration 2019-09-04 01:51:10 +00:00
Blacksmith
367dab571d [maven-release-plugin] prepare release forge-1.6.28 2019-09-04 01:51:04 +00:00
Blacksmith
c05558c4ae Update README.txt for release 2019-09-04 01:48:35 +00:00
Anthony Calosa
efa606783c Cleanup 2019-09-03 22:13:35 +08:00
Anthony Calosa
a4d34bb858 Retained some schemas 2019-09-03 11:20:10 +08:00
Anthony Calosa
c38bae910a Refactor/Code Cleanup 2019-09-02 18:08:56 +08:00
Anthony Calosa
2aa8daceed Update default bg image to 16:9 2019-08-31 13:37:14 +08:00