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
Wendell Wilkerson
75ccabff9c
added creatures with charm triggers
2021-07-09 23:30:37 -05: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
Wendell Wilkerson
ac094f4af4
added AFR charm instants
2021-07-09 22:11:07 -05: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
Michael Kamensky
7744552450
Merge branch 'stackdesc' into 'master'
...
Various fixes
See merge request core-developers/forge!4972
2021-07-09 16:15:59 +00:00
Michael Kamensky
6de4789428
Merge branch 'afr_9' into 'master'
...
AFR - 9 Jul
See merge request core-developers/forge!4973
2021-07-09 16:15:48 +00:00
Northmoc
3af8a7dfa4
add "RememberRoll" to RollDiceEffect
2021-07-09 11:10:50 -04:00
Northmoc
9e92e46cad
goblin_morningstar.txt
2021-07-09 11:10:28 -04:00
Northmoc
962d5c2105
aberrant_mind_sorceror.txt
2021-07-09 10:17:46 -04:00
Northmoc
ef4536d033
dragon_turtle.txt
2021-07-09 08:55:19 -04:00
Northmoc
01376d82db
said_done.txt fix Duration
2021-07-09 08:49:27 -04:00
Northmoc
570abfcd21
spoils_of_the_hunt.txt - add AILogic
2021-07-09 08:08:13 -04:00
Northmoc
5bf0ad547e
hunters_edge.txt - add AILogic
2021-07-09 08:07:32 -04:00
Northmoc
f8a256ea27
hunters_edge.txt tidy up
2021-07-09 08:00:23 -04:00
Northmoc
e46001cc91
price_of_loyalty.txt fix Pump param
2021-07-09 07:56:34 -04:00
Northmoc
07261e8525
spoils_of_the_hunt.txt
2021-07-09 07:55:00 -04:00
Northmoc
64f022f809
kalain_reclusive_painter.txt
2021-07-09 07:22:55 -04:00
Northmoc
c07a63cd7e
price_of_loyalty.txt
2021-07-09 07:22:54 -04:00
Northmoc
60b27803ce
jaded_sell_sword.txt
2021-07-09 07:22:54 -04:00
Northmoc
c5c58885e6
devour_intellect.txt
2021-07-09 07:22:53 -04:00
Michael Kamensky
0c748c091e
Merge branch 'dividedfix' into 'master'
...
Fix assignGenericAmount dialog when no targets (Lathiel)
See merge request core-developers/forge!4967
2021-07-09 09:42:37 +00:00
Michael Kamensky
8c8c8ba0c7
Merge branch 'twosat-master-patch-51857' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!4971
2021-07-09 09:31:44 +00:00
Andreas Bendel
2e03b172b2
Update de-DE.properties
...
'translated' Ante and Sideboard label
not much to do
2021-07-09 06:21:10 +00:00
Michael Kamensky
6474f2a7eb
Merge branch 'small_fixes' into 'master'
...
AFR card scripts 08 Jul
See merge request core-developers/forge!4968
2021-07-09 04:14:33 +00:00
Michael Kamensky
51df73d918
Merge branch 'afr_8' into 'master'
...
AFR - 8 Jul
See merge request core-developers/forge!4966
2021-07-09 04:13:36 +00:00
Michael Kamensky
98cf75e92e
Merge branch 'card_targeting_fixes' into 'master'
...
Card script fixes for Issue #1893
See merge request core-developers/forge!4963
2021-07-09 04:12:42 +00:00
Michael Kamensky
43ac1fabcf
Merge branch 'akoum' into 'master'
...
PumpAll: better trigger decision
See merge request core-developers/forge!4969
2021-07-09 04:11:16 +00:00
Wendell Wilkerson
f06fa47e75
Merge branch 'master' into card_targeting_fixes
2021-07-08 21:56:35 -05:00
Wendell Wilkerson
06c60a2540
updated from MR comments
2021-07-08 21:48:04 -05:00
Northmoc
8bf557cc19
check_for_traps.txt fix reveal, descs
2021-07-08 20:38:50 -04:00
paul_snoops
00e256edf7
AFR card scripts 08 Jul
2021-07-08 22:16:56 +01:00
paul_snoops
cd7bd9263a
AFR card scripts 08 Jul
2021-07-08 22:15:54 +01:00
paul_snoops
933d92bdd4
AFR card scripts 08 Jul
2021-07-08 22:04:58 +01:00
tool4EvEr
101ce59f06
Clean up
2021-07-08 21:04:32 +02:00
tool4EvEr
3e16390999
PumpAll: better trigger decision
2021-07-08 21:04:17 +02:00
paul_snoops
4c71f76260
AFR card scripts 08 Jul
2021-07-08 18:46:15 +01:00
Northmoc
c7cb42cd7b
skeletal_swarming.txt
2021-07-08 12:16:00 -04:00
tool4EvEr
a1964eb75e
Fix assignGenericAmount dialog when no targets (Lathiel)
2021-07-08 17:49:42 +02:00
Northmoc
fb0c44fce6
long_rest.txt
2021-07-08 11:33:13 -04:00
Northmoc
3f263fefee
ochre_jelly.txt
2021-07-08 11:33:12 -04: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
leriomaggio
b42a59a1db
Switch Back to "Preferred Art" option name
2021-07-08 07:57:34 +01:00
leriomaggio
4875b512de
Switches KeepAlive Key on mac to F4 (from F1) to workaround help
...
F1 key is sometimes mapped to invoke help menus (e.g. Discord)
2021-07-08 07:55:59 +01:00
leriomaggio
4be1891a3f
FIX: Better handle the case for deck cover image for empty decks
2021-07-08 07:55:12 +01:00
