Commit graph

16750 commits

Author SHA1 Message Date
LevelX2
e70ae2520a Merge origin/master 2016-03-17 15:47:18 +01:00
LevelX2
4bf8226a43 * Fixed bug with P/T boost triggered by blocking creatures not lasting until end of turn (e.g. Rabid Elephant). 2016-03-17 15:44:38 +01:00
Derek M
57a316cfc6 Merge pull request #1634 from drmDev/master
Test for Breaker of Armies with Menace, reported bug.
2016-03-17 10:34:03 -04:00
drmDev
72fad81bd5 Test for Breaker of Armies with Menace, reported bug. 2016-03-17 10:33:40 -04:00
Derek M
60936a672c Merge pull request #1633 from drmDev/master
whoops... fix test
2016-03-17 08:29:34 -04:00
drmDev
ea961d3cfc whoops... fix test 2016-03-17 08:28:28 -04:00
Derek M
63e436cf5d Merge pull request #1632 from drmDev/master
tests for reported bug Rabid Elephant. typo fixes
2016-03-17 08:23:02 -04:00
drmDev
eb9747d0d1 tests for reported bug Rabid Elephant. typo fixes 2016-03-17 08:21:36 -04:00
rkfg
ae66db20ad Adjust sliders on reset. 2016-03-17 15:13:29 +03:00
rkfg
981665bcd0 Remove adjust parameter. 2016-03-17 15:13:28 +03:00
fireshoes
6dde3e7374 Merge origin/master 2016-03-17 02:40:38 -05:00
fireshoes
03b80f2a98 [SOI] Add Olivia Mobilizer for War, Sigarda Heron's Grace, Olivia's Bloodsworn, Stromkirk Mentor, Breakneck Rider, Indulgent Aristocrat, Twins of Maurer Estate, Rise from the Tides, Merciless Resolve, Groundskeeper reprint. Fixed Sage of Ancient Lore P/T not changing when transforming back to day side. 2016-03-17 02:31:09 -05:00
fireshoes
98d8269918 Merge/origin 2016-03-16 23:27:46 -05:00
rkfg
e3b5827a76 Fix imports in Exhaustion.java 2016-03-17 07:00:08 +03:00
rkfg
74f925b579 Fix deck generator sliders. 2016-03-17 06:30:21 +03:00
rkfg
eec3e779bd Simplify controlling of advanced deck generator sliders. 2016-03-17 03:19:20 +03:00
fireshoes
58e4cb45c3 [SOI] Updated mtg-cards-data.txt with 3/16 spoilers. Added missing color identifiers for DFCs. 2016-03-16 10:57:35 -05:00
LevelX2
4b6e46c15a Merge pull request #1619 from bieno002/cradle-to-the-grave
Add card "Cradle to Grave".
2016-03-16 10:26:29 +01:00
LevelX2
d6b32a42e3 Merge pull request #1631 from okuRaku/master
fix for Exhaustion on things that entered after resolution
2016-03-16 10:25:41 +01:00
LevelX2
867fe61007 * Leeching Sliver - Fixed that all defending players of combat lost life instead of only the defending player of Leeching Sliver. 2016-03-16 10:12:56 +01:00
okuRaku
e2dae353ba Merge branch 'master' of https://github.com/okuRaku/mage 2016-03-15 23:23:17 -05:00
okuRaku
11da328231 update per pull request feedback 2016-03-15 23:22:58 -05:00
okuRaku
a482bf2a0f fix for Exhaustion on things that entered after resolution 2016-03-15 23:22:58 -05:00
okuRaku
e0625f2036 update per pull request feedback 2016-03-15 23:06:08 -05:00
fireshoes
32c014f2f8 [SOI] Added Arlinn Kord, To the Slaughter, Sage of Ancient Lore, Rattlechains, and Wolf of Devil's Breach. 2016-03-15 22:33:37 -05:00
fireshoes
fb077baeeb [SOI] Added Nahiri, the Harbinger and Macabre Waltz reprint. 2016-03-15 18:41:16 -05:00
fireshoes
da86921f0a Merge origin/master 2016-03-15 17:58:39 -05:00
fireshoes
0a38430d49 [SOI] Added 3/14-15 spoilers to mtg-cards-data.txt Added Angel of Deliverance, Anguished Unmaking, Descend upon the Sinful, Drogskol Cavalry, Nephalia Moondrakes, and Sinister Concoction. 2016-03-15 17:47:21 -05:00
spjspj
045936bb12 Merge pull request #1627 from spjspj/master
spjspj - Change to '{this}'.  Also add checks for if in graveyard of …
2016-03-16 07:59:29 +11:00
Derek M
c96517398f Merge pull request #1629 from drmDev/master
Card implementation Clergy of the Holy Nimbus
2016-03-15 15:15:23 -04:00
drmDev
dc37ff0793 Card implementation Clergy of the Holy Nimbus 2016-03-15 13:32:46 -04:00
LevelX2
8834965979 [SOI] Flameblade Angel and Relentless Dead. 2016-03-15 17:18:59 +01:00
rkfg
4c8ca577bd Fix transformable card being shown non-transformed on the battlefield. 2016-03-15 18:37:48 +03:00
spjspj
383b05534c spjspj - Change to '{this}'. Also add checks for if in graveyard of owner and whether it can return to the battlefield 2016-03-16 01:05:24 +11:00
LevelX2
6c141a1f3e Fixed color identity evaluation not checking second card face. 2016-03-15 11:54:11 +01:00
LevelX2
853456377a Avacyn, the Purifier - Added missing colro for the night side card. 2016-03-15 11:53:23 +01:00
LevelX2
957949dd52 Merge pull request #1620 from djbrez/patch-17
Create Misstep.java
2016-03-15 09:40:23 +01:00
okuRaku
03cec66bae fix for Exhaustion on things that entered after resolution 2016-03-14 23:23:01 -05:00
Jerrad Bieno
8e4731e850 Simplified predicate lines and changed filter text.
Made the predicates into separate lines and changed the filter text from
"came into play" to "entered the battlefield".
2016-03-14 21:33:31 -05:00
Jerrad Bieno
1f86a1cbf9 Merge remote-tracking branch 'refs/remotes/magefree/master' into cradle-to-the-grave 2016-03-14 20:47:57 -05:00
DjB
169446d1e5 Update Misstep.java 2016-03-14 18:51:57 -05:00
Derek M
128d79b226 Merge pull request #1625 from drmDev/master
Card Implementations for 5 Ice Age Talisman cycle
2016-03-14 14:48:52 -04:00
drmDev
0e2c928026 Card Implementations for 5 Ice Age Talisman cycle 2016-03-14 14:47:43 -04:00
LevelX2
272f68b530 Fixed handling of DontUntapInControllersNextUntapStepTargetEffect (fixes Sleep bug). 2016-03-14 18:15:57 +01:00
fireshoes
c85cc9cb98 [SOI] Added 3/14 spoilers to mtg-cards-data.txt 2016-03-14 11:24:45 -05:00
spjspj
21656dcb3e Merge pull request #1624 from spjspj/master
spjspj - Implement Screams From Within (Darksteel)
2016-03-15 01:22:36 +11:00
spjspj
9ab96b03d9 spjspj - Implement Screams From Within (Darksteel) 2016-03-15 01:17:41 +11:00
LevelX2
ad637a2944 * Fixed CAST_SPELL_LATE event (e.g. used by Reflector Mage) to only fire for cast events. 2016-03-14 13:41:12 +01:00
Derek M
d6af2c4008 Merge pull request #1622 from drmDev/master
Thought-Knot Seer tests to reproduce bug. Also implemented the remaining Scourge-Dragon enchantment cards.
2016-03-14 06:43:28 -04:00
drmDev
51f02c07a6 Merge remote-tracking branch 'upstream/master' 2016-03-14 06:33:39 -04:00