Commit Graph

51337 Commits

Author SHA1 Message Date
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
Michael Kamensky
d7b252185a Merge branch 'afr_7' into 'master'
AFR: 7 Jul

See merge request core-developers/forge!4965
2021-07-08 04:21:09 +00:00
Northmoc
2cc6128f1f treasure_chest.txt 2021-07-07 23:46:01 -04:00
Northmoc
da6c027315 treasure_vault.txt 2021-07-07 23:45:24 -04:00
Northmoc
e4f7bd1f68 hobgoblin_bandit_lord.txt 2021-07-07 23:17:25 -04:00
Northmoc
5de6401ed8 xorn.txt 2021-07-07 22:58:10 -04:00
Northmoc
2e469be484 flameskull.txt 2021-07-07 22:58:10 -04:00
Northmoc
2074320961 westgate_regent.txt 2021-07-07 22:58:09 -04:00
Northmoc
626124c912 true_polymorph.txt 2021-07-07 22:58:09 -04:00
Wendell Wilkerson
2bf066b937 Merge branch 'master' into card_targeting_fixes 2021-07-07 20:47:29 -05: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
Michael Kamensky
030ed46cae Merge branch 'AFR_7_7' into 'master'
AFR card scripts 07 Jul

See merge request core-developers/forge!4962
2021-07-07 20:26:09 +00:00
Michael Kamensky
b85b067e42 Merge branch 'bruenor' into 'master'
AFR: Bruenor Battlehammer

See merge request core-developers/forge!4953
2021-07-07 20:25:25 +00:00
Northmoc
74b439adaf AbilityUtils.java support "DungeonCompletedNamed" 2021-07-07 16:10:59 -04:00
Northmoc
d020e8a7d1 acererak_the_archlich.txt 2021-07-07 16:06:37 -04:00
Northmoc
27624ae6e2 blue_dragon.txt fix 2021-07-07 15:13:08 -04:00