Michael Kamensky
|
a266fd6a6e
|
Merge branch 'return' into 'master'
Support "Return" phrasing in ChangeZoneEffect StackDesc
See merge request core-developers/forge!3245
|
2020-10-07 19:22:51 +00:00 |
|
Michael Kamensky
|
9967a21a00
|
Merge branch 'master' into 'master'
Add some older preconstructed decks
See merge request core-developers/forge!3244
|
2020-10-07 19:22:43 +00:00 |
|
Michael Kamensky
|
9f4f174ee5
|
Merge branch 'statecraft' into 'master'
statecraft.txt repair
See merge request core-developers/forge!3242
|
2020-10-07 19:21:49 +00:00 |
|
Northmoc
|
45e3feb575
|
Support "Return" phrasing in StackDesc
|
2020-10-07 14:35:59 -04:00 |
|
Pux
|
a83f46c06c
|
Add some older preconstructed decks
|
2020-10-07 19:04:10 +02:00 |
|
Northmoc
|
7837e6f003
|
statecraft.txt repair
|
2020-10-07 07:45:28 -04:00 |
|
Michael Kamensky
|
00146ed417
|
Merge branch 'patch-12' into 'master'
Update Secret Lair Drop Series.txt
See merge request core-developers/forge!3241
|
2020-10-07 10:56:31 +00:00 |
|
John
|
272ec2cc21
|
Update Secret Lair Drop Series.txt
|
2020-10-07 09:09:49 +00:00 |
|
Michael Kamensky
|
db45511859
|
Merge branch 'twd' into 'master'
Walking Dead Secret Lair (adding NICKNAME)
See merge request core-developers/forge!3215
|
2020-10-07 04:10:41 +00:00 |
|
Michael Kamensky
|
f4ddb91768
|
Merge branch 'string' into 'master'
ChangeZone stackdesc sb : commas in the target lists
See merge request core-developers/forge!3238
|
2020-10-07 04:09:55 +00:00 |
|
Michael Kamensky
|
bee4aebe53
|
Merge branch 'tidy' into 'master'
Tidying up a few cards
See merge request core-developers/forge!3239
|
2020-10-07 04:09:37 +00:00 |
|
Michael Kamensky
|
c5c6c06305
|
Merge branch 'newBranch' into 'master'
Update Border Colors
See merge request core-developers/forge!3240
|
2020-10-07 04:09:19 +00:00 |
|
Anthony Calosa
|
ad7f4f1fa8
|
Update Border Colors
It should have more consistent colors to the actual texture since the color is taken directly from the texture itself.
|
2020-10-07 07:00:41 +08:00 |
|
Northmoc
|
09cc2282f8
|
firespout.txt tidy
|
2020-10-06 15:43:05 -04:00 |
|
Northmoc
|
164e11fc19
|
path_to_exile.txt tidy
|
2020-10-06 15:43:04 -04:00 |
|
Northmoc
|
e6f754b8e9
|
lucille.txt
|
2020-10-06 15:36:41 -04:00 |
|
Northmoc
|
b0eb98e357
|
5 walker tokens
|
2020-10-06 15:36:40 -04:00 |
|
Northmoc
|
bb185f8456
|
rick -> edition
|
2020-10-06 15:36:40 -04:00 |
|
Northmoc
|
16c5828b13
|
rick_steadfast_leader.txt and NICKNAME ReplacementEffect support
|
2020-10-06 15:36:39 -04:00 |
|
Northmoc
|
be2ac6ff7b
|
walker.txt add newline
|
2020-10-06 15:36:39 -04:00 |
|
Northmoc
|
24eb24d20d
|
more NICKNAME support
|
2020-10-06 15:36:39 -04:00 |
|
Northmoc
|
95c4095c3c
|
daryl_hunter_of_walkers.txt (script by medusa)
|
2020-10-06 15:36:38 -04:00 |
|
Northmoc
|
74e41d84a9
|
glenn_the_voice_of_calm.txt (script by medusa)
|
2020-10-06 15:36:38 -04:00 |
|
Northmoc
|
bf9927a365
|
michonne_ruthless_survivor.txt and token
|
2020-10-06 15:36:37 -04:00 |
|
Northmoc
|
1971aebcc5
|
negan_the_cold_blooded.txt with NICKNAME
|
2020-10-06 15:36:37 -04:00 |
|
Northmoc
|
e3575f6ad5
|
editions update
|
2020-10-06 15:36:32 -04:00 |
|
Northmoc
|
43f1d1a6ac
|
preliminary NICKNAME work
|
2020-10-06 15:34:16 -04:00 |
|
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 |
|