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
40,640 Commits 33 Branches 187 Tags
d36651a779e001d9b68b51a45fb598c8161952a3
Commit Graph

40640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Schnautz
da93a734fb back matter, premium cards 2019-03-24 19:31:12 +00:00
Rob Schnautz
25042c9814 Back matter, premium cards 2019-03-24 18:20:02 +00:00
Rob Schnautz
a239dbfc01 More deck descriptions. 2019-03-24 17:24:53 +00:00
Rob Schnautz
1b1502af0d Merge branch 'master' into 'deck-descriptions' 
Update from master

See merge request core-developers/forge!1482
 2019-03-24 17:04:55 +00:00
Rob Schnautz
6ca034eab9 React to removal of Spike Weaver by using the effect if it's already planning to do later 
Don't leave blockers if planning to use fog effect, except the card that will do so. (might need to tap to use it, or might get killed if attacking)
 2019-03-24 17:04:53 +00:00
Hans Mackowiak
99456c7bbb Merge branch 'patch-2' into 'master' 
Fix download URL for Afterlife spirit token images.

See merge request core-developers/forge!1481
 2019-03-24 16:57:08 +00:00
Rob Schnautz
c0d87aecaa author @Hanmac Fix download URL for Afterlife spirit token images. 2019-03-24 16:53:42 +00:00
Michael Kamensky
1d691a5342 Merge branch 'patch-1' into 'master' 
Quest pet tokens don't have editions.

See merge request core-developers/forge!1480
 2019-03-24 04:07:21 +00:00
Sol
de719b9aa5 There's no such thing as "file1_set" its either "file_set" or "file2_set" 2019-03-24 01:43:16 +00:00
Sol
190a56181e Quest pet tokens don't have editions. 2019-03-24 00:55:24 +00:00
Adam Pantel
ae772e99a7 Enchant fix 2019-03-23 14:35:00 -04:00
Michael Kamensky
e13ddd9666 Merge branch 'master' into 'master' 
Added puzzle PS_RNA8 (Possibility Storm - Ravnica Allegiance 08)

See merge request core-developers/forge!1476
 2019-03-23 09:52:39 +00:00
Agetian
7890420fb0 - Added puzzle PS_RNA8. 2019-03-23 12:51:38 +03:00
Sol
8d056be356 Merge branch 'patch-1' into 'master' 
Set default art index to 1 for tokens

See merge request core-developers/forge!1475
 2019-03-22 15:00:21 +00:00
Sol
b594cf2324 Set default art index to 1 for tokens 2019-03-22 15:00:21 +00:00
Michael Kamensky
f048b04c2b Merge branch 'patch-1' into 'master' 
Update beckon_apparition.txt

See merge request core-developers/forge!1474
 2019-03-22 04:27:50 +00:00
Michael Kamensky
fd1e8c1e7e Merge branch 'token-multiple-art' into 'master' 
Allow multiple art for tokens based on edition files

See merge request core-developers/forge!1473
 2019-03-22 04:27:45 +00:00
Sol
af0d4b0c48 Update beckon_apparition.txt 2019-03-22 03:08:29 +00:00
Chris H
dc917643b5 Allow multiple art for tokens based on edition files 2019-03-21 20:58:46 -04:00
Sol
6f90d27f38 Merge branch '916-more-tokenscript-problems' into 'master' 
Resolve "More tokenscript problems"

Closes #916

See merge request core-developers/forge!1472
 2019-03-21 02:50:14 +00:00
Hanmac
80851d515a TokenScript: more fixes 2019-03-20 21:17:32 +01:00
Michael Kamensky
6dfca97bbb Merge branch '915-missing-tokenscript-r_1_1_elemental' into 'master' 
Resolve "Missing tokenscript: r_1_1_elemental"

Closes #915

See merge request core-developers/forge!1471
 2019-03-20 13:54:06 +00:00
Hans Mackowiak
2a10750fdb Add new file 2019-03-20 13:38:43 +00:00
Michael Kamensky
a1976653f8 Merge branch 'master' into 'master' 
Replace RemRandomDeck with the new format.

See merge request core-developers/forge!1470
 2019-03-20 12:20:50 +00:00
Agetian
3e2fa43abe - Replace RemRandomDeck with the new format. 2019-03-20 15:20:14 +03:00
Michael Kamensky
e3ae076ab7 Merge branch 'master' into 'master' 
Fix Saheeli crashing the AI.

See merge request core-developers/forge!1469
 2019-03-20 12:15:24 +00:00
Agetian
64e09020bd - Fix Saheeli crashing the AI. 2019-03-20 15:14:36 +03:00
Sol
cd033aa896 Merge branch '908-mindbreak-trap-exiles-itself' into 'master' 
Resolve "Mindbreak Trap Exiles itself"

Closes #908

See merge request core-developers/forge!1467
 2019-03-20 12:02:21 +00:00
Hans Mackowiak
0e2222f97c Merge branch 'patch-1' into 'master' 
Update gold.txt

Closes #913

See merge request core-developers/forge!1468
 2019-03-20 05:33:53 +00:00
Sol
7629144be1 Update gold.txt 2019-03-20 01:11:02 +00:00
Hanmac
dece031e13 SpellAbilityEffect: fix getCards when only spell is targeted 2019-03-19 08:23:09 +01:00
swordshine
611813c141 Merge branch 'patch-2' into 'master' 
Update monastery_mentor.txt

Closes #912

See merge request core-developers/forge!1466
 2019-03-19 03:58:57 +00:00
Sol
fdc9aea650 Update monastery_mentor.txt 2019-03-19 02:41:39 +00:00
Sol
ccba38d944 Merge branch 'master' into 'master' 
Fix to have "old edition images" of the "Elves vs Goblins" duel deck searched in the right folder "DD1" and not "EVG" (which is for the Anthology edition version of the same duel deck)

See merge request core-developers/forge!1465
 2019-03-18 12:44:27 +00:00
Sol
def94171af Merge branch 'token_missing' into 'master' 
Token: add missing TokenScript

See merge request core-developers/forge!1464
 2019-03-17 23:08:12 +00:00
Hans Mackowiak
33e172ec37 Token: add missing TokenScript 2019-03-17 23:08:12 +00:00
Alessandro Coli
4f20cc638d Fix to have "old edition images" of this duel deck searched in the 
folder "DD1", differently from the "anthology edition images" which are
searched into folder "EVG".

Without this fix, both image sets are searched into the same folder
"EVG".
 2019-03-17 12:07:01 +01:00
Hans Mackowiak
93873d9984 Merge branch 'patch-2' into 'master' 
Update c_1_1_eldrazi_scion_sac.txt

See merge request core-developers/forge!1463
 2019-03-16 19:06:23 +00:00
Sol
e99e389221 Update c_1_1_eldrazi_scion_sac.txt 2019-03-16 18:29:33 +00:00
Sol
cc1f9763a7 Merge branch 'tokenscript_pt' into 'master' 
TokenInfo: add TokenPower & TokenToughness into token script

See merge request core-developers/forge!1462
 2019-03-16 18:26:47 +00:00
Hans Mackowiak
255a07fa2e TokenInfo: add TokenPower & TokenToughness into token script 2019-03-16 18:26:47 +00:00
Sol
b23b12ba66 Merge branch 'token-work' into 'master' 
Token work

See merge request core-developers/forge!1263
 2019-03-16 13:52:26 +00:00
Michael Kamensky
7ff9329b56 Merge branch 'master' into 'master' 
Land sounds whenever they enter the battlefield - not only if they are played by hand

See merge request core-developers/forge!1459
 2019-03-16 11:35:06 +00:00
Michael Kamensky
76e0d3d62f Merge branch 'patch-2' into 'master' 
Update mesmerizing_benthid.txt

See merge request core-developers/forge!1461
 2019-03-16 11:25:30 +00:00
Hans Mackowiak
888ad500a0 Update mesmerizing_benthid.txt 2019-03-16 11:25:30 +00:00
Michael Kamensky
4f11fdc54f Merge branch 'limit-tap-own-turn-ai' into 'master' 
Be more conservative when AI uses Tap Effects

See merge request core-developers/forge!1460
 2019-03-16 05:30:28 +00:00
Chris H
6e9c35a978 Be more conservative when AI uses Tap Effects 2019-03-15 23:29:30 -04:00
Alessandro Coli
f4b31082b8 Land sounds when land cards enter battlefield - even if they are not 
played by hand
 2019-03-15 20:34:22 +01:00
Alessandro Coli
9be9abbdae Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-03-15 20:18:45 +01:00
swordshine
3b059f9879 Merge branch 'patch-2' into 'master' 
Some Card patches

See merge request core-developers/forge!1458
 2019-03-15 11:28:53 +00:00