Northmoc
6b1f1536d9
commas in the lists
2020-10-06 15:33:57 -04:00
Michael Kamensky
ea4ed9c1af
Merge branch 'booster-guarantee-special-printsheet-slot' into 'master'
...
Adding BoosterReplaceSlotFromPrintSheet logic, fixing ZNR booster collation
Closes #1600
See merge request core-developers/forge!3236
2020-10-06 18:44:08 +00:00
Michael Kamensky
41b5d86feb
Merge branch 'new_sets_and_fix_sld' into 'master'
...
AJMP, ANB and SLD additions/fixes
See merge request core-developers/forge!3237
2020-10-06 18:43:42 +00:00
paul_snoops
4c5ac6abf5
Added AJMP and ANB (with new card scripts); thank you medusa. Also, merged Secret Lair Promos into Secret Lair Drop Series.
2020-10-06 16:27:33 +01:00
Michael Kamensky
2098984bfa
Merge branch 'lavaburst_whippoorwill' into 'master'
...
Lava Burst! Whippoorwill!
Closes #119 and #76
See merge request core-developers/forge!3224
2020-10-06 14:59:38 +00:00
Tim Mocny
1f29fb7bf3
Lava Burst! Whippoorwill!
2020-10-06 14:59:38 +00:00
pfirpfel
52547345be
Adding ZNR DFC printsheet, changing ZNR booster composition
2020-10-06 15:14:25 +02:00
pfirpfel
51c771848d
Adding BoosterReplaceSlotFromPrintSheet logic
2020-10-06 14:53:28 +02:00
Michael Kamensky
c7cfe62493
Merge branch 'revert-1ce1d43e' into 'master'
...
Revert "Copy Permanent Spell turns into token" (accidental commit)
See merge request core-developers/forge!3235
2020-10-06 07:21:43 +00:00
Michael Kamensky
bcfd25ce6e
Revert "Copy Permanent Spell turns into token"
...
This reverts commit 1ce1d43e27
2020-10-06 07:21:10 +00:00
Michael Kamensky
e715b666f3
Merge branch 'witchs-vengenance' into 'master'
...
Improved AnimateAI for Clan Guildmage
See merge request core-developers/forge!3234
2020-10-06 06:17:53 +00:00
Michael Kamensky
b1080d8e4d
- Improve AnimateAi for Clan Guildmage.
2020-10-06 09:14:56 +03:00
Michael Kamensky
6bddd0a9fb
Merge branch 'newBranch' into 'master'
...
[Android] Increase default cache size
See merge request core-developers/forge!3233
2020-10-06 05:49:02 +00:00
Michael Kamensky
dc05e54099
Merge branch 'martyrdom' into 'master'
...
Martyrdom!
Closes #82
See merge request core-developers/forge!3223
2020-10-06 05:47:04 +00:00
Anthony Calosa
94a6ad25fc
Update progress bar
2020-10-06 12:10:47 +08:00
Sol
6b3ef8d4a1
Update Commander's Arsenal.txt
2020-10-06 03:04:28 +00:00
Anthony Calosa
9e00fcd8d8
[Android] Increase default cache size
...
-Increase the default cache size depending on the device detected RAM (higher end tablets and phones will have greater benefit for having large RAM).
2020-10-06 10:16:50 +08:00
Northmoc
232482b1ca
Enforce "Only you may activate this ability."
2020-10-05 10:05:12 -04:00
Northmoc
83e8afb48c
ReplacementEffect.java add EFFECTSOURCE replacement to Description strings
2020-10-05 10:05:12 -04:00
Northmoc
d0c1b0c9f0
martyrdom.txt
2020-10-05 10:05:11 -04:00
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
