external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,160 Commits 33 Branches 187 Tags
cffda2c1a72b309282d71beeb4f74495bf5de24c
Commit Graph

42160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
c76c5e0328 Merge branch 'format-key-fix' into 'master' 
Update forge-gui/res/formats/Historic/DCI/Extended/2013-07-19.txt,...

See merge request core-developers/forge!1959
 2019-07-17 03:37:12 +00:00
Rob Schnautz
505798b635 Update forge-gui/res/formats/Historic/DCI/Extended/2013-07-19.txt, forge-gui/res/formats/Historic/DCI/Extended/2012-07-13.txt, forge-gui/res/formats/Historic/DCI/Vintage/2003-04-01.txt files 2019-07-16 16:43:23 +00:00
Michael Kamensky
c8dc6f5e31 Merge branch 'master' into 'master' 
Added puzzle PS_M201 - Possibility Storm - Core Set 2020 01

See merge request core-developers/forge!1958
 2019-07-16 12:39:01 +00:00
Agetian
a477b0ebc0 - Added puzzle PS_M201. 2019-07-16 15:38:09 +03:00
swordshine
275e08f4f8 Merge branch 'patch-2' into 'master' 
Saheeli, Sublime Artificer: fix clone target

See merge request core-developers/forge!1957
 2019-07-15 07:44:21 +00:00
Hans Mackowiak
2388eba0b2 Saheeli, Sublime Artificer: fix clone target 2019-07-15 07:44:21 +00:00
Michael Kamensky
0dad6068c3 Merge branch 'chorusRework' into 'master' 
Chorus of the Conclave: moved to addExtraKeywordCost

See merge request core-developers/forge!1955
 2019-07-14 17:54:41 +00:00
Hans Mackowiak
af2e2caf24 Chorus of the Conclave: moved to addExtraKeywordCost 2019-07-14 17:54:41 +00:00
swordshine
2992b1cd68 Merge branch '1062-digeffect-with-three-and-or' into 'master' 
Resolve "DigEffect with three and/or"

Closes #1062

See merge request core-developers/forge!1949
 2019-07-14 10:14:45 +00:00
swordshine
209ea120bc Merge branch 'patch-2' into 'master' 
Update Domri's Ambush DamageSource

See merge request core-developers/forge!1954
 2019-07-14 10:14:34 +00:00
Hans Mackowiak
7b7cd089ff Update Domri's Ambush DamageSource 2019-07-14 10:14:34 +00:00
Michael Kamensky
a68eb85280 Merge branch 'master' into 'master' 
Fix 2x DamageDone replacement effect not affecting damage from Emblems

Closes #1097

See merge request core-developers/forge!1953
 2019-07-14 04:11:46 +00:00
Hanmac
4182ad7395 DigEffect: remove AndOrValid 2019-07-14 05:59:04 +02:00
Agetian
2e2911de2c - Fix 2x DamageDone replacement effect not affecting damage from Emblems 2019-07-13 19:17:31 +03:00
Hanmac
4fa0419dd3 DigMultiple: refactor cards using AndOrValid 2019-07-13 14:40:34 +02:00
Michael Kamensky
e7e8293fd2 Merge branch 'master' into 'master' 
Fix AI logic for a couple cards

Closes #1096 and #1095

See merge request core-developers/forge!1952
 2019-07-12 16:10:57 +00:00
Agetian
87b53ed127 - Fix AI logic for Ancient Animus 
- Fix AI logic for Priest of Forgotten Gods
 2019-07-12 19:10:07 +03:00
Agetian
f6ae65d901 - Basic AI support for DigMultipleEffect 
- Reveal fix in DigMultipleEffect
 2019-07-12 19:09:12 +03:00
Agetian
a5c55c85cd - Add Kaalia, Zenith Seeker 
- Add DigMultiple to the effect API enumeration
 2019-07-12 13:55:23 +03:00
swordshine
6e4744baac Merge branch 'patch' into 'master' 
Fix Gideon's Battle Cry

See merge request core-developers/forge!1951
 2019-07-12 01:34:06 +00:00
swordshine
bac67caa87 Fix Gideon's Battle Cry 2019-07-12 09:33:35 +08:00
swordshine
510c7c1af1 Merge branch 'patch' into 'master' 
Fix Blightbeetle

See merge request core-developers/forge!1950
 2019-07-12 01:22:23 +00:00
swordshine
5e831bd8c6 Fix Blightbeetle 2019-07-12 09:21:25 +08:00
Hanmac
371379def8 DigMultipleEffect: new effect for Kaalia 2019-07-11 07:18:42 +02:00
Michael Kamensky
dc6ec874b1 Merge branch 'm20-printsheets' into 'master' 
M20 printsheets

See merge request core-developers/forge!1948
 2019-07-10 03:55:24 +00:00
Sol
cb7b660479 Update printsheets.txt 2019-07-10 00:39:37 +00:00
Sol
604b4ac58c Update Magic 2020.txt 2019-07-10 00:37:15 +00:00
swordshine
0c20b9983c Merge branch 'patch' into 'master' 
Add Woodland Mystic

See merge request core-developers/forge!1947
 2019-07-09 08:08:11 +00:00
swordshine
abf2326d23 Add Woodland Mystic 2019-07-09 16:05:32 +08:00
swordshine
6de03d8f0b Merge branch 'master' into 'master' 
M20 AI hints

See merge request core-developers/forge!1946
 2019-07-09 07:44:45 +00:00
Agetian
e08f34539d - Revert hint on Faerie Miscreant until further investigation. 2019-07-09 08:15:34 +03:00
Agetian
34633ded24 - M20 AI hints 2019-07-09 08:12:14 +03:00
Michael Kamensky
2ec04c1a83 Merge branch 'etbReorder3' into 'master' 
Print all "enters the battlefield" replacement abilities above triggered...

See merge request core-developers/forge!1941
 2019-07-08 09:52:33 +00:00
Michael Kamensky
eeb8b7bc6c Merge branch '1087-splice-onto-sorcery-can-be-done-on-eot-triggers' into 'master' 
Resolve "Splice onto Sorcery can be done on EoT triggers"

Closes #1087

See merge request core-developers/forge!1945
 2019-07-08 09:52:22 +00:00
Michael Kamensky
5c4f2ab8bc Merge branch 'replicateConspire' into 'master' 
Replicate rework

Closes #1068

See merge request core-developers/forge!1929
 2019-07-08 09:52:20 +00:00
Hans Mackowiak
3ca71ccd7b - Basic AI for the revised Replicate and Conspire (will currently mimic the old behavior of paying as much as possible, to be improved) 2019-07-08 09:52:20 +00:00
Hans Mackowiak
cb7ab5b981 AbilityUtils: Splice only for Spells 2019-07-08 07:43:56 +00:00