Commit Graph

16315 Commits

Author SHA1 Message Date
Michael Kamensky
0156a04541 Merge branch 'update_japanese_localization' into 'master'
Update Japanese Localization

See merge request core-developers/forge!4121
2021-03-06 09:36:06 +00:00
Lyu Zong-Hong
ab148cd120 Update Japanese localization 2021-03-06 18:24:28 +09:00
Lyu Zong-Hong
bace635203 Update CJK font list 2021-03-06 17:49:05 +09:00
CCTV-1
f1cff21f57 update simplified chinese translation 2021-03-06 13:28:26 +08:00
Andreas Bendel
51eab3fd3e Update de-DE.properties
reworked a few lines
2021-03-05 20:30:33 +00:00
Michael Kamensky
44ab41e0c6 Merge branch 'TRT-master-patch-70430' into 'master'
Update ledev_champion.txt

See merge request core-developers/forge!4111
2021-03-05 20:20:06 +00:00
Bug Hunter
d9579bf5cb Update forge-gui/res/cardsfolder/l/ledev_champion.txt 2021-03-05 19:34:17 +00:00
Michael Kamensky
267403367c Merge branch 'master' into 'master'
Lantern of Undersight

See merge request core-developers/forge!4108
2021-03-05 19:01:40 +00:00
Hythonia
954431bc11 Update lantern_of_undersight.txt 2021-03-05 18:49:27 +00:00
Anthony Calosa
f206a5f084 Add castable cards available from command
- if somehow you have a lot of cards mixed in graveyard or exile, this will be an easier way to find them
2021-03-05 17:55:46 +00:00
Hythonia
9e5fdf0bba Update lantern_of_undersight.txt 2021-03-05 17:42:15 +00:00
Hythonia
d671eed1bd CMB1: Lantern of Undersight 2021-03-05 18:20:34 +01:00
Lyu Zong-Hong
9ae07284d8 Add CJK font setting and dowloader for mobile port 2021-03-05 20:25:07 +09:00
Michael Kamensky
22a2263247 Merge branch 'card-fixes' into 'master'
Frankenstein's Monster and Hydradoodle fixes

Closes #1749

See merge request core-developers/forge!4099
2021-03-04 16:53:03 +00:00
Churrufli
d2f6cf90a8 Update es-ES.properties 2021-03-04 16:36:29 +00:00
Adam Pantel
d0fbd04081 Frankenstein's Monster and Hydradoodle fixes 2021-03-04 09:12:06 -05:00
Michael Kamensky
35b1fde876 Merge branch 'apantel-master-patch-55809' into 'master'
Add cleanup in Frogkin Kidnapper

See merge request core-developers/forge!4096
2021-03-04 10:46:27 +00:00
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
Adam Pantel
7c12c4db69 Add cleanup in Frogkin Kidnapper 2021-03-04 06:03:37 +00: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