Michael Kamensky
ed17ef57e1
Merge branch 'newBranch' into 'master'
...
[Mobile] Various Fixes
See merge request core-developers/forge!3220
2020-10-03 06:01:27 +00:00
Michael Kamensky
5223714ebe
Merge branch 'glasspool_types' into 'master'
...
glasspool_mimic_glasspool_shore.txt AddTypes " & " --> ","
See merge request core-developers/forge!3218
2020-10-03 06:01:18 +00:00
Anthony Calosa
4cc2fad8c2
preloading decks works only if preloadextendedart is enabled
2020-10-03 03:40:46 +08:00
Anthony Calosa
e016f92318
generated pixmaps and other textures have this "@" key, so don't dispose them manually and let the removal notification handle it.
2020-10-03 03:33:39 +08:00
Anthony Calosa
3fc644f8d8
Update.. revert buttons, only dispose textures if going to homescreen
2020-10-03 03:30:49 +08:00
Anthony Calosa
dd37e8995b
Various fixes for Mobile
...
Optimize ImageFetcher and ImageCache on fetching and disposing textures.
Fix Quest Tournament crash when using a theme without sprite avatars.
Fix NPE on HDButtons.
2020-10-03 02:27:21 +08:00
Northmoc
69d5d9dd73
T-end oracle conformance
2020-10-02 14:01:53 -04:00
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
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
