Matt Oslan
9b1dd2ceeb
Merge origin/master into pull1
2016-09-04 10:36:11 -04:00
fireshoes
16c40d0248
Merge origin/master
2016-09-04 09:13:47 -05:00
fireshoes
5e911ca63c
Updated image sources for upcoming sets.
2016-09-04 09:08:46 -05:00
spjspj
b0d5a9312a
Merge pull request #2225 from spjspj/master
...
spjspj - Implement new token source (mtg.onl) for downloading of
2016-09-04 22:37:07 +10:00
spjspj
fb5087683f
spjspj - Implement new token source (mtg.onl) for downloading of tokens to tokenDescriptor format in TOK.zip
2016-09-04 22:34:43 +10:00
Samuel Sandeen
c58ad022d7
Merge remote-tracking branch 'magefree/master'
2016-09-04 07:36:31 -04:00
LevelX2
e43333aece
* Mayael's Aria - Fixed that the +1/+1 counter was added to every controlled permanent instead of only creature permanents.
2016-09-04 11:01:42 +02:00
LevelX2
8abac8803e
Merge pull request #2222 from Derpthemeus/pull2
...
Implement 10 cards
2016-09-04 09:36:20 +02:00
LevelX2
9e20efa444
Merge pull request #2224 from Dilnu/master
...
Improve Counter and Zone code
2016-09-04 09:35:18 +02:00
LevelX2
2c1bce4407
Merge pull request #2223 from maxlebedev/master
...
Added Vernal Equinox
2016-09-04 09:31:52 +02:00
Matt Oslan
0f66d41744
Implement Rushwood Elemental
2016-09-03 23:36:48 -04:00
Matt Oslan
dcf5a0593a
Implement Soothing Balm
2016-09-03 23:35:55 -04:00
Matt Oslan
f78d79e914
Implement Tonic Peddler
2016-09-03 23:35:32 -04:00
Samuel Sandeen
ac4658576b
Remove Skullbriar
...
There are still too many changes required before it can be implemented.
2016-09-03 20:24:05 -04:00
Samuel Sandeen
434be545f7
Merge remote-tracking branch 'magefree/master'
...
# Conflicts:
#
Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondi
tion.java
# Mage/src/main/java/mage/game/permanent/PermanentToken.java
2016-09-03 20:06:33 -04:00
Samuel Sandeen
ef5ed5256a
Clean up the deprecated moveCards methods in Player
2016-09-03 20:04:12 -04:00
Matt Oslan
a58432ac3f
Change Minions' Murmurs from damage to life loss
2016-09-03 17:04:27 -04:00
Samuel Sandeen
bec11804f5
Make the handling of counters more consistent.
...
This dramatically reduces the code duplication around counters handling.
2016-09-03 16:52:41 -04:00
Styxo
adf95f1db5
Merge origin/master
2016-09-03 22:40:18 +02:00
Styxo
66f785dd71
Fixed AddCountersTargetEffect
2016-09-03 22:34:45 +02:00
Max Lebedev
1bae15ab11
Merge https://github.com/magefree/mage
2016-09-03 16:05:33 -04:00
Max Lebedev
ecd1985dab
implemented Vernal Equinox
2016-09-03 16:04:22 -04:00
Matt Oslan
eaa16a179b
Implement Cyclopean Mummy
2016-09-03 14:13:55 -04:00
Matt Oslan
00e3ca1939
Implement Walking Dead
2016-09-03 14:12:21 -04:00
Matt Oslan
cfa5b13f0b
Implement Living Armor
2016-09-03 14:11:54 -04:00
Matt Oslan
53edfaeaa0
Implement Vulshok Battlemaster
2016-09-03 13:02:23 -04:00
LevelX2
2c904321e3
Merge pull request #2220 from maxlebedev/master
...
Added a couple of old Legends cards
2016-09-03 18:53:26 +02:00
Matt Oslan
e163227492
Merge origin/master into pull2
2016-09-03 10:39:06 -04:00
Samuel Sandeen
148f633672
Make the Counters API for card and permanent consistent.
2016-09-03 10:33:54 -04:00
LevelX2
c1d632be18
Merge origin/master
2016-09-03 15:26:46 +02:00
LevelX2
ab2399cbe7
* Fixed that equipments with restrictions (e.g. Gate Smasher) were not unequipped if the equipped permanent did no longer fulfill the restrictions( fixes #2212 ).
2016-09-03 15:26:17 +02:00
Samuel Sandeen
277dc19fec
Merge remote-tracking branch 'magefree/master'
2016-09-03 08:44:43 -04:00
Samuel Sandeen
151dfab127
Merge remote-tracking branch 'magefree/master'
2016-09-03 08:44:29 -04:00
Max Lebedev
d65bb6bec5
added the Heaven's Gate, Dwarven Song, SeaKing's Blessing, Sylvan Paradise, and Touch of Darkness cards based mostly on Sway of Illusion
2016-09-03 07:45:50 -04:00
Styxo
f5c2a51be1
Merge pull request #2219 from Styxo/master
...
Refactored some things
2016-09-03 12:58:47 +02:00
Styxo
23ac076a44
Added CountersCount
2016-09-03 12:47:46 +02:00
Styxo
2aec9f2ca7
Refactored counters on permanents counting
...
Added BecomeMonstrousTriggeredAbility
Added Target and Filter class for creature an opponent controls
2016-09-03 12:38:58 +02:00
LevelX2
720a4457fd
* Fixed hybrid mana symbol display for characteristic-based card rendering. Removed not used import statements.
2016-09-03 10:52:14 +02:00
LevelX2
cb91c5b9aa
Merge pull request #2216 from stravant/master
...
Full characteristic-based card rendering for cards
2016-09-03 09:13:49 +02:00
Derek M
896fd56f7d
Merge pull request #2199 from Dilnu/master
...
Implement Conspiracy
2016-09-02 21:59:58 -04:00
Samuel Sandeen
85dc15c5dc
Merge remote-tracking branch 'magefree/master'
2016-09-02 19:44:51 -04:00
Matt Oslan
0960a54998
Implement Wirecat
2016-09-02 19:17:09 -04:00
Matt Oslan
3c6f2430a9
Implement Minions' Murmurs
2016-09-02 18:59:49 -04:00
Mark Langen
629da22dd9
Small fix to renderer.
2016-09-01 17:23:17 -06:00
Mark Langen
b2895ee9eb
Tweaked layout for small card text.
2016-09-01 16:13:28 -06:00
Mark Langen
463576dbd0
Merged up to current
2016-09-01 15:44:14 -06:00
Mark Langen
818efb8535
* Textual set symbols no longer displayed if set symbol image doesn't exist.
...
* Fixed a small graphical mispositioning in rendering of keyword abilities.
* Added an option to hide set symbols entirely when rendering.
* Fixed flip walkers like Arlin Kord showing a "0" loyalty on their back face (when they should have no loyalty there).
* Removed some log files I accidentally committed.
* Fixed a bug in tokens, where they are missing their expansion symbol of they are created by another token
* Fixed the the new Rendering based CardPanel not returning the correct Image through getImage (resulting in a poor quality image in the card preview window)
2016-09-01 15:00:46 -06:00
spjspj
0c89b81da0
Merge pull request #2217 from spjspj/master
...
spjspj - Implement new method for image generation of tokens.
2016-09-01 17:20:32 +10:00
spjspj
0f043d480d
spjspj - Implement new method for image generation of tokens.
2016-09-01 17:11:12 +10:00
Mark Langen
d33f8a636e
Most obvious bugs ironed out. Ready for PR.
2016-08-31 23:37:31 -06:00
