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

15011 commits

This branch
This branch
All branches
Author SHA1 Message Date
spjspj
83d6936f42 spjspj - Clean up code for Psychic Possession (DIS) 2016-06-10 01:02:39 +10:00
spjspj
4bc50ba907 Merge pull request #1984 from spjspj/master 
spjspj - Implement Psychic Possession (DIS)
 2016-06-09 20:37:39 +10:00
spjspj
d7c2f5b9c5 spjspj - Implement Psychic Possession (DIS) 2016-06-09 20:35:26 +10:00
spjspj
0008234ab9 spjspj - Implement Psychic Possession (DIS) 2016-06-09 20:32:35 +10:00
spjspj
70981f09a4 Merge pull request #1980 from spjspj/master 
spjspj - Fix possible npe for Clockspinning and change return code fr…
 2016-06-09 01:28:36 +10:00
spjspj
b751e69eec spjspj - Fix possible npe for Clockspinning and change return code from apply. Also fix possible npe for adding counters 2016-06-09 01:23:19 +10:00
LevelX2
4187b83f57 Merge pull request #1976 from gnumast/master 
Adding way to import deck from clipboard
 2016-06-05 23:44:10 +02:00
Alex Marcotte
a7e29b3fd0 Adding way to import deck from clipboard 2016-06-05 15:06:02 -04:00
LevelX2
187866c979 Awaken - Fixed a problem with the rule text of cards with Awaken. 2016-06-05 12:35:00 +02:00
LevelX2
89d9762ea1 * Qasali Ambusher - Fixed possible null pointer exception. 2016-06-05 12:30:47 +02:00
LevelX2
85bc7549fa * Added Custodi Squire (2 votes), Nightshade Assassin (2 votes), Seize the Day (2 votes) from the Card Requests - JUNE list. 2016-06-04 12:21:47 +02:00
LevelX2
e1f6d72ee9 * Fixed a test because of changed set codes. 2016-06-04 11:22:57 +02:00
LevelX2
ffca19c408 Merge pull request #1860 from fenhl/set-codes 
Fix set codes
 2016-06-03 08:57:57 +02:00
LevelX2
086d69c200 Merge pull request #1972 from gnumast/master 
Text Import should detect sideboard after a single blank line
 2016-06-03 08:57:40 +02:00
LevelX2
4581cfc803 * Fixed continuous effect handling of Marsh Casualities, Savage Offensive and Explosive Growth. 2016-06-02 12:47:53 +02:00
Fenhl
1a5afc98a6 Add Commander printing of Hour of Reckoning 2016-06-02 03:18:05 +00:00
drmDev
5a813262d6 Faerie Tauntings typo fix 2016-06-01 09:19:23 -04:00
Alex Marcotte
d849e418af Merge branch 'master' of https://github.com/gnumast/mage 2016-05-30 23:04:36 -04:00
Alex Marcotte
95e4e3ea29 Text import will automatically start sideboard after a single blank line. Added a JUnit test for TxtDeckImporter. 2016-05-30 23:03:43 -04:00
Alex Marcotte
2d4ba24dd9 Added missing rarity for EMA Winter Orb 2016-05-30 23:03:43 -04:00
Alex Marcotte
283c9fa154 Text import will automatically start sideboard after a single blank line. Added a JUnit test for TxtDeckImporter. 2016-05-30 23:01:57 -04:00
fireshoes
a9744b2d04 Added Crumbling Vestige FNM promo. 2016-05-30 20:44:49 -05:00
LevelX2
1045f35705 * Sylvan Might - Fixed that Trample was not given to target creature. 2016-05-29 17:38:08 +02:00
LevelX2
266a0870ca Xmage 1.4.12v0 2016-05-29 10:59:39 +02:00
LevelX2
98fadbd8ba Merge pull request #1946 from Simown/master 
Reverted changes to deck generation sliders
 2016-05-29 10:19:11 +02:00
LevelX2
fc4133e098 Merge pull request #1952 from aastrand/master 
Make it possible to play lands using hideaway
 2016-05-29 10:18:45 +02:00
LevelX2
c0274304c8 [EMA] Fixed wrong rarity of Desperate Ravings. 2016-05-29 09:54:36 +02:00
LevelX2
9fa0bf7bd2 Swapped main menu position of Feedback and Preferences (so Preferences is always available if you switch to a too big font size). 2016-05-29 09:53:56 +02:00
LevelX2
0085b6b1ef Removed some custom classes by use of framework classes. 2016-05-29 09:52:43 +02:00
LevelX2
2c11d9cfef Merge pull request #1960 from Styxo/master 
Added Faerie Tautings, Heat Shimmer and Spring Cleaning
 2016-05-29 09:23:11 +02:00
LevelX2
9953107171 Some changes to Lost Auramancers. 2016-05-29 09:22:03 +02:00
LevelX2
c3169a08ed Merge pull request #1965 from Zeplar/master 
Fixes Issue #1958: Creatures copying Lost Auramancers fail to trigger…
 2016-05-29 09:11:33 +02:00
ZEPLAR
165b0630f7 Fixes Issue #1958: Creatures copying Lost Auramancers fail to trigger its death effect. My solution was to copy the Undying template, but I'm not sure why the original implementation didn't work. 2016-05-28 20:02:26 -07:00
spjspj
331b1376cd Merge pull request #1963 from spjspj/master 
spjspj - Add Spike Cannibal [EXO]
 2016-05-28 23:44:28 +10:00
spjspj
a6316ed26f spjspj - Add Spike Cannibal [EXO] 2016-05-28 23:41:47 +10:00
spjspj
2a30e6e653 Merge pull request #1962 from spjspj/master 
spjspj - Add in Carbonize [EMA]
 2016-05-28 23:14:10 +10:00
spjspj
3ce07ae6bb spjspj - Add in Carbonize [EMA] 2016-05-28 23:11:15 +10:00
spjspj
7382b27ec4 Merge pull request #1961 from spjspj/master 
spjspj - Fix up rarities in mtg-cards-data.txt
 2016-05-28 23:08:07 +10:00
spjspj
a0fcd59703 spjspj - Deduping 2016-05-28 23:05:29 +10:00
spjspj
f689f5b516 spjspj - Deduping 2016-05-28 22:56:33 +10:00
spjspj
59d1c520ab spjspj - Fixing up more rarities and missed carbonize 2016-05-28 22:50:43 +10:00
spjspj
2a262948ca spjspj - Fixing up more rarities and missed carbonize 2016-05-28 22:45:51 +10:00
Kranken
5f7d710b5e Make sure lands via hideaway respects 305.2 2016-05-28 14:07:40 +02:00
Styxo
3bd10a2b2b Added Faerie Tautings, Heat Shimmer and Spring Cleaning 2016-05-28 12:26:49 +02:00
LevelX2
8c6f44386d [EMA] Added Prowling Pangolin and fixed some wrong rarities. 2016-05-28 12:14:14 +02:00
LevelX2
5c8c6a3aeb [EMA] Added Crater Hellion and edited some minor formatting. 2016-05-28 11:44:10 +02:00
LevelX2
eb1ae59d11 Merge origin/master 2016-05-28 11:20:03 +02:00
LevelX2
5738a705a4 [EMA] Added missing rarity for Winter Orb. 2016-05-28 11:19:32 +02:00
spjspj
e41c1c2ed9 Merge pull request #1959 from spjspj/master 
spjspj - Implement rest of the EMA Spoilers
 2016-05-28 19:01:23 +10:00
spjspj
e4d10ec87a spjspj - Rest of EMA spoilers 2016-05-28 18:54:32 +10:00