CCTV-1
|
f1cff21f57
|
update simplified chinese translation
|
2021-03-06 13:28:26 +08:00 |
|
Michael Kamensky
|
74fd7e1c54
|
Merge branch 'twosat-master-patch-92194' into 'master'
Update de-DE.properties
See merge request core-developers/forge!4112
|
2021-03-06 04:59:23 +00:00 |
|
Michael Kamensky
|
6b24d93d46
|
Merge branch 'fix_change_zone_all_remember_meld_mutate' into 'master'
Remember meld and merged cards for ChangeZoneAll effect
See merge request core-developers/forge!4115
|
2021-03-06 04:59:13 +00:00 |
|
Michael Kamensky
|
bf64158d51
|
Merge branch 'mutate_skip_permanent_sa' into 'master'
Don't add SA that are permanent spells to mutated creature
See merge request core-developers/forge!4116
|
2021-03-06 04:58:33 +00:00 |
|
Anthony Calosa
|
e0918fb151
|
Merge branch 'refresh_skin_font_list' into 'master'
[Mobile] Refresh skins and fonts list after download them
See merge request core-developers/forge!4114
|
2021-03-06 04:36:57 +00:00 |
|
CCTV-1
|
a11ab7d007
|
if the string is empty after replacement,return creation time.
|
2021-03-06 11:16:23 +08:00 |
|
CCTV-1
|
68b36b8890
|
Merge remote-tracking branch 'upstream/master' into unicode_deck_name
|
2021-03-06 10:30:21 +08:00 |
|
Lyu Zong-Hong
|
41da75d346
|
Don't add SA that are permanent spells to mutated creature
|
2021-03-06 10:41:19 +09:00 |
|
Lyu Zong-Hong
|
16ed4fa97a
|
Remember meld and merged cards for ChangeZoneAll effect
|
2021-03-06 10:15:04 +09:00 |
|
Lyu Zong-Hong
|
6ba389149c
|
Refresh skins and fonts list after download them
|
2021-03-06 09:32:18 +09:00 |
|
Anthony Calosa
|
c721bd953b
|
Merge branch 'master' into 'master'
[Android] Fix startup with CJK Fonts
See merge request core-developers/forge!4113
|
2021-03-05 22:20:57 +00:00 |
|
Anthony Calosa
|
96c6278681
|
Merge remote-tracking branch 'core/master'
|
2021-03-06 06:20:00 +08:00 |
|
Anthony Calosa
|
3d0a7a9c93
|
[Android] Fix startup with CJK Fonts
|
2021-03-06 06:15:16 +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
|
8fe672101f
|
Merge branch 'master' into 'master'
[Mobile] Omit CJK font changes until it's working correctly on android
See merge request core-developers/forge!4110
|
2021-03-05 18:31:59 +00:00 |
|
Anthony Calosa
|
b6f27ad512
|
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 18:31:59 +00:00 |
|
Anthony Calosa
|
7d69a4158c
|
Merge branch 'master' into 'master'
[Mobile] Fix Planar Conquest Region flickering art
See merge request core-developers/forge!4109
|
2021-03-05 17:55:46 +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 |
|
Anthony Calosa
|
9a386c512f
|
Merge branch 'master' into 'master'
Add castable cards available from command
See merge request core-developers/forge!4105
|
2021-03-05 17:53:04 +00:00 |
|
Anthony Calosa
|
87e36c3f6f
|
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:53:04 +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 |
|
Anthony Calosa
|
3e0e501465
|
Merge branch 'shadow-horsemanship-icons' into 'master'
[Desktop] Enable Horsemanship & Shadow Icons
Closes #1756
See merge request core-developers/forge!4107
|
2021-03-05 16:44:51 +00:00 |
|
Anthony Calosa
|
de43103ecf
|
Closes #1756
|
2021-03-06 00:42:28 +08:00 |
|
Michael Kamensky
|
7da8a4954b
|
Merge branch 'cjk_font_setting_download' into 'master'
Add CJK font setting and dowloader for mobile port
See merge request core-developers/forge!4104
|
2021-03-05 14:12:20 +00:00 |
|
Lyu Zong-Hong
|
9ae07284d8
|
Add CJK font setting and dowloader for mobile port
|
2021-03-05 20:25:07 +09:00 |
|
Anthony Calosa
|
e175ad2d65
|
Merge branch 'master' into 'master'
update android check for FileUriExposedException
See merge request core-developers/forge!4103
|
2021-03-05 03:36:56 +00:00 |
|
Anthony Calosa
|
af4ea4fa9a
|
update android check for FileUriExposedException
|
2021-03-05 03:36:56 +00:00 |
|
Michael Kamensky
|
7adf6f7934
|
Merge branch 'master' into 'master'
[Mobile] Add support for viewing both sides of facedown DFC
See merge request core-developers/forge!4102
|
2021-03-04 18:02:25 +00:00 |
|
Anthony Calosa
|
317a2ed7a4
|
Merge remote-tracking branch 'core/master'
|
2021-03-05 01:57:48 +08:00 |
|
Anthony Calosa
|
e030e28d80
|
[Mobile] Add support for viewing both sides of facedown DFC
|
2021-03-05 01:53:14 +08: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 |
|
Michael Kamensky
|
a887fc13bf
|
Merge branch 'mutateChangesZoneAll' into 'master'
ChangeZoneEffect: add Meld and Mutate for TriggerChangesZoneAll
See merge request core-developers/forge!4100
|
2021-03-04 16:52:43 +00:00 |
|
Michael Kamensky
|
239a867046
|
Merge branch 'churrufli-master-patch-59527' into 'master'
Update es-ES.properties
See merge request core-developers/forge!4101
|
2021-03-04 16:52:19 +00:00 |
|
Churrufli
|
d2f6cf90a8
|
Update es-ES.properties
|
2021-03-04 16:36:29 +00:00 |
|
Hans Mackowiak
|
a653085e60
|
ChangeZoneEffect: add Meld and Mutate for TriggerChangesZoneAll
|
2021-03-04 15:23:05 +01: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 |
|
Anthony Calosa
|
082a3fe3cc
|
Merge branch 'master' into 'master'
[Mobile] fix stack description
See merge request core-developers/forge!4098
|
2021-03-04 10:43:08 +00:00 |
|
Anthony Calosa
|
3960e19f0b
|
[Mobile] fix stack description
|
2021-03-04 10:43:08 +00:00 |
|
Anthony Calosa
|
890733bd44
|
Merge remote-tracking branch 'core/master'
|
2021-03-04 18:42:41 +08:00 |
|
Anthony Calosa
|
47bfda3510
|
[Mobile] fix stack description
|
2021-03-04 18:41:15 +08: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 |
|