Commit Graph

42286 Commits

Author SHA1 Message Date
swordshine
2619f87520 Fix two cards 2019-09-07 09:18:43 +08:00
Michael Kamensky
193dfae43b Merge branch 'overlap_same_clip' into 'master'
Support overlapped reproducing of same AudioClip

See merge request core-developers/forge!2081
2019-09-06 19:22:48 +00: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
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
e010babee7 Merge branch 'patch' into 'master'
ELD cards

See merge request core-developers/forge!2091
2019-09-06 12:57:58 +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
ca4926f9b4 fix miss ';' 2019-09-06 09:18:23 +00:00
CCTV-1
b487cdc1e3 rename to ISO 639 name 2019-09-06 07:36:45 +00:00
CCTV-1
87b2311fd6 if generate common chinese characters,many mobile phones stuck in generate image(if font file exists chinese characters).
try only generate what is currently used.
2019-09-06 07:32:04 +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
Michael Kamensky
2049da3fc1 Merge branch 'master' into 'master'
Preparing Forge for Android publish 1.6.28.001.

See merge request core-developers/forge!2093
2019-09-06 05:13:14 +00:00
Agetian
21af87b906 - Preparing Forge for Android publish 1.6.28.001. 2019-09-06 08:08:02 +03:00
Agetian
03be13bacf Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-09-06 07:45:57 +03:00
swordshine
d3d41d7c1f Add Adamant cards 2019-09-06 12:34:53 +08:00
swordshine
632c4c2503 Merge branch 'patch' into 'master'
Update Forgescribed cards

See merge request core-developers/forge!2090
2019-09-06 02:01:23 +00: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
swordshine
5d23941dab Merge branch 'patch' into 'master'
ELD cards

See merge request core-developers/forge!2088
2019-09-06 00:40:57 +00:00
CCTV-1
dc6361d5b9 Update some 'format' translations 2019-09-05 14:34:32 +00: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
swordshine
3f2c9e0909 Merge branch '1145-inspiring-captain-pump-lasts-beyond-turn' into 'master'
Resolve "Inspiring Captain pump lasts beyond turn"

Closes #1145

See merge request core-developers/forge!2089
2019-09-05 08:04:27 +00:00
Hans Mackowiak
79f768e88a Update PumpAllEffect: update view on Until Command 2019-09-05 07:28:48 +00: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
swordshine
0acabf679f Merge branch 'master' into 'master'
chinese translation

See merge request core-developers/forge!2087
2019-09-04 13:19:26 +00:00
CCTV-1
b7b697b4f2 fix typo 2019-09-04 13:11:14 +00:00
CCTV-1
6070d3f1e3 fix:miss '=' 2019-09-04 10:11:28 +00:00
CCTV-1
d11febd7e4 Update 'Oathbreaker' and 'signature spell' translation 2019-09-04 09:29:09 +00:00
CCTV-1
3cbb603c24 add generate common chinese characters images 2019-09-04 06:57:34 +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
1e33c9ac40 Merge branch 'patch' into 'master'
Cleanup the upcoming folder for the ELD spoiler

See merge request core-developers/forge!2084
2019-09-04 05:47:23 +00: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
Anthony Calosa
5876ee8220 Removed redundant code 2019-09-04 12:23:36 +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 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
51ea20b1df Refactor Dynamic Planechase BG 2019-09-04 02:15:13 +08:00