Commit Graph

45589 Commits

Author SHA1 Message Date
Northmoc
5b8b5a686b R-S oracle conformance 2020-10-02 14:01:53 -04:00
Northmoc
58997de0b2 N-P oracle conformance 2020-10-02 14:01:52 -04:00
Northmoc
71c6020ef4 I-L oracle conformance 2020-10-02 14:01:52 -04:00
Northmoc
4f1957d3c0 E-H oracle conformance 2020-10-02 14:01:51 -04:00
Northmoc
8c5f5c206b A-D oracle conformance 2020-10-02 14:01:51 -04:00
Northmoc
4dafebcbc2 last tweaks 2020-10-02 14:01:50 -04:00
Northmoc
272bf6450b some more polished 2020-10-02 14:01:50 -04:00
Northmoc
493f90de46 CardFactoryUtil.java - fix CARDNAME substitution in pay alt cost prompts 2020-10-02 14:01:49 -04:00
Northmoc
7e9dcd36e5 remaining B-C polished 2020-10-02 14:01:49 -04:00
Northmoc
a3a938d8f3 baloth_cage_trap.txt updates 2020-10-02 14:01:48 -04:00
Northmoc
b2ad879233 remaining drafts 2020-10-02 14:01:48 -04:00
Northmoc
efe777f3fc S-W all tested 2020-10-02 14:01:47 -04:00
Northmoc
d7910a058f round 1 2020-10-02 14:01:47 -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
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
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