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

9215 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
magenoxx
eb6dc10faa [UI] Param for starting in fullscreen mode (osx only) 2014-08-11 14:39:58 +04:00
magenoxx
0e2255f71f Fixes Issue#467 : marking possible attackers with blue instead of yellow 2014-08-11 14:18:32 +04:00
magenoxx
13d80e72f1 Fixes #492 : Tarmogoyf p/t stats now also displayed in grave&exile zones 2014-08-11 13:55:07 +04:00
LevelX2
b60e224098 * Cavern of Souls - Fixed that the "spell can't be countered" effect from the mana did not work when the cavern was no longer on the battlefield while the spell was cast. 2014-08-11 10:56:24 +02:00
magenoxx
94eedd3348 Merge branch 'master' of https://github.com/magefree/mage 2014-08-11 11:10:44 +04:00
magenoxx
58e4c66af6 Fixes #492 : Tarmogoyf p/t stats are not displayed in hand 2014-08-11 11:10:27 +04:00
LevelX2
d573f5b3cf Merge origin/master 2014-08-11 08:34:32 +02:00
LevelX2
a10c30ac00 Changes to logging. 2014-08-11 08:33:53 +02:00
magenoxx
b9618a2074 removed server log 2014-08-11 10:23:49 +04:00
emerald000
58bdbb8c13 M15 Oracle changes. 
See: http://magic.wizards.com/en/articles/archive/magic-2015-update-bulletin-2014-07-17
 2014-08-11 00:44:03 -04:00
LevelX2
7992e654ff Some changes to logging and exception handling. 2014-08-11 00:56:08 +02:00
LevelX2
8c6893a8e8 Update BloodMoonTest and some updates to Tooltiptexts. 2014-08-11 00:54:46 +02:00
Dustin Conrad
177a4faf10 Will o the Wisp implemented 2014-08-10 18:36:41 -04:00
Dustin Conrad
d0392d8a12 Thought Courier implemented 2014-08-10 18:35:58 -04:00
Dustin Conrad
ca9fe44e1f Sever Soul implemented 2014-08-10 18:10:52 -04:00
Dustin Conrad
5444932ec2 Sizzle implemented 2014-08-10 17:36:59 -04:00
Dustin Conrad
fc1d54f48e Maggot Carrier implemented 2014-08-10 17:36:40 -04:00
LevelX2
f0b56c8535 Merge pull request #500 from dustinconrad/feature/KnightOfDusk 
Knight of Dusk, Recover, Trade Routes implemented
 2014-08-10 22:32:56 +02:00
Dustin Conrad
d897b9a5c4 Trade Routes implemented 2014-08-10 15:52:44 -04:00
Quercitron
294f5cfc19 * Add Tornado, Lyzolda the Blood Witch, Mental Note, Blood Knight 2014-08-10 21:36:59 +04:00
Quercitron
f93624f827 Add ability to Cost.canPay method parameters 2014-08-10 21:34:17 +04:00
LevelX2
a4866a9782 Fixed that looking in the top x cards while playing with the top card revealed shows wrongly the next card in library (fixes #487). Maybe there are some individual cards left that also need fixing. 2014-08-10 15:20:57 +02:00
LevelX2
c8fa685735 Fix for issue #493. Tests do all work, need some more checking if this really works. 2014-08-10 11:28:02 +02:00
LevelX2
80346d44da Changes to logging and NPE checks. 2014-08-10 10:56:35 +02:00
LevelX2
babbd9ff19 * Added a test for issue #493. 2014-08-10 10:56:10 +02:00
LevelX2
a98b6c602c Merge pull request #498 from dustinconrad/feature/deck-generator-null-ptr 
fix null pointer when the generated deck is all artifacts.
 2014-08-10 09:39:03 +02:00
Dustin Conrad
ed12e5d634 Recover implemented 2014-08-10 01:06:31 -04:00