Hans Mackowiak
a8cba0eef4
SurveilEffect: fix triggerChangesZoneAll
2021-07-11 03:28:05 +02:00
Hans Mackowiak
e0f01a3168
CardFactoryUtil: add way to add Extra Parameters and Extra Description
2021-07-11 03:01:21 +02:00
Michael Kamensky
3dd44ba71a
Merge branch 'update_wrapped_description' into 'master'
...
Update the implementation of trigger replacing ABILITY text
Closes #1914
See merge request core-developers/forge!4976
2021-07-10 12:33:59 +00:00
Lyu Zong-Hong
33f5080ca6
Fix WrappedAbility again so simultaneous trigger text is shown
2021-07-10 18:43:27 +09:00
Michael Kamensky
affbd917b3
Merge branch 'path' into 'master'
...
Fix Descendants' Path shuffling
See merge request core-developers/forge!4977
2021-07-10 09:05:51 +00:00
Hans Mackowiak
3126d7ac5d
Merge branch 'treasureSpent' into 'master'
...
CastTotalManaSpent Treasure
See merge request core-developers/forge!4948
2021-07-10 07:49:13 +00:00
Hans Mackowiak
1f0e49d1d4
CastTotalManaSpent Treasure
2021-07-10 07:49:12 +00:00
tool4EvEr
60d4991a84
Fix Descendants' Path shuffling
2021-07-10 09:41:35 +02:00
Lyu Zong-Hong
d5149293da
Update the implementation of trigger replacing ABILITY text.
2021-07-10 15:22:55 +09:00
Michael Kamensky
dd6dc739fb
Merge branch 'propertyfix' into 'master'
...
ThisTargetedController
Closes #1909
See merge request core-developers/forge!4974
2021-07-10 03:42:11 +00:00
leriomaggio
7664937c93
Updated CardArtPreference Constants value
...
Also, the CardArtPreference Enum now includes a new methods that allows seamless recognition (and instantiation) of corresponding enum value from Forge Preference - also with backward compatibility.
2021-07-09 20:20:52 +01:00
leriomaggio
2d3d67176a
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-07-09 20:08:34 +01:00
tool4EvEr
cdb2330792
Fix Ram Through
2021-07-09 20:22:23 +02:00
Northmoc
3af8a7dfa4
add "RememberRoll" to RollDiceEffect
2021-07-09 11:10:50 -04:00
tool4EvEr
a1964eb75e
Fix assignGenericAmount dialog when no targets (Lathiel)
2021-07-08 17:49:42 +02:00
leriomaggio
0feee4c67b
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-07-08 07:57:52 +01:00
Michael Kamensky
8de27ddb0c
Merge branch 'afr_7' into 'master'
...
AFR - 7 Jul
See merge request core-developers/forge!4964
2021-07-07 20:26:40 +00:00
Northmoc
74b439adaf
AbilityUtils.java support "DungeonCompletedNamed"
2021-07-07 16:10:59 -04:00
Northmoc
b383262e70
GameActionUtil.java - add Equip 0 code block similar to Cycling 0
2021-07-07 10:04:45 -04:00
Northmoc
866602a683
MagicStack.java log number of Equips this turn
2021-07-07 09:43:11 -04:00
Northmoc
0638670b7c
remove Equip Trigger stuff from Player.java
2021-07-07 09:43:10 -04:00
Northmoc
9df082f448
AbilityUtils.java YouEquippedThisTurn XMath
2021-07-07 09:43:10 -04:00
Northmoc
66e8cc5bff
Player.java support equippedThisTurn
2021-07-07 09:43:10 -04:00
Michael Kamensky
76e361287a
Merge branch 'vecna' into 'master'
...
AFR: Vecna
See merge request core-developers/forge!4959
2021-07-07 02:55:03 +00:00
Northmoc
9543534dda
AnimateEffectBase - support "GainsTriggeredAbilitiesOf"
2021-07-06 19:58:34 -04:00
tool4EvEr
c70b3ba4ae
Fix import
2021-07-06 18:15:49 +02:00
Alumi
fcdb9b25bd
Add Ante and Sideboard label to PlayerDetailsPanel to allow view cards in them
2021-07-06 16:07:31 +00:00
leriomaggio
b0c1f1cb0b
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-07-06 08:36:40 +01:00
leriomaggio
b6509bd13b
Renamed SetPolicy for old print (all editions)
...
Won't exclude that I will come back at namings after having now worked on CardEdition.Type revision
2021-07-06 08:11:58 +01:00
leriomaggio
8e2bb55fc6
Renamed SetPolicy for latest print (all editions)
...
Won't exclude that I will come back at namings after having now worked on CardEdition.Type revision
2021-07-06 08:11:22 +01:00
Michael Kamensky
251ffbf574
Merge branch 'editions-type-review' into 'master'
...
ReNEWED Edition Types and Dates for Card Edition, ReNewed `Set` filter dialog panel in Desktop, NEW `Blocks` Card|Deck Catalog Filter, Updates to Formats
See merge request core-developers/forge!4878
2021-07-06 04:23:24 +00:00
tool4EvEr
80bc6785ba
Small PlayEffect fix
2021-07-05 23:54:27 +02:00
Hans Mackowiak
7a1a657ae9
Card: changedCardTypesCharacterDefining + changedCardColorsCharacterDefining for better apply in Order
2021-07-05 20:03:07 +02:00
Michael Kamensky
41c3d6ebed
Merge branch 'kethis' into 'master'
...
Small fixes
See merge request core-developers/forge!4945
2021-07-05 14:50:59 +00:00
Michael Kamensky
bdff72745a
Merge branch 'volo_guide_to_monsters' into 'master'
...
Add Volo, Guide to Monsters and support invert condition for card properties
See merge request core-developers/forge!4949
2021-07-05 14:48:27 +00:00
leriomaggio
42223f109e
Merge remote-tracking branch 'upstream/master' into editions-type-review
2021-07-05 09:40:34 +01:00
Alumi
756132c8af
Merge branch 'GristFixes' into 'master'
...
Grist: Better check for StaticAbility using ExcludeZone, fix timestamp on...
See merge request core-developers/forge!4947
2021-07-05 05:53:15 +00:00
Lyu Zong-Hong
f7694970c8
Add Volo, Guide to Monsters and support negate condition for card properties
2021-07-05 13:26:09 +09:00
Alumi
dc793aa266
Update RollDiceEffect to better support d20 mechanism in AFR
2021-07-05 02:38:57 +00:00
leriomaggio
cabfe0a33a
Merge remote-tracking branch 'upstream/master' into editions-type-review
2021-07-05 01:21:39 +01:00
leriomaggio
9256fdfd1a
FIXED dates comparison for Historic formats, and used index in addition (if no date)
2021-07-04 20:45:26 +01:00
tool4EvEr
db3accfa50
Clean up
2021-07-04 20:07:44 +02:00
leriomaggio
9d80ae2d5c
Fixing format types and subtypes read after uppercase change
2021-07-04 18:22:11 +01:00
leriomaggio
33526bb31b
Updating all enum FormatSubType to UPPERCASE as constants
2021-07-04 17:46:07 +01:00
leriomaggio
9c72cf2eb4
Updating all enum FormatType to UPPERCASE as constants
2021-07-04 17:44:53 +01:00
Hans Mackowiak
5cb384afa2
Grist: Better check for StaticAbility using ExcludeZone, fix timestamp on Stack, and extra rule for canBeCommander
2021-07-04 18:27:31 +02:00
tool4EvEr
12be76899a
Fix amount for X spells
2021-07-04 13:41:24 +02:00
Michael Kamensky
233ad71b86
Merge branch 'AffectedAmount' into 'master'
...
Fix AffectedAmount
See merge request core-developers/forge!4943
2021-07-04 05:04:41 +00:00
tool4EvEr
35121c85af
Fix AffectedAmount
2021-07-03 22:07:55 +02:00
tool4EvEr
8562f2f28d
Entwine fix
2021-07-03 15:16:36 +02:00
