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

17346 commits

This branch
This branch
All branches
Author SHA1 Message Date
drmDev
0d11a39fc4 Merge remote-tracking branch 'upstream/master' 2016-04-27 09:56:41 -04:00
drmDev
1f1eddc65e Test for Unearth bug added 2016-04-27 09:56:01 -04:00
LevelX2
eb98568b8c Added Rich Man Draft to the default config.xml used by the local xmage server. 2016-04-27 15:42:45 +02:00
LevelX2
08454eb12a Added some Blood Cultist tests. 2016-04-27 15:22:38 +02:00
drmDev
47674121fe Leeching Sliver fix - maybe 2016-04-26 14:03:09 -04:00
LevelX2
9fcefc8cd7 Some minor changes. 2016-04-26 12:00:20 +02:00
LevelX2
dff8c1ea40 Merge pull request #1906 from Marco-Marin/master 
Couple more cards + Fixes
 2016-04-26 11:47:17 +02:00
LevelX2
55ed1c3121 Merge pull request #1903 from KWottrich/fix-serendib-djinn-island-damage 
Fix serendib djinn island damage
 2016-04-26 11:44:09 +02:00
LevelX2
e2a8ddef0f Merge pull request #1905 from KWottrich/clean-up-java-imports 
Clean up java imports
 2016-04-26 11:37:35 +02:00
LevelX2
44effa8103 Starter 2000 set. Set the card numbers to unique values. Has anyone the correct numbers? 2016-04-26 11:09:32 +02:00
LevelX2
1fcd26fc60 xmage 1.4.11v0 2016-04-26 00:59:03 +02:00
LevelX2
e81f5cbb32 * Fixed some wrong rule text of Oubliette and Tawnos's Coffin. 2016-04-25 23:30:56 +02:00
drmDev
213107f835 Squandered Resources impl 2016-04-25 17:20:17 -04:00
MarcoMarin
457bc29b34 Merge remote-tracking branch 'upstream/master' 2016-04-25 14:26:23 -03:00
MarcoMarin
38adc7518d A few fixes after suggestions thanks to LevelX2 for spotting them 2016-04-25 14:23:36 -03:00
Kenny Wottrich
ec5d986ef8 comment out URL in code 2016-04-24 20:27:55 -05:00
Kenny Wottrich
6c84692a9b Add last few unused imports, which also had character encoding issues with Eclipse 2016-04-24 20:19:50 -05:00
Kenny Wottrich
f3c83d54f5 Remove Unused Imports 
Delete unused java imports that cause compiler warnings
 2016-04-24 19:50:29 -05:00
Kenny Wottrich
9b2ad2a88a put Island check before land is sacrificed 2016-04-24 19:08:38 -05:00
Kenny Wottrich
19a4d7dc7a fixed land sacrifice effect to damage player if sacrificed land is an island 2016-04-24 17:45:30 -05:00
Kenny Wottrich
ea342f9336 Merge branch 'master' of https://github.com/magefree/mage 2016-04-24 17:36:15 -05:00
LevelX2
d626b072cd * Myr Superion - Fixed that its mana costs could not be decreased by convoke. 2016-04-24 12:34:35 +02:00
LevelX2
ea0b13c64f Merge origin/master 2016-04-24 09:39:23 +02:00
LevelX2
3cc6d97fbd Added test. 2016-04-24 09:38:54 +02:00
LevelX2
44100968b7 Fixed internal wrong spelling. 2016-04-24 09:38:39 +02:00
LevelX2
48035a053e * Myr Superion - Fixed that its mana costs could not be decreased by convoke (fixes #1897). 2016-04-24 09:38:02 +02:00
LevelX2
016ff04a11 Merge pull request #1901 from KWottrich/fix-balance-of-power-1 
Fix "Balance of Power" Effect Logic
 2016-04-24 08:10:45 +02:00
Kenny Wottrich
27d2b3736b Merge pull request #1 from KWottrich/fix-balance-of-power-1 
Fix Effect Logic
 2016-04-23 19:34:40 -05:00
Kenny Wottrich
412c395494 Fix Effect Logic 
Both players must not be null in order for the hand size check to
succeed
 2016-04-23 19:31:36 -05:00
LevelX2
a6c5e83c51 Merge pull request #1894 from Styxo/master 
Added some LRW cards
 2016-04-22 08:51:16 +02:00
drmDev
d6d8042a12 WildDogs impl 2016-04-21 23:40:30 -04:00
spjspj
5cb85f6ec9 Merge pull request #1896 from spjspj/master 
spjspj - Missed DRK printing of Preacher
 2016-04-22 08:36:08 +10:00
spjspj
e9ad2fb6af spjspj - Missed DRK printing of Preacher 2016-04-22 08:34:39 +10:00
spjspj
20b1a2ab6b Merge pull request #1895 from spjspj/master 
spjspj - Update SourceHasRemainedInSameZoneCondition with new
 2016-04-22 08:34:10 +10:00
spjspj
8c912851dd spjspj - Update SourceHasRemainedInSameZoneCondition with new constructor that passes in game 2016-04-22 08:32:09 +10:00
drmDev
109506ad63 Calming Verse impl 2016-04-21 17:35:11 -04:00
Styxo
01ee8e5a4f Added Ego Erasure, Shields of Velis Vel, Springjack Knight, Turtleshell Changeling and Wellgabber Apothecary 2016-04-21 22:18:51 +02:00
drmDev
f1fc4e4463 Merge remote-tracking branch 'upstream/master' 2016-04-21 14:45:52 -04:00
drmDev
410c8d9e6e VolrathTheFallen impl 2016-04-21 14:45:07 -04:00
LevelX2
0c0dd82480 * Some changes to activation count and sacrifice source triggers. 2016-04-21 17:13:57 +02:00
LevelX2
06d3b929a2 Merge pull request #1891 from Marco-Marin/master 
Fem + Fixes
 2016-04-21 12:01:57 +02:00
LevelX2
eb960a34ad * Dragon Whelp - Made the activation handling more reusable friendly and object sensitive (zone change counter). 2016-04-21 11:46:02 +02:00
drmDev
181381b262 Prismatic Strands impl 2016-04-20 23:18:21 -04:00
LevelX2
6ff458d86c * Reworked Dragon Whelp activation check. 2016-04-21 00:19:32 +02:00
fireshoes
f88fb6fcae Randomized which Clue tokens appear for SOI. 2016-04-20 09:59:58 -05:00
LevelX2
9cc1c3edd5 * Kindly Stranger - Fixed that it did not allow destroying creature on transform (fixes #1888). 2016-04-20 15:40:15 +02:00
LevelX2
eaae3cc9b0 * Time Spiral storage duals lands - Fixed that the activated ability to remove the counters was not defnied as mana ability. 2016-04-20 13:34:32 +02:00
MarcoMarin
a9c9a98120 resolve conflict for Oubliette and Tawnos Coffin 2016-04-19 14:27:17 -03:00
MarcoMarin
4c25816be1 midway through FEM + fixed Oubliette, Tawnos Coffin 2016-04-19 12:50:48 -03:00
drmDev
7a3c15d8b8 Game of Chaos impl. Kindly Stranger test for bug 2016-04-19 09:24:42 -04:00