Commit Graph

9845 Commits

Author SHA1 Message Date
Michael Kamensky
97d0e4f1b7 Merge branch 'moar_c18_cards' into 'master'
Add the right conditional for Yennett

See merge request core-developers/forge!867
2018-08-18 04:13:52 +00:00
tehdiplomat
63c06ed7cb Add the right conditional for Yennett 2018-08-17 22:11:02 -04:00
Sol
f7230cbff3 Update Commander Anthology Vol. II.txt 2018-08-17 19:51:38 +00:00
Hanmac
553a794642 Afflict use : 2018-08-17 17:31:49 +02:00
Michael Kamensky
48a7e50bfa Merge branch 'fortifyFix' into 'master'
Fortify use :

See merge request core-developers/forge!864
2018-08-17 15:18:30 +00:00
Hanmac
226754d80f Poisonous use : 2018-08-17 15:31:33 +02:00
Hanmac
a72dfcacea Fortify use : 2018-08-17 15:19:09 +02:00
Hans Mackowiak
b927c790c7 Update TriggerDesc 2018-08-17 12:25:31 +00:00
tehdiplomat
1ae10cb5ca Fix Yennett draw 2018-08-17 07:55:14 -04:00
tehdiplomat
4a95685436 Add Windgrave's Judgmenet and Yennett 2018-08-16 21:48:51 -04:00
Sol
d2f5bd1a3d Update fatpacks.txt for M19 2018-08-15 15:19:43 +00:00
Sol
292ba47f70 Update boosterboxes.txt for M19 2018-08-15 15:18:35 +00:00
Sol
c026c399c3 Update screeching_phoenix.txt 2018-08-15 12:32:25 +00:00
Sol
c13aebe791 Update ajani_wise_counselor.txt 2018-08-15 12:31:35 +00:00
Michael Kamensky
f1f96557c2 Merge branch 'patch-1' into 'master'
Update loyal_subordinate.txt Trigger Zone Fix

See merge request core-developers/forge!858
2018-08-15 06:24:41 +00:00
Michael Kamensky
cdf9e3693d Merge branch 'patch-2' into 'master'
Update loyal_guardian.txt Trigger Zone Fix

See merge request core-developers/forge!859
2018-08-15 06:24:38 +00:00
Agetian
5817a795f3 - Added puzzle PS_M195. 2018-08-15 08:38:15 +03:00
Computica
8c1f4c5720 Update loyal_guardian.txt Trigger Zone Fix 2018-08-15 04:20:14 +00:00
Computica
4ddfe40ff1 Update loyal_subordinate.txt Trigger Zone Fix 2018-08-15 04:19:00 +00:00
tehdiplomat
7be9ef06e0 Add Forge of Heroes 2018-08-14 17:37:53 -04:00
tehdiplomat
3dfa54e4da Add Saheeli, the Gifted 2018-08-14 17:10:04 -04:00
tehdiplomat
9c517070e4 Added Varchild 2018-08-14 16:18:50 -04:00
tehdiplomat
75caf0643a Added Tawnos 2018-08-14 16:02:25 -04:00
tehdiplomat
41ce31497b Add Tawnos Urza's Apprentice 2018-08-14 13:36:33 -04:00
tehdiplomat
fa1128b94c Magus of the Balance and Reality Scramble 2018-08-14 12:22:42 -04:00
tehdiplomat
e147900618 Move cards from upcoming to their appropriate letter 2018-08-14 09:04:40 -04:00
tehdiplomat
28c2aceba3 Boreas Charger, Endless Atlas, Ever-Watching Threshold 2018-08-14 08:35:38 -04:00
Jamin W. Collins
2aa8d4bb1a use CardFaceView for selecting CardFaces
needed for Runed Halo and similar

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-08-11 13:27:26 -06:00
Jamin W. Collins
269d6ead0c use CardView for Splice onto Arcane choice
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-08-11 13:24:40 -06:00
Jamin W. Collins
b980bbf66e adding check to ensure all args are Serializable
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-08-11 13:24:40 -06:00
Jamin W. Collins
e236202ddb ensure that charms use SpellAbilityView for choices
- needed for Funeral Charm

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-08-11 13:24:40 -06:00
David Ellis
75ebadac10 Update yuriko_the_tigers_shadow.txt Ninjas You Control Fix 2018-08-11 10:49:43 +00:00
Hans Mackowiak
8e80c8c5f5 Update jiang_yanggu.txt 2018-08-10 15:01:27 +00:00
Hanmac
7bf6aa7f6e add Estrid's Invocation using CorrectedSelf 2018-08-08 22:53:13 +02:00
Michael Kamensky
739d3abfe6 Merge branch 'mirari_conjecture_description_fix' into 'master'
Use the correct text for The Mirari Conjecture's third ability.

See merge request core-developers/forge!849
2018-08-08 03:00:01 +00:00
kms70847
571029508f Use the correct text for The Mirari Conjecture's third ability. 2018-08-07 18:03:43 -04:00
kms70847
d1945e2c33 Thantis should cause all creatures to attack if able, not block if able.
Resolves the first third of https://git.cardforge.org/core-developers/forge/issues/644
2018-08-07 17:01:34 -04:00
Hans Mackowiak
eff8720500 Merge branch 'replicate_cost_display_fix' into 'master'
Resolves https://git.cardforge.org/core-developers/forge/issues/641.

Closes #641

See merge request core-developers/forge!842
2018-08-07 17:39:29 +00:00
Hans Mackowiak
780bae107b Merge branch 'master' into 'master'
Fixed Animate Dead and related cards.

Closes #643 and #620

See merge request core-developers/forge!847
2018-08-07 16:40:17 +00:00
Agetian
331d173a93 - Fixed Animate Dead.
- Fixed Dance of the Dead description.
- Added a couple related NPE prevention checks.
2018-08-07 19:21:39 +03:00
Michael Kamensky
1038dbbe0d Merge branch 'aminatousaugury' into 'master'
Fixed issues with Aminatou's Augury

See merge request core-developers/forge!845
2018-08-07 08:55:27 +00:00
austinio7116
7ac6bccf9f Fixed issues with Aminatou's Augury 2018-08-07 06:44:34 +01:00
Michael Kamensky
49db080e06 Merge branch 'aminatousaugury' into 'master'
Aminatous Augury

See merge request core-developers/forge!841
2018-08-07 04:10:48 +00:00
Agetian
09bfe089de - Added puzzles PS_M193 and PS_M194. 2018-08-07 07:00:45 +03:00
kms70847
347707f74e Resolves https://git.cardforge.org/core-developers/forge/issues/641.
Updates the card file syntax for Replicate so it uses a colon, just like Kicker, Entwine, etc.
2018-08-06 21:43:18 -04:00
austinio7116
03d66b9ea1 Aminatous Augury 2018-08-06 19:35:18 +01:00
Michael Kamensky
a9ade92946 Merge branch 'master' into 'master'
M19 and C18 Planeswalker/Alt Wincon achievements by Marek.

See merge request core-developers/forge!840
2018-08-06 16:45:46 +00:00
Agetian
3c4b81f2ac - M19 alt wincon achievement (initial commit). 2018-08-06 19:40:27 +03:00
Agetian
5c0e70aa36 - C18 planeswalker achievements (initial commit). 2018-08-06 15:45:17 +03:00
Agetian
d5248e2d26 - M19 planeswalker achievements: initial commit. 2018-08-06 15:43:29 +03:00