Agetian
6a9b2b832b
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2018-12-09 12:52:29 +03:00
Michael Kamensky
f0e739889b
Merge branch 'add-mobile-art-download' into 'master'
...
Add option to download missing card art on the fly
See merge request core-developers/forge!1161
2018-12-09 09:51:41 +00:00
Meerkov
5a32588f26
Removing suspicious check (untested).
2018-12-09 08:19:43 +00:00
Agetian
1fa78e2244
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2018-12-09 10:57:00 +03:00
Blacksmith
2e36bc862d
Clear out release files in preparation for next release
2018-12-09 06:56:52 +00:00
Agetian
abe1ab26e3
- Preparing Forge for Android publish v1.6.19.001 [incremental].
2018-12-09 09:56:16 +03:00
Blacksmith
e8c581b402
[maven-release-plugin] prepare for next development iteration
2018-12-09 06:52:11 +00:00
Blacksmith
a990b9ff69
[maven-release-plugin] prepare release forge-1.6.19
2018-12-09 06:52:07 +00:00
Blacksmith
b5340eade5
Update README.txt for release
2018-12-09 06:49:35 +00:00
Michael Kamensky
00b02670d5
Merge branch 'master' into 'master'
...
Factor in the original chance boost for granting haste to creatures in PumpAI.
See merge request core-developers/forge!1194
2018-12-08 17:29:46 +00:00
Agetian
4696316706
- Factor in the original chance boost for granting haste to creatures.
2018-12-08 20:29:09 +03:00
Michael Kamensky
5a0c1af7ef
Merge branch 'master' into 'master'
...
AI shouldn't grant Haste to creatures which won't attack this turn anyway.
See merge request core-developers/forge!1193
2018-12-08 17:25:43 +00:00
Agetian
879caa8933
- AI shouldn't grant Haste to creatures which won't attack this turn anyway.
2018-12-08 20:25:03 +03:00
Michael Kamensky
45d1890bef
Merge branch 'master' into 'master'
...
Fixed Liliana, Untouched by Death.
See merge request core-developers/forge!1192
2018-12-08 16:43:01 +00:00
Agetian
b6f6ee1098
- Fixed Liliana, Untouched by Death.
2018-12-08 19:41:09 +03:00
Michael Kamensky
fb6673dc12
Fix Myr Welder + Ornate Kanzashi.
...
Closes #776
2018-12-08 08:07:39 +00:00
Agetian
65021e7f9b
- ForgetImprinted on DB Pump.
2018-12-08 10:57:45 +03:00
Agetian
54ced3332c
- Revert an accidental merge update.
2018-12-08 10:53:58 +03:00
Agetian
8f41c55543
Merge remote-tracking branch 'origin/welder-myr' into welder-myr
2018-12-08 10:52:32 +03:00
Agetian
1bd38f91aa
- Fix the trigger.
2018-12-08 10:52:04 +03:00
Agetian
e10f90cf49
- Fix Myr Welder + Ornate Kanzashi, make Myr Welder use the Imprint mechanism.
2018-12-08 10:51:35 +03:00
Agetian
5143505bd4
- Set the original host on subabilities and additional abilities, fixes a crash with Myr Welder + Ornate Kanzashi.
2018-12-08 10:51:35 +03:00
Agetian
357f84882c
- Fix the trigger.
2018-12-08 10:50:49 +03:00
Agetian
30ca71dbd2
Merge remote-tracking branch 'origin/welder-myr' into welder-myr
...
# Conflicts:
# forge-ai/src/main/java/forge/ai/ability/MillAi.java
2018-12-08 10:47:40 +03:00
Agetian
e96f581984
- Fix Myr Welder + Ornate Kanzashi, make Myr Welder use the Imprint mechanism.
2018-12-08 10:46:55 +03:00
Agetian
087b884412
- Set the original host on subabilities and additional abilities, fixes a crash with Myr Welder + Ornate Kanzashi.
2018-12-08 10:46:55 +03:00
Michael Kamensky
606591ec03
Merge branch 'master' into 'master'
...
- Fix Liliana, Untouched by Death Mill ability for the AI.
See merge request core-developers/forge!1191
2018-12-08 07:46:16 +00:00
Agetian
7c584d5df7
- Fix Liliana, Untouched by Death Mill ability for the AI.
2018-12-08 10:45:13 +03:00
Agetian
4cf5159d2c
- Fix Liliana, Untouched by Death Mill ability for the AI.
2018-12-08 10:41:46 +03:00
Agetian
3f4c3d2945
- Fix Myr Welder + Ornate Kanzashi, make Myr Welder use the Imprint mechanism.
2018-12-08 10:36:18 +03:00
Agetian
129f6ddc75
- Set the original host on subabilities and additional abilities, fixes a crash with Myr Welder + Ornate Kanzashi.
2018-12-08 10:31:27 +03:00
Michael Kamensky
620017e0b5
Merge branch 'master' into 'master'
...
Tweaked a Planar Conquest deck.
See merge request core-developers/forge!1189
2018-12-08 07:30:24 +00:00
Agetian
d3c81779ab
- Tweaked a Planar Conquest deck.
2018-12-08 10:29:53 +03:00
Michael Kamensky
aaf771e991
Merge branch 'ai-tapcost' into 'master'
...
Experimental: Fixed the AI cheating by tapping a mana source artifact both for mana and for the tap cost when paying for Zahid
See merge request core-developers/forge!1187
2018-12-08 05:32:47 +00:00
Michael Kamensky
66f9ab1a27
Merge branch 'venerated-loxodon-fix' into 'master'
...
Attempting to fix Venerated Loxodon not giving counters to creatures that helped convoke it.
Closes #774
See merge request core-developers/forge!1174
2018-12-08 05:25:49 +00:00
Agetian
2f35377b8a
- Better name for the payment preference spec.
2018-12-08 08:25:07 +03:00
Agetian
171c8e8d7f
- Fixed the AI cheating by tapping a mana source artifact both for mana and for the tap cost when paying the alternate cost for Zahid, Djinn of the Lamp.
...
- Will likely need a more generic solution which would work for other potential similar costs, including the ones which may come from other cards.
2018-12-07 10:04:06 +03:00
Michael Kamensky
bccaf14220
Merge branch 'master' into 'master'
...
Added MTGO Core Cube 2018 submitted by dolphi5.
See merge request core-developers/forge!1186
2018-12-06 19:19:53 +00:00
Agetian
ea34b4dd7b
- Added MTGO Core Cube 2018 submitted by dolphi5.
2018-12-06 22:19:14 +03:00
Michael Kamensky
e99b5cbde4
Merge branch 'tempest-world' into 'master'
...
Tempest world (original world by Seravy, fully tested and with improved AI support for the cards in duel decks)
See merge request core-developers/forge!1185
2018-12-06 18:01:55 +00:00
Agetian
718732c7f0
- Updating CHANGES.TXT: Ultimate Masters.
2018-12-06 21:00:08 +03:00
Agetian
463cc7675a
- Updating CHANGES.txt.
2018-12-06 20:53:54 +03:00
Agetian
788dfbcb38
- Fix deck descriptions.
2018-12-06 20:48:26 +03:00
Agetian
83c345231b
Merge branch 'TempestWorld' of git.cardforge.org:Seravy/forge into tempest-world
2018-12-06 20:46:23 +03:00
Michael Kamensky
c34f6366e0
Merge branch 'master' into 'master'
...
Ultimate Masters booster definition
See merge request core-developers/forge!1184
2018-12-06 17:14:29 +00:00
Agetian
6b7088e04c
- Added AI spec to Skilled Animator.
2018-12-06 20:11:40 +03:00
Agetian
c8fc73e471
- Adding booster definition to Ultimate Masters, enabling it for drafting.
2018-12-06 20:11:18 +03:00
Agetian
cfb63b7483
Merge remote-tracking branch 'origin/venerated-loxodon-fix' into venerated-loxodon-fix
...
# Conflicts:
# forge-game/src/main/java/forge/game/cost/CostAdjustment.java
2018-12-06 17:29:31 +03:00
Agetian
74c7dd0305
- Tweaked the comment.
2018-12-06 17:28:13 +03:00
Agetian
9cbada32aa
-
2018-12-06 10:23:12 +03:00
