Commit Graph

51595 Commits

Author SHA1 Message Date
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
Northmoc
10bbd4d07f blue_dragon.txt 2021-07-07 15:05:21 -04:00
Northmoc
a2fa475c43 white_dragon.txt 2021-07-07 14:46:20 -04:00
Northmoc
9965517329 loyal_warhound.txt 2021-07-07 14:46:04 -04:00
paul_snoops
9469f1bdaf AFR card scripts 07 Jul 2021-07-07 19:19:26 +01:00
paul_snoops
5163836668 AFR card scripts 07 Jul 2021-07-07 16:57:34 +01:00
paul_snoops
322008b458 AFR card scripts 07 Jul 2021-07-07 16:34:49 +01:00
paul_snoops
059641f71d AFR card scripts 07 Jul 2021-07-07 15:45:51 +01:00
Northmoc
b383262e70 GameActionUtil.java - add Equip 0 code block similar to Cycling 0 2021-07-07 10:04:45 -04:00
Wendell Wilkerson
636cbaeb5f fixed charm cards in bug reports 2021-07-07 08:44:05 -05: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
Northmoc
7188f2ccb3 bruenor_battlehammer.txt 2021-07-07 09:43:09 -04:00
paul_snoops
28cd8c877d AFR card scripts 07 Jul 2021-07-07 14:03:54 +01:00
paul_snoops
ccd2f2c1c6 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-07-07 12:45:56 +01:00
Michael Kamensky
bda997ef1e Merge branch 'wish' into 'master'
Add Wish and update Frontier Explorer

See merge request core-developers/forge!4960
2021-07-07 10:36:39 +00:00
Lyu Zong-Hong
6849578899 Add Wish and update Frontier Explorer 2021-07-07 18:13:06 +09:00
paul_snoops
96785e1353 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-07-07 05:11:52 +01:00
Michael Kamensky
a02f29ba8a Merge branch 'AFR_cards' into 'master'
AFR card scripts 05 Jul

See merge request core-developers/forge!4950
2021-07-07 02:55:46 +00: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
Michael Kamensky
2f9e2dc2ef Merge branch 'afr_6' into 'master'
AFR - 6 July

See merge request core-developers/forge!4957
2021-07-07 02:53:23 +00:00
Wendell Wilkerson
a3b685a937 fixed two target DealDamage cards 2021-07-06 21:29:00 -05:00
Northmoc
9543534dda AnimateEffectBase - support "GainsTriggeredAbilitiesOf" 2021-07-06 19:58:34 -04:00
Northmoc
af0056d971 the_book_of_vile_darkness.txt 2021-07-06 19:57:30 -04:00
Northmoc
cec46460f4 hand_of_vecna.txt 2021-07-06 19:57:14 -04:00
Northmoc
789fb973a9 vecna token 2021-07-06 19:56:43 -04:00
paul_snoops
1a38a62941 AFR card scripts 05 Jul 2021-07-06 22:52:04 +01:00
paul_snoops
a52df6e4d1 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-07-06 18:21:22 +01:00
paul_snoops
82ce6d1e3d AFR card scripts 05 Jul 2021-07-06 18:20:38 +01:00
paul_snoops
f71804a56f AFR card scripts 05 Jul 2021-07-06 18:13:33 +01:00
Bug Hunter
5f0662c139 Merge branch 'import' into 'master'
Fix import

See merge request core-developers/forge!4958
2021-07-06 16:16:02 +00:00
tool4EvEr
c70b3ba4ae Fix import 2021-07-06 18:15:49 +02:00
Bug Hunter
4fbe9084e2 Merge branch 'twosat-master-patch-21869' into 'master'
Update de-DE.properties

See merge request core-developers/forge!4956
2021-07-06 16:08:06 +00:00
Bug Hunter
2381589bea Merge branch 'add_sideboard_ante_label' into 'master'
Add Ante and Sideboard label to PlayerDetailsPanel to allow view cards in them

See merge request core-developers/forge!4940
2021-07-06 16:07:32 +00:00
Alumi
fcdb9b25bd Add Ante and Sideboard label to PlayerDetailsPanel to allow view cards in them 2021-07-06 16:07:31 +00:00
Northmoc
6cc745526b teleportation_circle.txt 2021-07-06 10:19:06 -04:00
Northmoc
745a33ef8c mind_flayer.txt 2021-07-06 10:18:50 -04:00
Andreas Bendel
dc54a94bcc Update de-DE.properties
lblBlock was missing
2021-07-06 12:06:36 +00:00
paul_snoops
eb519f4278 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-07-06 11:08:27 +01:00
paul_snoops
934c780b73 AFR card scripts 05 Jul 2021-07-06 11:05:28 +01:00
paul_snoops
dc0ed6e233 AFR card scripts 05 Jul 2021-07-06 11:02:29 +01:00