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

42672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
b8b3f7ab82 Add two cards 2019-09-12 13:57:14 +08:00
swordshine
9cffaa19b5 Merge branch 'update_run_trigger_callers_part_2' into 'master' 
Update run trigger callers part 2

See merge request core-developers/forge!2115
 2019-09-12 05:47:00 +00:00
swordshine
9baf47330d Add Doom Foretold 2019-09-12 12:43:33 +08:00
Ryan1729
520c5290ac remove unneeded imports 2019-09-11 22:22:55 -06:00
Ryan1729
d4ad098293 add helper method for the common case of passing down the card 2019-09-11 22:13:02 -06:00
swordshine
876d69fb71 Merge branch 'master' into 'master' 
add Basic Land translation,update forge-android simplified chinese characters

See merge request core-developers/forge!2114
 2019-09-12 04:02:11 +00:00
Ryan1729
bbcb59f64f more mechanical transformations 2019-09-11 22:00:38 -06:00
Ryan1729
1dc5dc1ff6 automatically inline redundant variable 2019-09-11 21:24:11 -06:00
Ryan1729
b76a3c3efa several mechanical refactorings 2019-09-11 21:23:27 -06:00
CCTV-1
89fca048ad fix:missing Swamp translation 2019-09-12 11:08:47 +08:00
CCTV-1
ac2efd0977 update simplified chinese card translation 2019-09-12 10:59:18 +08:00
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
acd8e76037 update forge-android support simplified chinese characters 2019-09-12 10:30:25 +08:00
CCTV-1
b4f54dd150 update translation 2019-09-12 10:29:10 +08:00
swordshine
a9728725a3 Merge branch 'patch' into 'master' 
ELD cards

See merge request core-developers/forge!2111
 2019-09-12 02:28:59 +00: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
CCTV-1
9b26f145f7 Merge remote-tracking branch 'upstream/master' 2019-09-11 21:44:26 +08:00
Anthony Calosa
7a28295585 Draw Priority for Multiplayer game (Human 2 players) 2019-09-11 21:30:22 +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
eb9e1fb2d9 update Simplified Chinese character set 2019-09-11 19:08:37 +08:00
swordshine
764f2d903b Merge branch 'master' into 'master' 
update Simplified Chinese translation

See merge request core-developers/forge!2109
 2019-09-11 09:22:53 +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
7b7616834f Merge branch 'master' into 'master' 
Prevent MultiTap on Start Button (Android)

See merge request core-developers/forge!2106
 2019-09-11 06:11:24 +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
CCTV-1
0b244b0b40 language list is generated from an res/languages existing file(consistent with Andorid behavior) 2019-09-11 09:37:00 +08:00
CCTV-1
04f6302e18 adjust indentation 2019-09-11 09:15:07 +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
CCTV-1
65ea561462 add zh-CN language option 2019-09-11 09:05:12 +08:00
Anthony Calosa
bfc106b0da Much better implementation to make 1 tap on start button (Constructed) 
on Android (Should prevent issue loading a double match on single view)
 2019-09-10 21:56:20 +08:00
Michael Kamensky
3e5e6a5981 Merge branch 'master' into 'master' 
Fix Textbounds getBounds, getMultilineBounds, getWrappedBounds

See merge request core-developers/forge!2105
 2019-09-09 17:11:31 +00:00
Anthony Calosa
a8d46b1ff0 Try to prevent rapid tap on Start Button causing issues on Android 2019-09-10 00:36:16 +08:00
Anthony Calosa
17b578ae9c Fix Textbounds getBounds, getMultilineBounds, getWrappedBounds 2019-09-09 16:10:51 +08:00
swordshine
af6c826cc4 Merge branch 'master' into 'master' 
Some codes needed to revert

See merge request core-developers/forge!2104
 2019-09-09 06:25:53 +00:00
Anthony Calosa
5f78608321 Some codes needed to revert 2019-09-09 13:30:53 +08:00
Ryan1729
29aef01a99 update several callers of runTriggerOld to runTrigger 2019-09-08 23:17:58 -06:00
Ryan1729
f311c3b53c mark runTriggerOld as @Deprecated 2019-09-08 22:34:52 -06:00
Ryan1729
311bbea70f remove more null literals where overloads that pass null exist 2019-09-08 21:34:46 -06:00