external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,404 Commits 33 Branches 187 Tags
f1f96557c2a08d30a84a68f9bd731c94b0fc715c
Commit Graph

38404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
3138c7b3c4 Merge branch 'effectOnlyPirDoubling' into 'master' 
ReplaceEffect: make Pir work with Doubling Season

Closes #609

See merge request core-developers/forge!730
 2018-07-06 05:56:12 +00:00
Michael Kamensky
84e854dc39 Merge branch 'master' into 'master' 
Fix up and merge M19 patches by T.J.Tillman

See merge request core-developers/forge!731
 2018-07-06 05:53:30 +00:00
Agetian
40c592aad4 - Fixed Demanding Dragon. 
- Removed an empty line in Abnormal Endurance.
 2018-07-06 08:51:09 +03:00
Hanmac
f8b0d027d7 ReplaceEffect: make Pir work with Doubling Season 2018-07-06 07:24:56 +02:00
Hanmac
3d90acdfa4 SetStateAi: cleanup 2018-07-06 07:11:50 +02:00
tjtillmancoag
850850bc29 Several fixes for M19 cards 
-A random one of the ten Dual taplands will show up in basic land slot 5 out of 12 times and will no longer occure in the common slot
-Abnormal Endurance mana cost and functionality fixed
-Demanding Dragon - CPU would always choose to take the damage instead of sac a creature even if lethal. Reversed the trigger to sac a creature "unless" they take the damage, which seems to fix the AI taking lethal damage
-Herald of Faith - P/T fixed
-Heroic Reinforcements - Mana cost fixed
-Patient Rebuilding - Was drawing a card for every land ever milled by it, rather than just out of the 3 this turn, fixed that.
-Plague Mare - Added P/T
-Rhox Oracel - Added "Creature" to type
-Vampire Sovereign - Corrected it's trigger to target opponent rather than target player
 2018-07-05 21:39:06 -07:00
Hanmac
d2e02453d8 SetState: nonPerm can't turn faceup, also canTransform check 2018-07-05 22:50:37 +02:00
Michael Kamensky
7675fec424 Merge branch 'm19finalfew' into 'master' 
Fixed a few more M19 script errors

See merge request core-developers/forge!727
 2018-07-05 18:15:38 +00:00
austinio7116
db6737b157 Added missing Fell Spectre P/T 2018-07-05 16:58:20 +01:00
austinio7116
90897eccd3 Fix triggerzones on Sai 2018-07-05 16:06:57 +01:00
austinio7116
2dca199f32 Merge branch 'master' into 'master' 
Fixed Ajani's Last Stand (AI crash).

Closes #608

See merge request core-developers/forge!726
 2018-07-05 15:02:50 +00:00
Michael Kamensky
e63ea63cc5 - Added trigger zone spec (2). 2018-07-05 15:53:18 +03:00
Michael Kamensky
cad0fa589b - Added trigger zone spec. 2018-07-05 14:14:22 +03:00
Michael Kamensky
2072d960c8 - Better solution for Ajani's Last Stand. 2018-07-05 14:12:34 +03:00
Michael Kamensky
2d631fce66 - Fixed Ajani's Last Stand. 2018-07-05 13:38:16 +03:00
Sol
cddcce8cbf Merge branch 'm19finalfew' into 'master' 
Corrected Vampire Sovereign ChangeZone to only trigger on self

See merge request core-developers/forge!725
 2018-07-04 23:57:42 +00:00
austinio7116
d39df3d883 Corrected Vampire Sovereign ChangeZone to only trigger on self 2018-07-04 22:31:27 +01:00
Michael Kamensky
90e5806813 Merge branch 'm19finalfew' into 'master' 
Fixed Dwindle destroy trigger

See merge request core-developers/forge!724
 2018-07-04 17:47:43 +00:00
austinio7116
de458b2779 Fixed Dwindle destroy trigger 2018-07-04 18:31:10 +01:00
Michael Kamensky
ff6486ae59 Merge branch 'master' into 'master' 
Fixed Lich's Caress.

See merge request core-developers/forge!723
 2018-07-04 08:21:38 +00:00
Michael Kamensky
20607547df - Fixed Lich's Caress. 2018-07-04 11:20:57 +03:00
Michael Kamensky
661f297bd5 Merge branch 'm19finalfew' into 'master' 
Added final missing M19 cards - corrected the name of Isareth the Awakener

See merge request core-developers/forge!722
 2018-07-04 08:19:19 +00:00
austinio7116
90ac2f56d8 Fixed doublecast cost 2018-07-04 07:02:39 +01:00
austinio7116
3eb4b933a7 Tezzeret's Strider 2018-07-04 07:02:09 +01:00
austinio7116
d5666fcbd0 Silverbeak Griffin 2018-07-04 06:58:12 +01:00
austinio7116
9561e71299 Court Cleric 2018-07-04 06:56:25 +01:00
austinio7116
55f4d705b0 Corrected the name of Isareth the Awakener 2018-07-04 06:36:30 +01:00
Hanmac
246e3e2bef updated Bolas flip walker 2018-07-04 07:22:55 +02:00
Hanmac
2ba61df85b cards: update flip walker 2018-07-04 07:21:21 +02:00
Hanmac
30be1aab32 Planeswalker: get BaseLoyalty from state, remove damage redirect 2018-07-04 07:21:21 +02:00
Michael Kamensky
865dbbf17a Merge branch 'm19_missing_red' into 'master' 
Add Vaevictis Asmadi, the Dire

See merge request core-developers/forge!720
 2018-07-04 04:39:12 +00:00
Michael Kamensky
fa5c799905 Merge branch 'master' into 'master' 
Fixed Stitcher's Supplier crashing the game, removed unfinished Tezzeret, Cruel Machinist (in separate WIP MR, crashes the game upstream)

See merge request core-developers/forge!721
 2018-07-04 04:33:59 +00:00
Agetian
dc094bad11 - Fixed Stitcher's Supplier crashing the game. 
- Removed Tezzeret, Cruel Machinist (no code support for EnterFaceDownAs upstream yet, in separate WIP MR)
 2018-07-04 07:32:53 +03:00
Sol
0cc7d20b0b Merge branch 'm19fixes2' into 'master' 
Removed UST card added by mistake

See merge request core-developers/forge!719
 2018-07-04 02:53:47 +00:00
Sol
527e775952 Merge branch 'finalpromos' into 'master' 
Final M19 black planeswalker deck cards

See merge request core-developers/forge!718
 2018-07-04 02:53:32 +00:00
Sol
43dc22c766 Merge branch 'finalm19cards' into 'master' 
PW Deck Cards plus Cryptix Black scripts

See merge request core-developers/forge!711
 2018-07-04 02:53:08 +00:00
Chris H
92dca74763 Add Vaevictis Asmadi, the Dire 2018-07-03 22:44:54 -04:00
austinio7116
9738d0e549 Removed UST card added by mistake 2018-07-04 00:15:23 +01:00
maustin
3ed6695f28 Merge branch 'master' into finalm19cards 
# Conflicts:
#	forge-gui/res/cardsfolder/s/sarkhans_dragonfire.txt
 2018-07-03 22:14:56 +01:00
austinio7116
bbbb10e846 Merge branch 'schnautzcards' into 'master' 
Added Schnautzr's promo cards from M19

See merge request core-developers/forge!717
 2018-07-03 19:51:46 +00:00
austinio7116
6586d30961 Liliana, the Necromancer 2018-07-03 20:49:19 +01:00
austinio7116
4a86179c1b Arisen Gorgon 2018-07-03 20:26:37 +01:00
austinio7116
dbae78d2f9 Gravewaker 2018-07-03 20:16:38 +01:00
schnautzr
341bdaaf44 Added Schnautzr's promo cards from M19 2018-07-03 19:57:35 +01:00
austinio7116
0f36ae74ad Fixed Isareth the awakener name 2018-07-03 19:36:25 +01:00
austinio7116
e3abd8fb01 Corrected spelling in Demon of Catastrophe's Type 2018-07-03 19:29:02 +01:00
Michael Kamensky
bba0ba7f19 Merge branch 'master' into 'master' 
Fixed Leonin Warleader trigger description.

See merge request core-developers/forge!716
 2018-07-03 17:51:36 +00:00
Agetian
3a7efd879f - Fixed Leonin Warleader trigger description. 2018-07-03 20:50:38 +03:00
Michael Kamensky
33e3fe12e8 Merge branch 'puzzle-engine' into 'master' 
PS_KTKT: Added set defs to basic lands.

See merge request core-developers/forge!715
 2018-07-03 16:55:37 +00:00
Agetian
f12c185b18 - PS_KTKT: Added set defs to basic lands. 2018-07-03 19:55:12 +03:00