external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,880 Commits 32 Branches 187 Tags
64131f15e56cc7c470764a34e7d3258e987f1dcc
Commit Graph

45880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
4acfc235f1 glasspool_mimic_glasspool_shore.txt AddTypes " & " --> "," 2020-10-02 08:12:46 -04:00
Michael Kamensky
d36920ad86 Merge branch 'kytheon' into 'master' 
kytheon_hero_of_akros.txt

See merge request core-developers/forge!3208
 2020-10-02 04:45:00 +00:00
Michael Kamensky
91067039e6 Merge branch 'embalm_eternalize' into 'master' 
Embalm/Eternalize cleanup

Closes #1602

See merge request core-developers/forge!3212
 2020-10-02 04:44:39 +00:00
Michael Kamensky
a419e37b38 Merge branch 'forsaken' into 'master' 
Forsaken Monument - fix description/oracle

See merge request core-developers/forge!3216
 2020-10-02 04:43:50 +00:00
Northmoc
eeb08ee132 fix description/oracle 2020-10-01 22:32:51 -04:00
Andreas Bendel
1cb499660e Update de-DE.properties 
Four new enties - 'going wild' :)
 2020-10-01 20:27:45 +00:00
Northmoc
24fef19087 Align Embalm/Eternalize reminder text with Oracle 2020-10-01 14:47:52 -04:00
Northmoc
6132700838 finalize token lists 2020-10-01 14:23:39 -04:00
Northmoc
e4e716a162 a bit more support for existing image files 2020-10-01 14:15:30 -04:00
Northmoc
73723a345f support for FTP downloads 2020-10-01 14:14:29 -04:00
Northmoc
2cb07063e2 Add embalm tokens to editions files 2020-10-01 11:48:35 -04:00
Northmoc
408728b9f2 kytheon_hero_of_akros.txt with Counts 2020-10-01 09:47:20 -04:00
Northmoc
8215279d96 kytheon_hero_of_akros.txt 2020-10-01 09:47:20 -04:00
Michael Kamensky
0ec38f8977 Merge branch 'fixes' into 'master' 
A few token-related fixes

See merge request core-developers/forge!3207
 2020-10-01 05:04:13 +00:00
Michael Kamensky
926a809417 Merge branch 'twd' into 'master' 
negan_the_cold_blooded.txt

See merge request core-developers/forge!3213
 2020-10-01 05:03:12 +00:00
Michael Kamensky
b2adfd4a02 Merge branch '1577-znr-charm-effect-tweaks' into 'master' 
Resolve "ZNR: Charm Effect tweaks"

Closes #1562, #1570, and #1577

See merge request core-developers/forge!3197
 2020-10-01 05:02:41 +00:00
Hans Mackowiak
daf70f7e60 Resolve "ZNR: Charm Effect tweaks" 2020-10-01 05:02:41 +00:00
Hans Mackowiak
27b3850c27 Merge branch 'ZNRfixes' into 'master' 
Card patches (ZNR, IKO)

See merge request core-developers/forge!3209
 2020-10-01 04:57:55 +00:00
Tim Mocny
8e7c6711c8 kinnan_bonder_prodigy.txt add ForceReveal to Ability (activator should get to see cards even on whiff) 2020-10-01 04:57:54 +00:00
Hans Mackowiak
e2e15df116 Merge branch 'StoreSVar_Fix' into 'master' 
move Count calculation (xPaid) to AbilityUtils

Closes #1599

See merge request core-developers/forge!3206
 2020-10-01 04:57:13 +00:00
Anthony Calosa
e194f4418e Merge branch 'newBranch' into 'master' 
Fix GenericChoice UI and Add Wild Opponent Quest preference options

Closes #1487

See merge request core-developers/forge!3205
 2020-10-01 02:04:16 +00:00
Northmoc
fd972a9159 negan_the_cold_blooded.txt 2020-09-30 20:36:03 -04:00
Northmoc
93301e5727 move Count calculation (xPaid) to AbilityUtils 2020-09-30 20:01:59 -04:00
Northmoc
da40b47920 Myriad keyword : Tapped$ --> TokenTapped$ 2020-09-30 20:00:46 -04:00
Northmoc
2278d32cac cloud_sprite.txt token remove extra ability 2020-09-30 20:00:45 -04:00
Leandro Doctors
39e89a279d .gitignore: clean up 2020-09-30 19:26:13 -03:00
Anthony Calosa
c7e7498d6b Merge remote-tracking branch 'core/master' into newBranch 2020-10-01 04:29:21 +08:00
Hans Mackowiak
13cd6e3d8c Merge branch 'clean-up-imports' into 'master' 
build: clean up imports (thanks check-style!)

See merge request core-developers/forge!3211
 2020-09-30 19:53:23 +00:00
Leandro Doctors
6f5ebbdc7d build: clean up imports (thanks check-style!) 
Cannot build otherwise...
 2020-09-30 15:58:21 -03:00
Anthony Calosa
645fa3af3b Prioritize FTP images before scryfall 2020-10-01 00:41:46 +08:00
Anthony Calosa
23c00c290e Optimize darkforge theme bg texture for desktop 2020-10-01 00:05:07 +08:00
Anthony Calosa
b00863d827 Fix icons for desktop darkforge theme 2020-09-30 23:44:38 +08:00
Anthony Calosa
5be73af7e9 Fix GenericChoice UI 2020-09-30 21:26:06 +08:00
Anthony Calosa
9d39882728 finalize theme color 2020-09-30 16:40:50 +08:00
Anthony Calosa
6a6b8a3400 remove unnecessary imports 2020-09-30 16:26:43 +08:00
Anthony Calosa
c1ba4344de Add Wild Opponent Quest preference options to mobile 2020-09-30 16:16:47 +08:00
Michael Kamensky
a2c7e83eef Merge branch 'newBranch' into 'master' 
Update darkforge theme

See merge request core-developers/forge!3203
 2020-09-30 05:47:56 +00:00
Michael Kamensky
6b063bda8d Merge branch 'muldrotha' into 'master' 
muldrotha_the_gravetide.txt tweak Affected params

See merge request core-developers/forge!3200
 2020-09-30 05:47:41 +00:00
Michael Kamensky
9b060f1387 Merge branch 'yasharn' into 'master' 
ZNR: Yasharn

See merge request core-developers/forge!3204
 2020-09-30 05:47:08 +00:00
Michael Kamensky
f6c9552c1e Merge branch 'questMode_wildOpponents' into 'master' 
Quest mode wild opponents

See merge request core-developers/forge!3202
 2020-09-30 05:46:47 +00:00
Anthony Calosa
a2d1618973 combat arrow swatches 2020-09-30 13:40:46 +08:00
Anthony Calosa
f6c34834ff update color swatches 2020-09-30 13:27:05 +08:00
Anthony Calosa
a41f6bd36f optimize file size 2020-09-30 11:38:28 +08:00
Anthony Calosa
17de4fea76 update, only need to override the theme colors 2020-09-30 10:29:34 +08:00
Northmoc
0257879b99 yasharn_implacable_earth.txt - keyword support 2020-09-29 18:06:58 -04:00
Northmoc
f325814730 yasharn_implacable_earth.txt and keyword support 2020-09-29 18:05:41 -04:00
Anthony Calosa
625b60d29d Merge remote-tracking branch 'core/master' into newBranch 2020-09-30 03:44:59 +08:00
Anthony Calosa
c576c22a57 update darkforge theme 2020-09-30 03:36:43 +08:00
Michael Kamensky
66b127fb82 Merge branch 'TheList' into 'master' 
Added The List edition file

See merge request core-developers/forge!3201
 2020-09-29 18:42:59 +00:00
Michael Kamensky
5cc6c26430 Merge branch 'newBranch' into 'master' 
[Mobile] Minor Improvement and Fixes

See merge request core-developers/forge!3199
 2020-09-29 18:42:36 +00:00