github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-18 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity
15688 commits 2 branches 0 tags 782 MiB
Commit graph

15688 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
drmDev
7125d22e7a The remaining Scourge-Dragon enchantment cards implemented 2016-03-14 05:26:45 -04:00
spjspj
a16a0c1d24 Merge pull request #1623 from spjspj/master 
spjspj - Implement Cryptic Gateway (ONS)
 2016-03-14 20:12:13 +11:00
spjspj
5cc6ef9d4a spjspj - Implement Cryptic Gateway (ONS) 2016-03-14 20:07:14 +11:00
drmDev
79c4798ff9 Renamed Thought-Knot Seer tests to match conventions. 2016-03-14 02:54:10 -04:00
drmDev
72cbaaf3ab Tests for Thought-Knot Seer reported bug 2016-03-14 02:27:32 -04:00
DjB
f56b82a65f Create Misstep.java 2016-03-13 22:22:42 -05:00
Jerrad Bieno
891b052c62 Merge remote-tracking branch 'refs/remotes/magefree/master' into cradle-to-the-grave 2016-03-13 19:04:08 -05:00
Jerrad Bieno
812c348ece Added card "Cradle to Grave". 
Added implementation of "Cradle to Grave".
 2016-03-13 19:04:00 -05:00
LevelX2
aadf51ecad Merge pull request #1618 from Simown/SliderPanel 
Added advanced deck generator functions and tidied up the layout
 2016-03-13 12:54:28 +01:00
Simown
9dc71d2996 Added advanced deck generator functions and tidied up the layout. 2016-03-13 11:33:45 +00:00
Jerrad Bieno
b2173a9b13 Merge remote-tracking branch 'refs/remotes/magefree/master' into cradle-to-the-grave 2016-03-12 23:10:07 -06:00
LevelX2
578cb128dd xmage 1.4.9v2 2016-03-12 12:50:26 +01:00