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
48,264 Commits 32 Branches 187 Tags
e030e28d80ed48a8c778d0aedb51d71f75b18344
Commit Graph

15197 Commits

Author SHA1 Message Date
Michael Kamensky
9578f982ac Merge branch 'TRT-master-patch-50515' into 'master' 
Update zof_consumption

See merge request core-developers/forge!4097
 2021-03-04 10:28:50 +00:00
Bug Hunter
ed9adbaec6 Update forge-gui/res/cardsfolder/z/zof_consumption_zof_bloodbog.txt 2021-03-04 08:35:54 +00:00
Hans Mackowiak
37a6ed9336 AbilityUtils: add OriginalHost to calculateAmount 2021-03-04 07:48:42 +01:00
Hans Mackowiak
784acdba73 fix broken CardDetailUtil 2021-03-04 07:45:33 +01:00
Hans Mackowiak
7525a1062e StaticAbilityContinuous: fix OriginalHost for abilities gained by static abilities 2021-03-04 07:23:01 +01:00
Michael Kamensky
ab537a9e69 Merge branch 'donot_translation_token' into 'master' 
do not translation non card clone token

See merge request core-developers/forge!2478
 2021-03-04 03:46:46 +00:00
Michael Kamensky
fba029fa4d Merge branch 'twosat-master-patch-89543' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4093
 2021-03-04 03:46:23 +00:00
Anthony Calosa
502dbf9c45 Update AbstractGuiGame.java 2021-03-03 22:39:27 +00:00
Andreas Bendel
ffb04d6462 Update de-DE.properties 
translated DisableCardImages and EnableNonLegalCards
 2021-03-03 21:46:43 +00:00
Michael Kamensky
23121a46af Merge branch 'fixpay' into 'master' 
Force player choice for mandatory costs

See merge request core-developers/forge!4074
 2021-03-03 18:20:12 +00:00
Michael Kamensky
7a76bb098f Merge branch 'narfi' into 'master' 
Fix King Narfi's Betrayal

See merge request core-developers/forge!4089
 2021-03-03 18:20:01 +00:00
Michael Kamensky
ad422bc513 Merge branch 'frank' into 'master' 
Fix Frankensteins Monster

Closes #1749

See merge request core-developers/forge!4090
 2021-03-03 18:19:49 +00:00
Anthony Calosa
17944c0e41 Add Disable Card Images Option 2021-03-04 02:15:16 +08:00
tool4EvEr
cce8cf7e85 Fix Frankensteins Monster 2021-03-03 18:20:10 +01:00
tool4EvEr
272a16a9bd Fix King Narfi 2021-03-03 17:40:09 +01:00
Anthony Calosa
36e55ae72f Add option to enable/disable Non-Legal Cards 
Playtest and Un-sets Cards
 2021-03-03 22:29:44 +08:00
Anthony Calosa
ff4803c506 prevent NPE 
it seems repeated momir ai games and you switch to human player and start any game causes the NPE resulting to crashing the UI
 2021-03-03 18:43:25 +08:00
Michael Kamensky
159d358725 - Added an AI hint to Together Forever. 2021-03-03 09:30:18 +03:00
Michael Kamensky
1538e8bf14 - Comment out some currently unsupported cards in Commander precons. 2021-03-03 08:51:38 +03:00
CCTV-1
31f9503af8 Merge remote-tracking branch 'upstream/master' into donot_translation_token 2021-03-03 12:31:55 +08:00
Michael Kamensky
a2d4fb3e81 Merge branch 'fixAkiri' into 'master' 
Fix Akiri multiplayer

See merge request core-developers/forge!4051
 2021-03-03 03:50:17 +00:00
Bug Hunter
1a1bd6077b Fix Akiri multiplayer 2021-03-03 03:50:17 +00:00
Michael Kamensky
a51f28ce1d Merge branch 'unset-cards' into 'master' 
Add dice rolling, and Waste Land

See merge request core-developers/forge!4067
 2021-03-03 03:49:42 +00:00
Michael Kamensky
8a34d26d54 Merge branch 'mnemon' into 'master' 
add Cleanup to Mnemonic Deluge

See merge request core-developers/forge!4076
 2021-03-03 03:49:37 +00:00
Michael Kamensky
3362c79844 Merge branch 'statecraft' into 'master' 
statecraft.txt fix

See merge request core-developers/forge!4075
 2021-03-03 03:49:24 +00:00
Lyu Zong-Hong
45f0bb987e Update Japanese localization 2021-03-03 11:45:18 +09:00
Northmoc
867688fbde add cleanup to mnemonic_deluge.txt 2021-03-02 19:49:01 -05:00
Northmoc
d5a1704f42 statecraft.txt fix 2021-03-02 18:10:58 -05:00
tool4EvEr
65fc79a746 Force player choice for mandatory costs 2021-03-02 19:33:40 +01:00
John
f38df2457e Update tyrite_sanctum.txt 2021-03-02 17:58:21 +00: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
59db0eef2c Add foretell token image as facedown cardback 2021-03-02 21:08:04 +08:00
Churrufli
0219991703 Net Deck Archive Categories (Android implementation) 2021-03-02 10:08:15 +01:00
Churrufli
f02a3c8786 Net Deck Archive Vintage (Desktop implementation) 2021-03-02 09:24:10 +01: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
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
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
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
CCTV-1
af20285014 update simplified chinese translation 2021-03-01 18:51:43 +08: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