external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,453 Commits 32 Branches 187 Tags
0637c69bfe901babf30a015d11386699407b602b
Commit Graph

42453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hanmac
e21f23f9ab Card: fix code 2019-09-07 20:50:27 +02:00
Hanmac
4663c5b06f cards: update card scripts for can block additional 2019-09-07 20:50:27 +02:00
Hanmac
357f146742 CanBlockAny: rewrite for 'can block an additional' and 'can block any number' 2019-09-07 20:50:27 +02:00
Michael Kamensky
d3faa740f1 Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.28.002.

See merge request core-developers/forge!2097
 2019-09-07 17:58:28 +00:00
Agetian
f64b59a140 - Preparing Forge for Android publish 1.6.28.002. 2019-09-07 20:51:14 +03: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
b802b0555f Merge branch 'patch' into 'master' 
ELD cards

See merge request core-developers/forge!2096
 2019-09-07 02:04:53 +00: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
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
Anthony Calosa
c1d5cfa27e Fix highlight of Planar Conquest start button instead of OldQuest header 2019-09-06 22:13:59 +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
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
Anthony Calosa
b3ad92530c Fix scaling of background when zoomed in multiplayer mode 2019-09-06 20:51:33 +08:00
Anthony Calosa
00f263b2be Merge remote-tracking branch 'remotes/core/master' 2019-09-06 20:22:07 +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
Anthony Calosa
e977420ffa Finalization for Refactoring 2019-09-06 12:55:40 +08:00
Agetian
03be13bacf Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-09-06 07:45:57 +03: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
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
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
Anthony Calosa
0f62a297c7 Updated some codes 2019-09-05 18:20:36 +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
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