external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,877 Commits 34 Branches 187 Tags
a75b4824e0e994e8fccb2a19ef05de6e9853e7cc
Commit Graph

46877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
6e06625b4c merchant_raiders.txt fix and clean up 2020-11-26 07:37:09 -05:00
Northmoc
453e725a55 typos 2020-11-26 07:37:08 -05:00
Northmoc
d935da6f09 master_of_cruelties.txt proper keyword 2020-11-26 07:37:08 -05:00
Northmoc
8ab0f35310 fix back_for_more.txt 2020-11-26 07:37:07 -05:00
pfirpfel
5b2b0a5b5e Move custom ZNR print sheet out of printsheets.txt into corresponding editions file 2020-11-26 10:59:27 +01:00
pfirpfel
7cf0bce9ee Allow print sheets of the format "<amount> <name>|<setcode>|<art index>" as custom print sheets in edition files. 2020-11-26 10:57:45 +01:00
John
d00af8b294 Update forge-gui/res/editions/Secret Lair Drop Series.txt 2020-11-26 09:40:52 +00:00
Hans Mackowiak
efc5b4bf01 ExploreEffect: add ChangesZoneAll trigger 2020-11-26 09:18:35 +01:00
Northmoc
ae76befe68 Fruitcake Elemental! 2020-11-25 20:40:51 -05:00
Hans Mackowiak
8e19ed337f Merge branch 'sword' into 'master' 
sword_of_truth_and_justice.txt shouldn't target

Closes #1624

See merge request core-developers/forge!3438
 2020-11-26 00:19:30 +00:00
Northmoc
803d167fc5 Season's Beatings! 2020-11-25 16:24:07 -05:00
Northmoc
912b218623 sword_of_truth_and_justice.txt doesn't target 2020-11-25 15:45:07 -05:00
John
5d9005cf9f Update Secret Lair Drop Series.txt 2020-11-25 18:39:03 +00:00
Michael Kamensky
f0bf431c05 Merge branch 'averna' into 'master' 
CMR: multi-Averna fix

See merge request core-developers/forge!3433
 2020-11-25 14:33:49 +00:00
Michael Kamensky
b49620c5aa Merge branch 'ordealSacrificeFix' into 'master' 
TriggerHandler: Sacrifice Trigger use LKI

See merge request core-developers/forge!3435
 2020-11-25 14:33:34 +00:00
Hans Mackowiak
d5e2889696 TriggerHandler: Sacrifice Trigger use LKI 2020-11-25 14:24:00 +01:00
Northmoc
06ec08e2be multi-Averna fix 2020-11-25 08:00:28 -05:00
Anthony Calosa
cd8c1e497b Merge branch 'master' into 'master' 
minor fixes

See merge request core-developers/forge!3432
 2020-11-25 04:39:00 +00:00
Anthony Calosa
07a6f2bba8 Merge remote-tracking branch 'core/master' 2020-11-25 12:30:25 +08:00
Anthony Calosa
3ea38764f5 fix unleash fury cost 2020-11-25 12:27:03 +08:00
Anthony Calosa
55fdc35359 determine if Android device isTablet (simple) 2020-11-25 12:26:43 +08:00
Michael Kamensky
47bef6e2e8 Merge branch 'averna' into 'master' 
CMR: Averna, the Chaos Bloom

See merge request core-developers/forge!3430
 2020-11-25 04:26:20 +00:00
Hans Mackowiak
7217143b36 TriggerHandler: add Exploit to LTB trigger 2020-11-24 21:24:13 +01:00
Michael Kamensky
46c1b00fe7 Merge branch 'xmaxlimit' into 'master' 
add XMaxLimit param to announce

See merge request core-developers/forge!3428
 2020-11-24 04:45:20 +00:00
Northmoc
bbe603f842 scripts 2020-11-23 18:51:45 -05:00
Northmoc
a3908b3edb add XMaxLimit to announce 2020-11-23 18:49:32 -05:00
Northmoc
d274974db1 add Averna Count 2020-11-23 18:48:43 -05:00
Northmoc
c80c000b97 modify Cascade 2020-11-23 18:48:43 -05:00
Northmoc
a8919e2712 Add "ImprintFound" to DigUntilEffect 2020-11-23 18:48:42 -05:00
Northmoc
b26b6fd6d1 card script 2020-11-23 18:48:42 -05:00
Michael Kamensky
833fe18420 Merge branch 'xfixes' into 'master' 
updating appropriate with X in casting cost from X:Targeted$Amount to X:Count$xPaid

Closes #1587

See merge request core-developers/forge!3180
 2020-11-23 18:52:20 +00:00
Northmoc
2406faa44c last 3 in this MR 2020-11-23 13:15:13 -05:00
Northmoc
58a71af528 3 more 2020-11-23 13:15:12 -05:00
Northmoc
2370d24368 through S 2020-11-23 13:15:12 -05:00
Northmoc
5b9aa5295c Cleaning up some more stack desc 2020-11-23 13:15:11 -05:00
Northmoc
b03b58438e tidying is half done 2020-11-23 13:15:11 -05:00
Northmoc
d2c345dd75 last drafts 2020-11-23 13:15:11 -05:00
Northmoc
2238149e73 2 good ones 2020-11-23 13:15:10 -05:00
Northmoc
678a0b1c1f better polish (sac prompts for sac X are weird) 2020-11-23 13:15:10 -05:00
Northmoc
40bf94c2dd drafts 2020-11-23 13:15:09 -05:00
Northmoc
6b6e87015e drafts 2020-11-23 13:15:09 -05:00
Northmoc
61043dcfcf 4 more polished 2020-11-23 13:15:08 -05:00
Northmoc
91633a48ce not checked 2020-11-23 13:15:08 -05:00
Northmoc
d38fa6ef8f 6 clean ones 2020-11-23 13:15:08 -05:00
Northmoc
a5a06c5111 some polished ones 2020-11-23 13:15:07 -05:00
Northmoc
ae54e7ad7d more X:Targeted$Amount cards 2020-11-23 13:15:07 -05:00
Northmoc
7bc4986221 some X fixes 2020-11-23 13:15:06 -05:00
Northmoc
335cda00b7 fix incorrect TargetMin 2020-11-23 13:15:06 -05:00
Anthony Calosa
e4b44988a3 Merge branch 'fix-checkstyle-warning' into 'master' 
Remove unused import causing a checkstyle error

See merge request core-developers/forge!3429
 2020-11-23 12:27:25 +00:00
pfirpfel
98a727acbe Remove unused import causing a checkstyle error 2020-11-23 10:11:49 +01:00