leriomaggio
|
5ba6f29ebb
|
FIX ImageFetcher BackFace card check
Quick FIX to restore correct download of backface of cards using directly imageKey string pattern
|
2021-06-21 13:33:18 +01:00 |
|
leriomaggio
|
79f4595292
|
Merge remote-tracking branch 'upstream/master' into editions-type-review
|
2021-06-21 11:45:15 +01:00 |
|
leriomaggio
|
fe0441c667
|
TEMPORARY new Dialog for Sets filtering (still very WIP)
|
2021-06-21 11:44:20 +01:00 |
|
leriomaggio
|
3ba464665e
|
New methods returning a map of all editions per type.
This method is used to populate the "Sets" advanced filters in UI (so far, desktop only)
|
2021-06-21 11:43:51 +01:00 |
|
leriomaggio
|
844360fb34
|
CardEdition.Type now includes new methods for String representation (UI)
|
2021-06-21 11:43:01 +01:00 |
|
Michael Kamensky
|
ee7ac95b6a
|
Merge branch 'endurance-library-position' into 'master'
Endurance should send cards to bottom of library
See merge request core-developers/forge!4909
|
2021-06-21 03:01:20 +00:00 |
|
Michael Kamensky
|
5c46556537
|
Merge branch 'master' into 'master'
update simplified chinese translation
See merge request core-developers/forge!4908
|
2021-06-21 03:01:16 +00:00 |
|
Brock Fanning
|
70a6a9bda5
|
Endurance send to bottom of library
|
2021-06-20 22:05:25 -04:00 |
|
Michael Kamensky
|
a5c30cadb4
|
Merge branch 'add_remaining_commander_cards' into 'master'
Add remaining missing cards in Commander sets
See merge request core-developers/forge!4907
|
2021-06-20 10:56:44 +00:00 |
|
Bug Hunter
|
fcdc8d691d
|
Merge branch 'glinting-creeper-blocking-fix' into 'master'
Fix for Glinting Creeper blocking ability and text
See merge request core-developers/forge!4905
|
2021-06-20 09:00:59 +00:00 |
|
Lyu Zong-Hong
|
6daf4ac78d
|
Add remaining commander cards
|
2021-06-20 17:22:49 +09:00 |
|
CCTV-1
|
ad72b44e12
|
translate new strings
|
2021-06-20 11:52:45 +08:00 |
|
Michael Kamensky
|
d395af122c
|
Merge branch 'add_cruel_entertainment' into 'master'
Add Cruel Entertainment
See merge request core-developers/forge!4906
|
2021-06-20 03:44:05 +00:00 |
|
Lyu Zong-Hong
|
cb0259c946
|
Add AI:RemoveDeck:All flag
|
2021-06-20 12:07:38 +09:00 |
|
Lyu Zong-Hong
|
6e5d79a8e0
|
Add Cruel Entertainment
|
2021-06-20 12:00:28 +09:00 |
|
Brock Fanning
|
7d8ea744c3
|
Fix for Glinting Creeper blocking
|
2021-06-19 20:55:41 -04:00 |
|
Michael Kamensky
|
8a96bbb3d4
|
Merge branch 'update_oracle_mh2' into 'master'
Update oracle mh2
See merge request core-developers/forge!4901
|
2021-06-19 14:54:47 +00:00 |
|
Michael Kamensky
|
36e2c16c9d
|
Merge branch 'vermin-gorger-fix' into 'master'
Fix "Defined" syntax in Vermin Gorger
See merge request core-developers/forge!4903
|
2021-06-19 14:54:42 +00:00 |
|
Michael Kamensky
|
8928c9eb88
|
Merge branch 'ozolith' into 'master'
CountersMoveAi: avoid buffing opponent creatures with The Ozolith
See merge request core-developers/forge!4904
|
2021-06-19 14:54:09 +00:00 |
|
tool4EvEr
|
0de9a0dfd6
|
CountersMoveAi: avoid buffing opponent creatures with The Ozolith
|
2021-06-19 16:25:36 +02:00 |
|
Brock Fanning
|
4ad137a23d
|
Fix syntax in Vermin Gorger
|
2021-06-19 07:11:58 -04:00 |
|
Michael Kamensky
|
f9651796f8
|
Merge branch 'seal' into 'master'
Fix Seal of the Guildpact
See merge request core-developers/forge!4902
|
2021-06-19 09:38:46 +00:00 |
|
Churrufli
|
ce02772161
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
# Conflicts:
# forge-gui/src/main/java/forge/deck/NetDeckCategory.java
# forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java
|
2021-06-19 11:02:06 +02:00 |
|
tool4EvEr
|
84f2d2ead2
|
Fix Seal of the Guildpact
|
2021-06-19 07:28:56 +02:00 |
|
Michael Kamensky
|
d232cefe57
|
Merge branch 'combomana' into 'master'
Fix ComboMana payment
See merge request core-developers/forge!4900
|
2021-06-19 04:55:51 +00:00 |
|
Lyu Zong-Hong
|
84882cd4fa
|
Update Ranar the Ever-Watchful and other similar cards
|
2021-06-19 13:55:02 +09:00 |
|
Lyu Zong-Hong
|
0d592c4096
|
Update types
|
2021-06-19 13:40:33 +09:00 |
|
Lyu Zong-Hong
|
c7d7130344
|
Update oracle for MH2 release
|
2021-06-19 12:47:36 +09:00 |
|
tool4EvEr
|
7672817a6e
|
Fix ComboMana payment
|
2021-06-18 23:43:40 +02:00 |
|
Michael Kamensky
|
b23e550263
|
Merge branch 'TRT-master-patch-16657' into 'master'
Update forge-gui/res/cardsfolder/m/moritte_of_the_frost.txt
See merge request core-developers/forge!4899
|
2021-06-18 15:43:27 +00:00 |
|
Bug Hunter
|
b1f13cf2f0
|
Update forge-gui/res/cardsfolder/m/moritte_of_the_frost.txt
|
2021-06-18 12:47:00 +00:00 |
|
Michael Kamensky
|
afeedf064e
|
Merge branch 'specify_mana_combo' into 'master'
[UI] Use VAssignGenericAmount dialog to specify mana combo
See merge request core-developers/forge!4898
|
2021-06-18 10:50:50 +00:00 |
|
Lyu Zong-Hong
|
9a21f038ad
|
Not use VAssignGenericAmount dialog for TwoEach ability
|
2021-06-18 18:28:15 +09:00 |
|
Lyu Zong-Hong
|
afa6c9986a
|
Use VAssignGenericAmount dialog to assign mana combo
|
2021-06-18 17:58:52 +09:00 |
|
Michael Kamensky
|
c7e489b477
|
Merge branch 'ui_update_divided_as_you_choose' into 'master'
[UI] Use VAssignGenericAmount dialog to assign DividedAsYouChoose values
See merge request core-developers/forge!4897
|
2021-06-18 03:10:35 +00:00 |
|
Michael Kamensky
|
bd060e9090
|
Merge branch 'twosat-master-patch-92329' into 'master'
Update de-DE.properties
See merge request core-developers/forge!4896
|
2021-06-18 03:09:46 +00:00 |
|
Lyu Zong-Hong
|
dfecf5d40a
|
Use VAssignGenericAmount dialog to assign DividedAsYouChoose values
|
2021-06-18 11:21:23 +09:00 |
|
Andreas Bendel
|
db3919ab90
|
Update de-DE.properties
translated lblAssignCombatDamageAsChoose and lblAssignCombatDamageToCreature
|
2021-06-17 19:11:54 +00:00 |
|
Michael Kamensky
|
5193447625
|
Merge branch 'sld_update' into 'master'
SLD update
See merge request core-developers/forge!4895
|
2021-06-17 18:56:21 +00:00 |
|
paul_snoops
|
42c5b890a7
|
SLD update
|
2021-06-17 19:24:00 +01:00 |
|
Michael Kamensky
|
31192889d1
|
Merge branch 'fixes' into 'master'
Minor card fixes
See merge request core-developers/forge!4894
|
2021-06-17 17:50:21 +00:00 |
|
tool4EvEr
|
b5e55a3a47
|
Minor card fixes
|
2021-06-17 17:05:16 +02:00 |
|
Michael Kamensky
|
5e39a2979b
|
Merge branch 'update_damage_replacement_cards' into 'master'
Update some damage replacement related cards
See merge request core-developers/forge!4893
|
2021-06-17 09:48:53 +00:00 |
|
Michael Kamensky
|
be3c26676e
|
Merge branch 'update_illusionary_terrain' into 'master'
Update Illusionary Terrain and Vision Charm
See merge request core-developers/forge!4892
|
2021-06-17 09:48:30 +00:00 |
|
Alumi
|
20dc234ec1
|
Update Illusionary Terrain and Vision Charm
|
2021-06-17 09:48:30 +00:00 |
|
Lyu Zong-Hong
|
cd29194824
|
Update some damage replacement related cards
|
2021-06-17 15:44:12 +09:00 |
|
Michael Kamensky
|
777514dc7d
|
Merge branch 'fixes' into 'master'
Small Card fixes
See merge request core-developers/forge!4891
|
2021-06-17 02:58:47 +00:00 |
|
tool4EvEr
|
28ee56baea
|
Small Card fixes
|
2021-06-16 20:02:56 +02:00 |
|
Michael Kamensky
|
cc362cec5c
|
Merge branch 'fix_trigger_damage_map' into 'master'
Fix crash when triggered ability is using damage map
See merge request core-developers/forge!4889
|
2021-06-16 15:04:26 +00:00 |
|
Michael Kamensky
|
b698b49256
|
Merge branch 'triggers' into 'master'
AddToCombat: add missing block trigger
See merge request core-developers/forge!4887
|
2021-06-16 15:04:14 +00:00 |
|