Commit graph

16442 commits

Author SHA1 Message Date
Lymia Aluysia
bd1f7dd32a
Merge branch 'master' of https://github.com/magefree/mage 2016-09-27 11:25:48 -05:00
LevelX2
05f6224f8b Merge origin/master 2016-09-27 17:32:07 +02:00
LevelX2
4619f45771 [SWS] Fixed No Contest. 2016-09-27 17:31:26 +02:00
spjspj
d2f560ba24 Merge pull request #2390 from spjspj/master
spjspj - Fix Maintenance Droid
2016-09-28 01:10:59 +10:00
spjspj
6eead24f0a spjspj - Fix Maintenance Droid 2016-09-28 01:09:54 +10:00
spjspj
62ba94e721 Merge pull request #2389 from spjspj/master
spjspj - Implement Jango Fett (SWS - Custom set)
2016-09-28 01:01:23 +10:00
spjspj
a6028f2e76 spjspj - Implement Jango Fett (SWS - Custom set) 2016-09-28 01:00:24 +10:00
LevelX2
2c0234d842 Merge pull request #2388 from Eirkei/HeadGamesJestersMaskImplemented
Head Games and Jester's Mask implemented
2016-09-27 16:24:00 +02:00
Eirkei
871e9741c0 Jester's Mask Implemented 2016-09-27 15:50:17 +02:00
Eirkei
92dbc55379 Head Games Implemented 2016-09-27 15:49:58 +02:00
Eirkei
840e55b949 effect for "Target opponent puts the cards from his or her hand on top of his or her library. Search that player's library for that many cards. The player puts those cards into his or her hand, then shuffles his or her library" 2016-09-27 15:49:41 +02:00
LevelX2
a5b1db4ec1 [SWS] Fixed Ravenous Wampa and casting cost of Gamorream Enforcer. 2016-09-27 15:44:00 +02:00
LevelX2
91aa36e707 [SWS] Fixed Ravenous Wampa and casting cost of Gamorream Enforcer. 2016-09-27 15:43:55 +02:00
LevelX2
33bc95082c [SWS] Implemented Sabacc Game, Fixed A-Wing. 2016-09-27 12:35:22 +02:00
LevelX2
86f2007945 Merge pull request #2384 from Styxo/master
Star Wars Set implemented
2016-09-27 11:30:08 +02:00
spjspj
240c7950d0 Merge pull request #2386 from spjspj/master
spjspj - Add in energy/experience counters
2016-09-27 17:50:26 +10:00
spjspj
de3c3ae036 spjspj - Add in energy/experience counters 2016-09-27 17:49:34 +10:00
fireshoes
783a278fca Added Frontier format (M15 forward). Added Kaladesh block constructed. 2016-09-27 01:54:49 -05:00
LevelX2
311f797565 * Some fixes for exile handling. 2016-09-26 23:27:12 +02:00
LevelX2
31bc96d16a * Astral Slide - Some clean up. 2016-09-26 23:04:07 +02:00
Styxo
9084595135 Star Wars Set implemented 2016-09-26 18:43:04 +02:00
LevelX2
e1dc3d4ea1 [CN2] Adding Daretti, Ingenious Iconoclast. 2016-09-26 18:01:17 +02:00
Lymia Aluysia
37d93fa537
Made the dck importer work with arbitary set codes and card ids. 2016-09-26 10:11:39 -05:00
LevelX2
652672ee45 Merge pull request #2379 from Lymia/master
Add basic support for custom sets.
2016-09-26 14:26:35 +02:00
LevelX2
c08ada15e4 Merge pull request #2380 from Eirkei/TanglerootImplementation
Tangleroot implemented
2016-09-26 14:00:08 +02:00
LevelX2
d590555391 Merge pull request #2381 from Eirkei/RishadanPiratesImplemented
Rishadan pirates implemented
2016-09-26 13:59:21 +02:00
Eirkei
edf9f5cc49 Rishadan Footpad implemented 2016-09-26 13:19:26 +02:00
Eirkei
97cd2b7c0a Rishadan Cutpurse implemented 2016-09-26 13:19:05 +02:00
Eirkei
af08ee5b6f Rishadan Brigand implemented 2016-09-26 13:18:40 +02:00
Eirkei
080b61ec62 Effect for "each opponent sacrifices ... unles he or she pays ..." 2016-09-26 13:16:58 +02:00
Eirkei
0c2e02ec62 Tangleroot implemented 2016-09-26 13:03:19 +02:00
Lymia Aluysia
f61c18ea63
Fix code formatting issue. 2016-09-26 05:19:40 -05:00
LevelX2
3c93c00d60 * Nature's Way - Fixed wrong damage source (fixes #2378). 2016-09-26 12:09:06 +02:00
LevelX2
e552d64764 Merge pull request #2372 from Eirkei/master
Shaleskin Bruiser implemented
2016-09-26 11:38:49 +02:00
spjspj
3e68a1d9a7 Merge pull request #2377 from spjspj/master
spjspj - Add in energy/experience counters
2016-09-26 10:05:51 +10:00
Lymia Aluysia
48e14a1765
Rename stuff. Names are hard. 2016-09-25 14:45:06 -05:00
Lymia Aluysia
207cb04dbc
Merge branch 'master' of https://github.com/magefree/mage 2016-09-25 14:09:42 -05:00
Lymia Aluysia
2c0cb3f317
Added customSets to gitignore 2016-09-25 13:39:15 -05:00
Styxo
f18e4b66f1 Little refactor of PermanentHasCounterCondition 2016-09-25 19:38:40 +02:00
Lymia Aluysia
2fec14f8fa
Minor error message fix. 2016-09-25 12:36:59 -05:00
spjspj
1a81f2151f spjspj - Add in energy/experience counters 2016-09-26 03:17:06 +10:00
spjspj
e6a258dd63 Merge pull request #2376 from spjspj/master
spjspj - Add in energy/experience counters
2016-09-26 03:02:10 +10:00
spjspj
d259efc093 spjspj - Add in energy/experience counters 2016-09-26 03:01:35 +10:00
spjspj
ffa7d38aed Merge pull request #2375 from spjspj/master
spjspj - experience.png resource (candidate for a more gooderer one..)
2016-09-26 02:59:32 +10:00
spjspj
5671ab8ff7 spjspj - Add in energy/experience counters 2016-09-26 02:58:59 +10:00
spjspj
db3074ceda spjspj - experience.png resource (candidate for a more gooderer one..) 2016-09-26 02:50:37 +10:00
spjspj
367333ddc8 Merge pull request #2374 from spjspj/master
spjspj - Energy.png resource
2016-09-26 02:46:05 +10:00
spjspj
80b498f044 spjspj - Energy.png resource 2016-09-26 02:45:20 +10:00
Lymia Aluysia
e606deded8
Make ClassScanner not load inner classes. 2016-09-25 10:40:40 -05:00
Eirkei
c4ebb2f7e5 Marton Stromgald implementation - fix setting lockedInPT 2016-09-25 10:42:59 +02:00