external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,995 Commits 32 Branches 187 Tags
a055c54ff7d63669e4db66184e37aece6439b33d
Commit Graph

41995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
a055c54ff7 Merge branch 'epicSplice' into 'master' 
EffectSource: now they can know about the SpellAbility that did the Effect for Epic

Closes #1101

See merge request core-developers/forge!1981
 2019-07-26 05:47:21 +00:00
Hans Mackowiak
b2fc1844be EffectSource: now they can know about the SpellAbility that did the Effect for Epic 2019-07-26 05:47:21 +00:00
Michael Kamensky
72e5b7dfaa Merge branch 'master' into 'master' 
Don't check Morph Down for playability if the card is already on the battlefield

Closes #1107

See merge request core-developers/forge!1980
 2019-07-26 05:10:02 +00:00
Agetian
553106741c - Don't check Morph Down for playability if the card is already on the battlefield to avoid side effects. 2019-07-26 08:09:20 +03:00
swordshine
ed842b4fd5 Merge branch 'patch' into 'master' 
Update banned list

See merge request core-developers/forge!1979
 2019-07-25 14:51:22 +00:00
swordshine
e5473b4193 Update banned list 2019-07-25 22:50:24 +08:00
swordshine
d2b2ef4114 Merge branch '1108-gargos-triggered-from-pulse-of-murasa' into 'master' 
Resolve "Gargos triggered from Pulse of Murasa"

Closes #1108

See merge request core-developers/forge!1977
 2019-07-25 14:27:57 +00:00
swordshine
7b9ffa7d27 Merge branch 'patch' into 'master' 
Fix two cards

See merge request core-developers/forge!1978
 2019-07-25 14:27:49 +00:00
swordshine
c9c5f8a0da Fix two cards 2019-07-25 22:27:24 +08:00
Hans Mackowiak
0dbd45edb2 Gargos, Vicious Watcher: fix Target Trigger 2019-07-25 08:39:38 +00:00
Sol
12519605d6 Merge branch 'playCopyCMCFix' into 'master' 
PlayEffect: set CopiedPermanent to fix CMC

See merge request core-developers/forge!1976
 2019-07-25 01:07:50 +00:00
Hans Mackowiak
3368a45455 PlayEffect: set CopiedPermanent to fix CMC 2019-07-25 01:07:50 +00:00
Michael Kamensky
80df2b0275 Merge branch 'add-khans-expanded-cube' into 'master' 
Add Elliot Raff's Khans Expanded Cube (MTGO)

See merge request core-developers/forge!1975
 2019-07-24 10:19:24 +00:00
pfirpfel
b73bd5a46c Add Elliot Raff's Khans Expanded Cube (MTGO) 2019-07-24 12:00:14 +02:00
Michael Kamensky
f7b0a0d9ab Merge branch '1091-vivien-arkbow-ranger-unable-to-complete-plus-ability-with-0-targets' into 'master' 
Resolve "Vivien, Arkbow Ranger unable to complete plus ability with 0 targets"

Closes #1091

See merge request core-developers/forge!1974
 2019-07-24 05:34:29 +00:00
Hans Mackowiak
440f215a14 Resolve "Vivien, Arkbow Ranger unable to complete plus ability with 0 targets" 2019-07-24 05:34:29 +00:00
Michael Kamensky
0a52238816 Merge branch 'typofix2' into 'master' 
Fix typos in the oracle text of various cards

See merge request core-developers/forge!1972
 2019-07-24 04:14:43 +00:00
Michael Kamensky
d19366da46 Merge branch 'workshopNewline' into 'master' 
Cardfiles saved in the workshop should end with a newline

See merge request core-developers/forge!1973
 2019-07-24 04:13:46 +00:00
kms70847
be52002a48 Cardfiles saved in the workshop should end with a newline 2019-07-23 20:51:06 -04:00
kms70847
1db0cd99c2 Fix typos in the oracle text of various cards 2019-07-23 19:46:38 -04:00
Michael Kamensky
222a0ee16e Merge branch 'master' into 'master' 
Added puzzle PS_M202 - Possibility Storm - Magic Core Set 2020 02

See merge request core-developers/forge!1971
 2019-07-23 18:27:06 +00:00
Agetian
64c8edd520 - Added puzzle PS_M202. 2019-07-23 21:26:17 +03:00
swordshine
496124cc1f Merge branch 'patch' into 'master' 
Fix two cards

See merge request core-developers/forge!1970
 2019-07-23 11:23:43 +00:00
swordshine
58227bd11b Fix two cards 2019-07-23 19:23:16 +08:00
swordshine
50ee2a78ad Merge branch 'patch' into 'master' 
Add two ELD cards

See merge request core-developers/forge!1969
 2019-07-23 02:57:14 +00:00
swordshine
781423074e Add two ELD cards 2019-07-23 10:56:48 +08:00
Michael Kamensky
7b93cae29b Merge branch 'master' into 'master' 
Somewhat better logic for Risk Factor.

Closes #1105

See merge request core-developers/forge!1968
 2019-07-22 16:51:44 +00:00
Agetian
edbf3801f8 - Somewhat better logic for Risk Factor. 2019-07-22 19:50:56 +03:00
swordshine
2727bcad77 Merge branch 'patch-2' into 'master' 
Chandras Regulator: fix discard CostDesc

See merge request core-developers/forge!1967
 2019-07-22 13:42:20 +00:00
Hans Mackowiak
52aaf8a949 Chandras Regulator: fix discard CostDesc 2019-07-22 13:42:19 +00:00
swordshine
506b03619d Merge branch 'woodlandChampion' into 'master' 
Woodland Champion: add ChangeZoneAll Trigger to Token Effects

See merge request core-developers/forge!1956
 2019-07-22 05:18:49 +00:00
Hans Mackowiak
ef0af2d769 Woodland Champion: add ChangeZoneAll Trigger to Token Effects 2019-07-22 05:18:49 +00:00
Michael Kamensky
f1eb4609b7 Merge branch 'token-viewer-patch-unsets' into 'master' 
Token viewer patch

See merge request core-developers/forge!1960
 2019-07-21 18:37:24 +00:00
Michael Kamensky
71eb80de4d Merge branch 'mps_war' into 'master' 
Add WAR Mythic Edition

See merge request core-developers/forge!1966
 2019-07-21 18:36:32 +00:00
Michael Kamensky
59c37dfdad Merge branch 'patch' into 'master' 
Fix an NPE in getBestPlaneswalkerToDamage (for Chandra, Awakened Inferno)

See merge request core-developers/forge!1964
 2019-07-21 18:36:25 +00:00
swordshine
2c71f574bf Merge branch 'newlinefix' into 'master' 
remove literal "\n" sequences from AbilityDescription and SpellDescriptions,...

See merge request core-developers/forge!1965
 2019-07-21 14:09:04 +00:00
schnautzr
31d17f4d26 War of the Spark Mythic Edition 2019-07-21 08:38:04 -05:00
kms70847
45ed12cddd remove literal "\n" sequences from AbilityDescription and SpellDescriptions, since they don't get rendered anyway 2019-07-21 08:47:52 -04:00
swordshine
13b4fd2600 Fix getBestPlaneswalkerToDamage (new chandra's ultimate has a -X cost, which cannot be handled by the convertAmount method) 2019-07-21 16:26:36 +08:00
swordshine
45a44a8e39 Merge branch 'patch' into 'master' 
Fix Cavalier of Thorns

See merge request core-developers/forge!1963
 2019-07-19 06:24:30 +00:00
swordshine
b695c35ee6 Fix Cavalier of Thorns 2019-07-19 14:24:09 +08:00
swordshine
499cac0ca1 Merge branch 'm20deckgen' into 'master' 
M20 standard deckgen data

See merge request core-developers/forge!1962
 2019-07-19 00:29:31 +00:00
austinio7116
9adf1c72c4 M20 standard deckgen data 
(cherry picked from commit fd3b3a1)
 2019-07-18 22:36:32 +01:00
swordshine
f6869c95fb Merge branch 'patch-2' into 'master' 
Card Patches

See merge request core-developers/forge!1961
 2019-07-18 08:13:59 +00:00
Hans Mackowiak
7f34c835d9 Cavalier of Night: fix ImmediateTrigger TriggerDescription 2019-07-18 07:29:51 +00:00
Hans Mackowiak
51c52c7867 Cavalier of Flame: Damage not optional 2019-07-18 07:28:09 +00:00
Hans Mackowiak
02ddbeaf64 Field of the Dead: fix double trigger on ETB 2019-07-18 07:24:01 +00:00
Rob Schnautz
dd602b933a Delete b_2_2_rogue.txt 2019-07-17 04:40:44 +00:00
schnautzr
d044d1d120 fix rogue token 2019-07-16 23:31:41 -05:00
schnautzr
d006f01afb Fix UST token list, add scripts for the ones that are filling up the logfile with errors. 2019-07-16 22:52:12 -05:00