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

19022 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
647cd9bc6d Merge origin/master 2017-07-23 11:06:47 +02:00
LevelX2
4c33359fe2 * Some minor changes to logging and return code handling. 2017-07-23 11:06:23 +02:00
LevelX2
94be7cb4da * Grave Betrayal - Reworked card movement and color and subtype applying. 2017-07-23 11:05:32 +02:00
LevelX2
1d4af7214b Merge pull request #3725 from sebesdm/master 
Removing hardcoded User-Agent header erroring for card image retrieval
 2017-07-23 09:26:14 +02:00
spacemoses
19d1c7e987 Removing hardcoded User-Agent header causing error for card image retrieval 2017-07-22 13:23:49 -05:00
spjspj
79a72c3b93 Merge pull request #3721 from spjspj/master 
Implement War Elemental (MRD)
 2017-07-22 23:04:45 +10:00
spjspj
1668505ee3 Implement War Elemental (MRD) 2017-07-22 23:01:55 +10:00
LevelX2
c6cd713f0d * Mind's Desire - Fixed a problem with playing lands. 2017-07-22 12:09:28 +02:00
Jeff
fb19f257a7 - Added requested card Nix. 2017-07-21 17:11:10 -05:00
Jeff
c7a3801676 - Added requested card Dimensional Breach. 2017-07-21 12:16:54 -05:00
Zzooouhh
1aed985fd5 Implement Daru Spiritualist (#3712) 
* Add files via upload

* Added Daru Spiritualist
 2017-07-21 07:50:43 -05:00
Derek M
1acede5b51 Merge pull request #3718 from drmDev/master 
fixes #3707 minds desire npe
 2017-07-21 07:29:45 -04:00
Derek Monturo
521b573ad2 fixes #3707 minds desire npe 2017-07-21 07:29:14 -04:00
ingmargoudt
fc32c9a7b7 Merge pull request #3714 from ingmargoudt/master 
subtypes for 'B' cards
 2017-07-21 09:15:49 +02:00
igoudt
183e7ba33c Merge https://github.com/magefree/mage 2017-07-21 09:14:42 +02:00
igoudt
777c66efc6 subtypes move for 'B' 2017-07-21 09:14:26 +02:00
Jeff
5ce1052ebc - Added requested card Seedtime. 2017-07-20 14:54:50 -05:00
Jeff
469ddcea6b - Refactor AnnihilatorAbility(). 2017-07-20 13:37:23 -05:00
Jeff
7ffcf39260 - Added requested card Volcano Hellion. 2017-07-20 11:15:58 -05:00
Jeff
44e85ca351 - Refactor Past In Flames 2017-07-20 11:09:59 -05:00
Jeff
ce1ff40ca0 - Null check added 2017-07-20 11:03:02 -05:00
spjspj
c76b6ece7b Merge pull request #3702 from spjspj/master 
Fix  Magnetic Mountain (ARN)
 2017-07-20 18:37:11 +10:00
spjspj
007b9cd849 Fix Magnetic Mountain (ARN) 2017-07-20 18:35:30 +10:00
ingmargoudt
bfe61fbc9a Merge pull request #3701 from ingmargoudt/master 
metallic mimic fix
 2017-07-20 09:27:55 +02:00
igoudt
1be691b7f2 Merge https://github.com/magefree/mage 2017-07-20 09:26:45 +02:00
igoudt
422ce699d1 metallic mimic fix 2017-07-20 09:26:29 +02:00
fireshoes
382476206c Restored inadvertently deleted line in DuelCommander.java 2017-07-19 16:33:57 -05:00
Jeff
1aadbf5b52 - Commit changes to Sets files. 2017-07-19 16:17:52 -05:00
Jeff
c390862a88 - Added requested card Jeweled Amulet. 2017-07-19 11:25:19 -05:00
Jeff
22c18ef2ff - Added requested card War's Toll. 2017-07-18 09:16:05 -05:00
igoudt
105f346ebc subtypes for cards 'A' 2017-07-18 08:55:40 +02:00
igoudt
be062e8b28 remove arcane subtype from Curse of the Cabal 2017-07-18 08:54:44 +02:00
Justin Herlehy
1daad30559 Subtype Update for "Z" Cards. 
Updated the subtypes for all implemented cards in the "Z" package.
Corrected typo in the SubType enum for type BOAR.
Added a varargs function to allow all creature types to be added in a single function call rather than 1-4.
 2017-07-17 17:17:07 -07:00
Justin Herlehy
e2ccc5c87f Subtype Update for "Z" Cards. 
Updated the subtypes for all implemented cards in the "Z" package.
Corrected typo in the SubType enum for type BOAR.
Added a varargs function to allow all creature types to be added in a single function call rather than 1-4.
 2017-07-17 17:15:48 -07:00
fireshoes
71f1acc90c Updated Duel Commander banlist. 2017-07-17 16:33:51 -05:00
igoudt
ea14f9c361 fix order of subtypes on a cardview 2017-07-17 10:08:20 +02:00
ingmargoudt
09f0c9ad97 huge rework on subtypes (#3668) 
* huge rework on subtypes

* update for coat of arms

* fix test
 2017-07-16 16:57:39 -05:00
someAnonymousUser
81fb4b5d92 Curse of the Cabal (#3684) 
* Create CurseOfTheCabal.java

* Update TimeSpiral.java
 2017-07-16 15:30:59 -05:00
Derek M
67720167d3 Merge pull request #3690 from drmDev/master 
UT for #3514 unconfirmed telepath ancestral
 2017-07-16 15:33:34 -04:00
Derek Monturo
d257aafbd3 minor removal comment 2017-07-16 15:32:35 -04:00
Derek Monturo
a5419d53a3 fixed UT 2017-07-16 15:31:41 -04:00
Derek Monturo
fd1522a428 UT for #3514 unconfirmed telepath ancestral 2017-07-16 14:28:54 -04:00
LevelX2
5774deb90c XMAGE 1.4.24V3 2017-07-16 19:46:41 +02:00
LevelX2
2410221cd7 Merge origin/master 2017-07-16 19:27:05 +02:00
LevelX2
ccc4c00ace * Flameshadow Conjuring - Fixed that the {R} could not be paid during resolution (fixes #3559). 2017-07-16 19:25:33 +02:00
Achilles
79be2c4ce8 - Little refactor CardsCycledOrDiscardedThisTurnWatcher 2017-07-16 12:21:28 -05:00
LevelX2
60951f645b * Removed magiccards.info as download source. 2017-07-16 19:10:10 +02:00
LevelX2
87c70043f7 * Terastodon - Fixed that destroying Parallel Lives still doubled the tokens (fixes #3651). 2017-07-16 19:09:19 +02:00
Achilles
5cebe20768 - Fixed bug #3656 2017-07-16 10:31:22 -05:00
LevelX2
20c8c1a9c9 * Fixed that Persist did not working with Hapatra, Vizier of Poisons and Obelisk Spider (fixes #3679). 2017-07-16 15:58:50 +02:00