Michael Kamensky
2e8ee84485
Merge branch 'tokeninfo-color-fix' into 'master'
...
Fixed token color information processing which is critical for Puzzle Mode
See merge request core-developers/forge!548
2018-05-11 17:33:35 +00:00
Hans Mackowiak
fb1c545a98
Merge branch 'hasKeywordEnum' into 'master'
...
Card: add Keyword methods that work with Keyword Enum
See merge request core-developers/forge!535
2018-05-11 11:34:15 +00:00
Michael Kamensky
0a03261dbb
Merge branch 'patch-5' into 'master'
...
Update crumble_to_dust.txt
See merge request core-developers/forge!550
2018-05-11 06:49:18 +00:00
Meerkov
1c3fc52b6a
Update crumble_to_dust.txt
2018-05-11 05:52:17 +00:00
Agetian
b091b892e9
- Code simplification.
2018-05-10 22:08:14 +03:00
Agetian
74e84dc381
Merge remote-tracking branch 'origin/tokeninfo-color-fix' into tokeninfo-color-fix
2018-05-10 21:42:25 +03:00
Agetian
1d4d18566c
- Fixed token color information processing which is critical for game states and Puzzle Mode (otherwise all tokens are colorless).
2018-05-10 21:42:11 +03:00
Agetian
4c083a127f
Merge remote-tracking branch 'origin/tokeninfo-color-fix' into tokeninfo-color-fix
2018-05-10 21:38:07 +03:00
Sol
1df11a1f81
Merge branch 'assorted-fixes' into 'master'
...
Fixed slowdown when removing a card from the deck in Constructed deck editor with infinite catalog cardpool
See merge request core-developers/forge!545
2018-05-10 18:33:44 +00:00
Agetian
41698bfddd
- Fixed token color information processing which is critical for game states and Puzzle Mode (otherwise all tokens are colorless).
2018-05-10 21:26:37 +03:00
Agetian
39d143cebc
- Fixed token color information processing which is critical for game states and Puzzle Mode (otherwise all tokens are colorless).
2018-05-10 21:19:56 +03:00
Michael Kamensky
4576bb28ac
Merge branch 'dom-puzzles' into 'master'
...
Possibility Storm Dominaria season: Added puzzle PS_DOM2.
See merge request core-developers/forge!547
2018-05-10 17:56:57 +00:00
Agetian
998efa11e3
- Added puzzle PS_DOM2.
2018-05-10 20:55:11 +03:00
Michael Kamensky
66870cdd05
Merge branch 'master' into 'master'
...
Battlebond dual lands
See merge request core-developers/forge!546
2018-05-10 17:06:20 +00:00
swordshine
42ead5b9eb
- Battlebond dual lands
2018-05-10 22:07:51 +08:00
Hanmac
852e12c903
AI: fixed isCounterable canPayCost
2018-05-10 15:44:23 +02:00
Hanmac
058aabb666
KeywordEnum: replace more String Keywords checks with Enums
2018-05-10 11:53:41 +02:00
schnautzr
34ee393224
Finalize historic formats through Urza block.
2018-05-09 21:30:06 -05:00
Agetian
816660f80d
- To avoid possibly unexpected behavior, check to ensure that the infinite pool already contains all the items requested.
2018-05-09 18:27:00 +03:00
Agetian
1e1a16a4f4
- Do not go through the process of adding items to a card pool if it's already infinite (fixes slowdown when removing a card from the deck in the Constructed deck editor)
2018-05-09 18:23:25 +03:00
Michael Kamensky
bf2eed7cf5
Merge branch 'master' into 'master'
...
Tetzimoc CountersPutAi: don't try to target creatures with Hexproof
See merge request core-developers/forge!544
2018-05-09 12:13:01 +00:00
Agetian
d13201fd47
- Tetzimoc CountersPutAi: don't try to target creatures which can't legally be targeted (e.g. Hexproof).
2018-05-09 15:12:30 +03:00
Michael Kamensky
5debe17b08
Merge branch 'master' into 'master'
...
Updating CHANGES.txt and planes.txt for the new Planar Conquest plane.
See merge request core-developers/forge!543
2018-05-09 07:04:52 +00:00
Agetian
aa34d92668
- Updating CHANGES.txt and planes.txt for the new Planar Conquest plane.
2018-05-09 10:03:59 +03:00
Michael Kamensky
279ff2c765
Merge branch 'ixalanplanarconquest' into 'master'
...
Ixalan planar conquest with AI generated/optimized duel opponents
See merge request core-developers/forge!542
2018-05-09 07:00:25 +00:00
austinio7116
1ebb4aa091
Ixalan planar conquest with AI generated/optimized duel opponents
2018-05-08 21:25:24 +01:00
Michael Kamensky
176705e703
Merge branch 'master' into 'master'
...
Make Tetzimoc, Primal Death actually AI playable
See merge request core-developers/forge!541
2018-05-08 17:13:21 +00:00
Agetian
82afad3b67
- Improve AI logic for Tetzimoc, Primal Death; ensure that the AI actually plays it (used not to play at all).
2018-05-08 20:11:47 +03:00
Agetian
5d43733add
- Preparing Forge for Android publish 1.6.10.001 [incremental].
2018-05-08 06:51:43 +03:00
schnautzr
e07b34f9cb
Finalize formats through Weatherlight
2018-05-07 20:49:08 -05:00
Blacksmith
a1203b2c4a
Clear out release files in preparation for next release
2018-05-08 00:53:34 +00:00
Blacksmith
f0ce6277ac
[maven-release-plugin] prepare for next development iteration
2018-05-08 00:48:11 +00:00
Blacksmith
95bd867cee
[maven-release-plugin] prepare release forge-1.6.10
2018-05-08 00:48:08 +00:00
Blacksmith
ac63687c33
Update README.txt for release
2018-05-08 00:46:40 +00:00
schnautzr
924e063168
Finalize historic editions through Fifth Edition
2018-05-07 18:09:34 -05:00
Michael Kamensky
8a52feaf6d
Merge branch 'master' into 'master'
...
More NPE prevention in mobile Forge.
See merge request core-developers/forge!540
2018-05-07 20:19:33 +00:00
Agetian
773358e538
- More NPE prevention in mobile Forge.
2018-05-07 23:18:46 +03:00
Michael Kamensky
44fc9be4a2
Merge branch 'master' into 'master'
...
NPE prevention in mobile Forge related to choosing a variant
See merge request core-developers/forge!539
2018-05-07 20:08:50 +00:00
Agetian
697be27d4f
- NPE prevention in LobbyScreen on mobile Forge when trying to choose a variant without having a constructed deck.
2018-05-07 23:07:47 +03:00
Michael Kamensky
fb23e5a663
Merge branch 'master' into 'master'
...
Planar Conquest: allow Chaos matches from custom user worlds.
See merge request core-developers/forge!538
2018-05-07 15:38:56 +00:00
Agetian
12631ffee6
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2018-05-07 18:38:00 +03:00
Agetian
cbce073227
- Planar Conquest: allow Chaos matches from custom user worlds.
2018-05-07 18:37:34 +03:00
Michael Kamensky
4103afc6cf
Merge branch 'fix_ante_corr' into 'master'
...
Merging "Fix ante" by Friarsol (merge conflict resolved)
See merge request core-developers/forge!537
2018-05-07 03:59:55 +00:00
Agetian
c2ddc8cd87
Resolved merge conflict.
2018-05-07 06:57:13 +03:00
Chris H
52a5f3b0a4
Fix ante to work with RegisterdPlayer
2018-05-06 21:42:56 -04:00
Hanmac
91d80f49f4
Card: add Keyword methods that work with Keyword Enum
2018-05-06 16:54:53 +02:00
Michael Kamensky
e0b1bc7cd0
Merge branch 'asFlash' into 'master'
...
Code As through it has flash Effects
See merge request core-developers/forge!532
2018-05-06 08:56:15 +00:00
Hanmac
438d4f6e38
WrappedAbility: add AdditionalAbilityList methods too
2018-05-06 10:29:59 +02:00
Agetian
473fa088ce
- Wrapped abilities should get additional abilities from the underlying SA (fixes MayFlashSac on something like Abattoir Ghoul crashing).
2018-05-06 11:12:09 +03:00
Agetian
e52b9d62f7
- AI should not attempt to cast MayFlashSac auras "as though they had flash" for now, it'll just always cast them in its own Upkeep and end up wasting them.
2018-05-06 11:10:42 +03:00
