Michael Kamensky
fb16232c9f
Merge branch '1605-6-broken-tests-as-of-10-04-2020' into 'master'
...
Resolve "6 Broken Tests as of 10/04/2020"
Closes #1605
See merge request core-developers/forge!3231
2020-10-05 06:46:22 +00:00
Michael Kamensky
094839c950
Merge branch 'witchs-vengenance' into 'master'
...
Basic Witch's Vengeance AI, some refactoring in ChooseTypeAi.
See merge request core-developers/forge!3230
2020-10-05 06:46:01 +00:00
Hans Mackowiak
1ce1d43e27
Copy Permanent Spell turns into token
2020-10-05 08:12:50 +02:00
Hans Mackowiak
011a5dddeb
CardType: add flag to show when its used incomplete in Animate Effects
2020-10-05 08:07:18 +02:00
Michael Kamensky
9b87a33300
Merge branch 'edition_fixes' into 'master'
...
Various edition token fixes
See merge request core-developers/forge!3227
2020-10-05 05:01:57 +00:00
Michael Kamensky
5af2bbbc81
- Remove unused imports.
2020-10-05 07:32:40 +03:00
Michael Kamensky
3ce3d70c62
- Basic Witch's Vengeance AI, some refactoring in ChooseTypeAi.
2020-10-05 07:30:57 +03:00
swordshine
65ebd5ad59
Merge branch 'contribs' into 'master'
...
new contributors!
See merge request core-developers/forge!3228
2020-10-05 04:12:51 +00:00
Michael Kamensky
7dc92c33c1
Merge branch 'newBranch' into 'master'
...
Various GUI Fixes
See merge request core-developers/forge!3229
2020-10-05 03:33:09 +00:00
Anthony Calosa
58805979c2
removed unused imports
2020-10-05 11:29:15 +08:00
Anthony Calosa
65f0c4dc30
Fix facedown cards ie manifested cards with back side for viewing
2020-10-05 10:45:35 +08:00
Anthony Calosa
961742cecd
Merge remote-tracking branch 'core/master' into newBranch
2020-10-05 06:10:17 +08:00
Anthony Calosa
051c1af1ec
reset zoom altstate when closing the overlay
2020-10-05 06:03:12 +08:00
Anthony Calosa
d478e9c5a1
Various GUI fixes
...
Fix choice list card image display for Modal, Split, Adventure and special case for Aftermath.
Fix cards exiled facedown with backside show their original state when viewing the hidden card.
2020-10-05 05:46:29 +08:00
Northmoc
dfd568bd43
new contributors!
2020-10-04 14:17:11 -04:00
paul_snoops
8ea693a69a
Various edition token fixes
2020-10-04 18:53:12 +01:00
Michael Kamensky
5536f3c33a
Merge branch 'questMode_wildOpponents' into 'master'
...
Wild opponents included in the "random duel choice"
See merge request core-developers/forge!3226
2020-10-04 12:44:20 +00:00
Michael Kamensky
29d9afc525
Merge branch 'adding-initial-ZNR-draft-rankings' into 'master'
...
Adding initial Zendikar Rising (ZNR) draft rankings using RankingScraper
See merge request core-developers/forge!3225
2020-10-04 12:42:57 +00:00
pfirpfel
9226fb2dee
Adding initial Zendikar Rising (ZNR) draft rankings using RankingScraper
2020-10-04 12:31:36 +02:00
Michael Kamensky
83d9d0bb2e
Merge branch 'patch-6' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!3214
2020-10-04 04:15:33 +00:00
Michael Kamensky
83a599de7d
Merge branch 'clean-up-gitignore' into 'master'
...
.gitignore: refactor
See merge request core-developers/forge!3210
2020-10-04 04:14:48 +00:00
Michael Kamensky
784455c9df
Merge branch 'cardTypeMimicFixes' into 'master'
...
CardType: sanisfySubtypes each time its changed, moved shareTypeWith functions into CardType
See merge request core-developers/forge!3222
2020-10-04 04:13:32 +00:00
Sol
2c3b56c562
Merge branch 'newBranch' into 'master'
...
[Mobile] Fix Quest Tournament loading
See merge request core-developers/forge!3221
2020-10-04 01:26:40 +00:00
Sol
8957bc5fc4
Merge branch 'manyChoices' into 'master'
...
GUI: make many call getChoices and not order
See merge request core-developers/forge!3217
2020-10-04 01:25:41 +00:00
Sol
3ab86c2053
Merge branch '1592altcosts' into 'master'
...
Updating some cards with alternate costs
Closes #1592
See merge request core-developers/forge!3182
2020-10-04 01:24:12 +00:00
Alessandro Coli
07a6b94d7c
In case wild opponents are enabled and available, the "random opponent"
...
choice use them in the randomization, with a 50% possibility to propose
one of them.
2020-10-03 14:10:24 +02:00
Hans Mackowiak
e281f1e5ec
CardType: sanisfySubtypes each time its changed, moved shareTypeWith functions into CardType
2020-10-03 10:04:10 +02:00
Anthony Calosa
f8fd215442
Merge remote-tracking branch 'core/master' into newBranch
2020-10-03 15:05:54 +08:00
Anthony Calosa
ccc0ac5f78
Fix Quest Tournament loading on Mobile :)
2020-10-03 14:54:23 +08:00
Hans Mackowiak
5854a2ff36
GUI: make many call getChoices and not order
2020-10-03 08:29:57 +02:00
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
