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
40,620 Commits 33 Branches 187 Tags
9c39d159e9b25dca2b2bc9f5b76fc38718e90d9a
Commit Graph

40620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
9c39d159e9 - Spellskite should grab its magnet target from DefinedMagnet. 2019-03-28 17:34:53 +03:00
Rob Schnautz
51e9e2b692 Merge branch 'patch-1' into 'master' 
Update token-images.txt

See merge request core-developers/forge!1490
 2019-03-27 13:24:54 +00:00
Hans Mackowiak
9447561d53 Update token-images.txt 2019-03-27 13:24:54 +00:00
Michael Kamensky
928f903028 Merge branch 'master' into 'master' 
Added puzzle PS_RNA9 (Possibility Storm - Ravnica Allegiance 09).

See merge request core-developers/forge!1489
 2019-03-27 06:12:42 +00:00
Agetian
bc4826ed77 - Added puzzle PS_RNA9. 2019-03-27 09:11:49 +03:00
Michael Kamensky
88a674240d Merge branch 'tokenscripts' into 'master' 
resolve #926

Closes #926

See merge request core-developers/forge!1488
 2019-03-27 04:02:20 +00:00
Michael Kamensky
1d4b9d68ed Merge branch 'deck-descriptions' into 'master' 
Deck descriptions

See merge request core-developers/forge!1487
 2019-03-27 04:02:08 +00:00
Adam Pantel
c1dfbc04e4 Fix missing type in tokenscripts 2019-03-26 19:22:27 -04:00
Rob Schnautz
fa80df585f Merge branch 'master' into 'deck-descriptions' 2019-03-26 15:33:03 +00:00
Rob Schnautz
2cfbf8df30 back matter 2019-03-26 15:25:45 +00:00
Rob Schnautz
ad6e9acbe1 back matter 2019-03-25 21:44:42 +00:00
Rob Schnautz
3f450e813d back matter 2019-03-25 19:51:29 +00:00
Rob Schnautz
9c62a0e2ab back matter 2019-03-25 19:37:08 +00:00
Rob Schnautz
5dc883e932 back matter 2019-03-25 18:52:34 +00:00
Rob Schnautz
94ab23f09f back matter 2019-03-25 18:46:25 +00:00
Rob Schnautz
286e5721f7 back matter 2019-03-25 18:35:24 +00:00
Rob Schnautz
eb5899ac15 back matter 2019-03-25 18:24:47 +00:00
Rob Schnautz
a1fca42b57 back matter 2019-03-25 17:53:53 +00:00
Rob Schnautz
16314d5ebc Merge branch 'MED-patch' into 'master' 
Mythic Edition patch

See merge request core-developers/forge!1485
 2019-03-25 16:53:08 +00:00
Rob Schnautz
d5fe891440 Fix MCI code and card numbers (MPS points to Kaladesh Inventions) 2019-03-25 16:50:28 +00:00
Rob Schnautz
13d99e209b Fix MCI code (MPS points to Kaladesh Inventions) 2019-03-25 16:48:26 +00:00
Rob Schnautz
9946155c71 Merge branch 'cherry-pick-ff7def5f' into 'master' 
Amonkhet Invocations patch

See merge request core-developers/forge!1484
 2019-03-25 16:43:49 +00:00
Rob Schnautz
6a6ca3f403 Fix MCI code (MPS points to Kaladesh Inventions) 
(cherry picked from commit ff7def5f5afd7a07991caf2549f5fb92f9a85186)
 2019-03-25 16:42:43 +00:00
Michael Kamensky
1c0d95b930 Merge branch 'draft-bugs' into 'master' 
Resolve #921, #922

Closes #921 and #922

See merge request core-developers/forge!1478
 2019-03-25 03:53:44 +00:00
Michael Kamensky
271b940723 Merge branch 'quest-pets-redux' into 'master' 
Always create an empty map for tokenNormalized

See merge request core-developers/forge!1483
 2019-03-25 03:52:52 +00:00
Michael Kamensky
8eecccff0b Merge branch 'aura-corner-case' into 'master' 
resolve #923

Closes #923

See merge request core-developers/forge!1479
 2019-03-25 03:52:43 +00:00
Adam Pantel
18f32a1657 Fix draft duplicates bug 2019-03-24 21:32:48 -04:00
Adam Pantel
5cd5020595 Fix draft bots running conspiracies 2019-03-24 21:32:14 -04:00
Chris H
5aee626661 Always create an empty map for tokenNormalized 2019-03-24 21:00:31 -04:00
Rob Schnautz
f2dae53c11 back matter, premium cards 2019-03-24 19:53:36 +00:00
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