external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,609 Commits 33 Branches 187 Tags
e4a0ce916519e44b58ad97d7bf17f06b0d23017c
Commit Graph

48609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John
f38df2457e Update tyrite_sanctum.txt 2021-03-02 17:58:21 +00:00
Churrufli
12ff52e051 Net Deck Archive Categories fix 2021-03-02 18:48:15 +01:00
Adam Pantel
4666dec0f8 Waste Land 2021-03-02 12:29:11 -05:00
Adam Pantel
a161d838ee Add dice rolling 2021-03-02 12:29:11 -05:00
Anthony Calosa
03a63da029 Merge branch 'master' into 'master' 
Add foretell token image as facedown cardback

See merge request core-developers/forge!4070
 2021-03-02 13:25:40 +00:00
Anthony Calosa
59db0eef2c Add foretell token image as facedown cardback 2021-03-02 21:08:04 +08:00
Michael Kamensky
c3d27224e7 Merge branch 'master' into 'master' 
Net Deck Archive Categories (Android implementation)

See merge request core-developers/forge!4069
 2021-03-02 10:48:56 +00:00
Churrufli
0219991703 Net Deck Archive Categories (Android implementation) 2021-03-02 10:08:15 +01:00
Michael Kamensky
9952e0ff88 Merge branch 'master' into 'master' 
Net Deck Archive Vintage (Desktop implementation)

See merge request core-developers/forge!4068
 2021-03-02 08:41:34 +00:00
Churrufli
f02a3c8786 Net Deck Archive Vintage (Desktop implementation) 2021-03-02 09:24:10 +01:00
Michael Kamensky
043e767c79 Merge branch 'master' into 'master' 
Fix AI thinking that Kazuul Warlord trigger is not a good thing

See merge request core-developers/forge!4066
 2021-03-02 04:25:13 +00:00
Michael Kamensky
b67acd9ef2 - CountersPutAllAi: check the standard API logic when calling from a non-mandatory trigger 2021-03-02 07:24:25 +03:00
Michael Kamensky
fba274c200 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-03-02 07:14:03 +03:00
Michael Kamensky
2bf94b7403 Merge branch 'Williams-master-patch-88653' into 'master' 
Tergrid fix

See merge request core-developers/forge!4063
 2021-03-02 04:01:59 +00:00
Michael Kamensky
062332dbeb Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4065
 2021-03-02 04:01:47 +00:00
CCTV-1
b8aab09789 update simplified chinese translation 2021-03-02 11:02:35 +08:00
Anthony Calosa
b3d763b181 Merge branch 'twosat-master-patch-20281' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4062
 2021-03-02 01:31:38 +00:00
Anthony Calosa
d2c568dc58 Merge branch 'edition_fixes' into 'master' 
Promo edition fixes

See merge request core-developers/forge!4064
 2021-03-02 01:30:12 +00:00
paul_snoops
44e38e5d13 Promo edition fixes 2021-03-01 21:44:08 +00:00
John
2e65640495 Update tergrid_god_of_fright_tergrids_lantern.txt 2021-03-01 20:28:34 +00:00
Andreas Bendel
81870b5b9b Update de-DE.properties 
MatchScrollIndicator lines
 2021-03-01 19:50:33 +00:00
Michael Kamensky
d7e0fe08ce Merge remote-tracking branch 'origin/master' into agetian-master 2021-03-01 21:11:20 +03:00
Michael Kamensky
800cceb6a8 Merge branch 'netdeckarchivelegacydesktop' into 'master' 
Net Deck Archive Legacy (Desktop implementation)

See merge request core-developers/forge!4056
 2021-03-01 17:18:47 +00:00
Churrufli
a37403d63d Net Deck Archive Legacy (Desktop implementation) 2021-03-01 15:26:00 +01:00
John
bb68324547 Update minion_of_the_wastes.txt 2021-03-01 13:23:01 +01:00
John
6c26ea327e Update vizkopa_confessor.txt 2021-03-01 13:23:01 +01:00
John
cd914c9448 Update soulgorger_orgg.txt 2021-03-01 13:23:00 +01:00
Anthony Calosa
48b58f97e6 Update FScrollPane.java 2021-03-01 13:22:56 +01:00
Anthony Calosa
de76bf5d1d [Android] enclosed check for FScrollPane drawOverlay 2021-03-01 13:22:56 +01:00
Anthony Calosa
8bb2a25b86 [Mobile] revert fillTriangle 2021-03-01 13:22:56 +01:00
Michael Kamensky
625edc4025 Merge branch 'Williams-master-patch-97775' into 'master' 
Some card fixes

See merge request core-developers/forge!4059
 2021-03-01 11:18:03 +00:00
Michael Kamensky
f3ad29f431 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4061
 2021-03-01 11:17:09 +00:00
CCTV-1
af20285014 update simplified chinese translation 2021-03-01 18:51:43 +08:00
Anthony Calosa
21887dce3f Merge branch 'kevlahnota-master-patch-26629' into 'master' 
Update FScrollPane.java

See merge request core-developers/forge!4060
 2021-03-01 10:03:39 +00:00
Anthony Calosa
30a509cde6 Update FScrollPane.java 2021-03-01 10:03:26 +00:00
John
6a1a0d71e1 Update minion_of_the_wastes.txt 2021-03-01 09:55:11 +00:00
John
7a98856f33 Update vizkopa_confessor.txt 2021-03-01 09:54:33 +00:00
John
5de477c4f1 Update soulgorger_orgg.txt 2021-03-01 09:53:39 +00:00
Anthony Calosa
c1aa5b3b6f Merge branch 'master' into 'master' 
[Mobile] enclosed check for FScrollPane drawOverlay

See merge request core-developers/forge!4058
 2021-03-01 09:51:29 +00:00
Anthony Calosa
d622dc773f [Android] enclosed check for FScrollPane drawOverlay 2021-03-01 17:50:44 +08:00
Anthony Calosa
5497e2c317 Merge branch 'master' into 'master' 
[Mobile] revert fillTriangle

See merge request core-developers/forge!4057
 2021-03-01 09:37:19 +00:00
Anthony Calosa
92c6ab27a0 [Mobile] revert fillTriangle 2021-03-01 17:36:13 +08:00
Churrufli
8d3238cefa Net Deck Archive Legacy (Desktop implementation) 2021-03-01 09:34:17 +01:00
Anthony Calosa
276370fdec Merge branch 'master' into 'master' 
[Mobile] Add Scroll Indicator Option on Matchscreen

See merge request core-developers/forge!4055
 2021-03-01 05:53:55 +00:00
Anthony Calosa
0ed07d91cb [Mobile] Add Scroll Indicator on Matchscreen 2021-03-01 13:50:41 +08:00
Michael Kamensky
7664a62eb9 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-03-01 08:43:23 +03:00
Michael Kamensky
26a67bd44f Merge branch 'nexus' into 'master' 
Maskwood Nexus: Workaround for dependency on animated creatures

See merge request core-developers/forge!4049
 2021-03-01 04:32:40 +00:00
Michael Kamensky
b5a1887a1a Merge branch 'card-fixes' into 'master' 
Fix MayFlashSac

See merge request core-developers/forge!4052
 2021-03-01 04:32:07 +00:00
Michael Kamensky
a83f46927a Merge branch 'remove-svar' into 'master' 
Remove some incorrect uses of SVars

See merge request core-developers/forge!4047
 2021-03-01 04:31:32 +00:00
Michael Kamensky
2703ea20c4 Merge branch 'card-fixes-2' into 'master' 
Fix Caller of the Untamed AI

See merge request core-developers/forge!4053
 2021-03-01 04:31:19 +00:00