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

8542 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
a8bf35e39a Fixed that canPlayCardsFromGraveyard of player was not taken into account for getPlayable() method. 2014-08-14 12:47:54 +02:00
LevelX2
175280b381 Setting java.util.Arrays.useLegacyMergeSort=true in client main to avoid Comparison method violates its general contract of swing class. (Fixes #451). 2014-08-14 11:49:46 +02:00
LevelX2
a894d3e0a6 Merge pull request #510 from shieldal/skred 
Add Skred
 2014-08-14 09:49:09 +02:00
shieldal
df5201cca7 Add Skred 2014-08-13 23:51:26 -07:00
LevelX2
64fe90421b Merge origin/master 2014-08-14 08:16:43 +02:00
LevelX2
9838590896 Changed lost connection handling. Changed logging message. 2014-08-14 08:15:58 +02:00
LevelX2
672d8945f9 Merge pull request #508 from magefree/feature/Paralyze 
Paralyze implemented + doIfCostPaid class made a bit more re-usable by inheritance
 2014-08-14 08:02:08 +02:00
Dustin Conrad
ee65d08160 Paralyze implemented 2014-08-13 20:58:19 -04:00
LevelX2
3ea167857c * Hushwing Gryff - Added a message to game log if he supresses a triggered effect and activated log message output. 2014-08-14 00:03:42 +02:00
LevelX2
12a88f1a43 * Hushwing Gryff - Added a messgae to game log if he supresses a triggered effect. 2014-08-13 23:58:07 +02:00
LevelX2
357e80c7c2 Prevent NPE after disconnect for open tournament panel. 2014-08-13 22:01:06 +02:00
LevelX2
15b08c110e Some minor fixes to tooltip texts. 2014-08-13 21:59:09 +02:00
LevelX2
98bfd16680 Fixed adouble calss name. 2014-08-13 18:44:43 +02:00
LevelX2
797ee3d945 Some minor logging and comment changes. 2014-08-13 16:58:19 +02:00
LevelX2
a42318070e Changed duration of Intimidate to EndOfGame (like Flying and Shadow) instead of WhileOnBattlefield. 2014-08-13 16:58:01 +02:00
LevelX2
3bbbd4c02b Replaced use of source.getId() by source.getSourceId() for Mage Framework. 2014-08-13 14:22:32 +02:00
LevelX2
8b4c454f1f Replaced use of source.getId() by source.getSourceId() for Mage Sets. 2014-08-13 13:54:40 +02:00
Dustin Conrad
83eb066d88 implemented Chainer's Edict, Breath of Life. Re-used TapEnchanted effect in Mystic Restraints 2014-08-12 21:07:58 -04:00
Quercitron
a2b650722a * Add Predict, Mask of Memory, Rhystic Study and Perplex 2014-08-13 03:02:41 +04:00
LevelX2
ae9f056e1a Some log improvement for player moves card. 2014-08-12 23:58:38 +02:00
LevelX2
56af185d27 Some minor changes to Jace, the Mind Sculptor. 2014-08-12 23:51:27 +02:00
magenoxx
42431ca8c3 minor change 2014-08-12 21:23:26 +04:00
magenoxx
018498598c Reverting changes to Guerrilla Tactics as it works now 2014-08-12 21:20:08 +04:00
magenoxx
5ec0b656bb Returning source.getSourceId() for DISCARED_CARD event 2014-08-12 21:19:45 +04:00
LevelX2
b9bedbb368 Merge pull request #503 from shieldal/master 
Add Adun Oakenshield
 2014-08-12 17:37:30 +02:00
LevelX2
5631000242 Adding Ray of command. 2014-08-12 17:32:16 +02:00
LevelX2
2a3518820d Fixed triggered ability of Guerrilla Tactics. 2014-08-12 15:18:50 +02:00
magenoxx
06b61fcba7 Made Elemental token origin set Conflux 2014-08-12 13:44:24 +04:00
magenoxx
fd4c032414 Merge branch 'master' of https://github.com/magefree/mage 2014-08-12 13:40:31 +04:00
magenoxx
b1b7504618 Fixes for source.getSourceId in 2 cards 2014-08-12 13:40:24 +04:00
emerald000
3c3efdc0df Added Solitary Confinement, Words of War, Mirri's Guile, Replenish and City of Solitude. 2014-08-12 03:08:15 -04:00
LevelX2
9020a287d6 Some NPE fixing for server and client. 2014-08-12 08:51:06 +02:00
shieldal
46caec8698 Set author name to shieldal 2014-08-11 23:19:25 -07:00
shieldal
97e0c2b339 Add Adun Oakenshield 2014-08-11 23:14:48 -07:00
magenoxx
a2e93986bc Added Research/Development card 2014-08-12 09:57:01 +04:00
Dustin Conrad
2e57d676e9 Guerrilla Tactics implemented. 2014-08-12 00:25:34 -04:00
Dustin Conrad
5719f52380 Mind Slash implemented 2014-08-12 00:24:36 -04:00
Dustin Conrad
5a675a9618 Fix Nevermaker to be LTB effect (was ETB). Fix comments on Loxodon Smiter. 2014-08-12 00:24:05 -04:00
Dustin Conrad
0bb6867a45 Fix Sever Soul to work with indestructible creatures (thanks LevelX2) 2014-08-11 19:18:40 -04:00
magenoxx
709dc83ae6 2 requested cards 2014-08-11 20:30:39 +04:00
magenoxx
7d68d6e67f Added Hatred, Bond of Agony 2014-08-11 19:12:21 +04:00
magenoxx
7caa7c8719 Requested card: Fire Covenant 2014-08-11 19:11:56 +04:00
magenoxx
e6750f2f58 Merge branch 'master' of https://github.com/magefree/mage 2014-08-11 17:45:53 +04:00
magenoxx
e2bc5756e0 Requested card: Fire Covenant 2014-08-11 17:45:45 +04:00
LevelX2
4beb1ccad3 Some changes to logging. 2014-08-11 13:57:34 +02:00
LevelX2
9ade5efde0 * Fixed possible NPE in CostsImpl. 2014-08-11 13:57:18 +02:00
LevelX2
057f3aed07 * Added 4 cards. 2014-08-11 13:56:54 +02:00
magenoxx
97ca70318b minor change 2014-08-11 15:29:04 +04:00
magenoxx
26d763611a [UI] Fixes #481 : removed gap and moved cards up so scrollbar doesn't hide part of the hand cards 2014-08-11 15:24:03 +04:00
magenoxx
5f040b218a Fixed #467 : changing attacker color to red 2014-08-11 14:55:32 +04:00