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

3172 commits

Author SHA1 Message Date
Quercitron
e5b2b39701 Make order of parameters the same for methods player.damage and permanent.damage 2014-07-18 02:11:11 +04:00
LevelX2
d268642d95 * Synase Sliver, Brood Sliver - Fixed triggered ability. 2014-07-17 17:12:06 +02:00
LevelX2
020958078c Fixed end turn handling. Fixes #463 (this does not handle Time Vault correctly. It needs a skip current turn effect that's not implemented yet). 2014-07-17 15:37:48 +02:00
LevelX2
0b9b9d52f0 Fixed some objects using wrong event (END_PHASE_PRE instead of END_TURN_STEP_PRE). 2014-07-17 14:47:52 +02:00
magenoxx
4b547e7a06 javadoc fixes 2014-07-17 15:16:46 +04:00
emerald000
7218cfe9a6 [NEW] Added Time Vault, Grim Tutor and Aluren. 2014-07-16 21:25:23 -04:00
LevelX2
6238bca8e5 * Fixed a bug that if you concede a game while your turn was controlled by another player (e.g. Mindslaver) the control by the other player was still active in the next game of the match. 2014-07-17 00:41:16 +02:00
Quercitron
59c80771e9 * Earnest Fellowship - Fix protection working wrong for multicolored creatures 2014-07-17 02:27:57 +04:00
LevelX2
945284946a * Convoke - Fixed that any number od creatures could be tapped. Now only creatures will be tapped that reduce the mana costs of the convoke spell. Added log info about the with convoke tapped creatures. 2014-07-16 17:53:31 +02:00
LevelX2
e717d18b3a Added some javadoc text. 2014-07-16 08:28:44 +02:00
emerald000
7b9eb5516c [NEW] Added Breakthrough, Ill-Gotten Gains and Nether Void. 2014-07-15 22:01:42 -04:00
emerald000
219f23adc5 [NEW] Added Academy Researchers + Aura Swap fix. 2014-07-15 17:21:33 -04:00
emerald000
c3ca3cfd68 [NEW] Added Patagia Viper and Arcanum Wings 
+ Ulasht, the Hate Seed fix.
 2014-07-15 15:08:30 -04:00
magenoxx
8a9474d839 [Server] fastDbMode for starting without scanning for cards 2014-07-15 21:44:48 +04:00
LevelX2
1d8712335f * Descent into Madness - Fixed handling according the existing rules. 2014-07-15 16:58:11 +02:00
LevelX2
310347fc8b * M15 - Fixed that booster generation did also generate cards that are only included in supplemental products and not in boosters. 2014-07-15 01:08:22 +02:00
LevelX2
de47dbad43 Some formatting and change of handling of adjust methods of StackAbility. 2014-07-14 17:41:30 +02:00
magenoxx
acd6514bab Made a workaround for Issue#457 to prevent from StackOverflowError 2014-07-14 17:30:31 +04:00
LevelX2
aad8ad0871 * Not targeted selections - Fixed a but where not targeted selections did trigger the target events (e.g. Kira, Great Glass-Spinner counter ability was triggered by taping creatures for convoke ability). 2014-07-14 14:19:18 +02:00
LevelX2
943ff0d78d Some minor formattings. 2014-07-14 09:05:33 +02:00
LevelX2
12a2d020e7 * Changed handling of getting source object. Needed some change to adjust methods. 2014-07-14 09:02:06 +02:00
emerald000
7ca60078a0 Merge origin/master 2014-07-14 01:01:39 -04:00
emerald000
3a5e45cc87 [NEW] Added Gemstone Caverns. 2014-07-14 00:58:54 -04:00
LevelX2
0aa263cd55 * Transmute - Fied that transmute could be activated wrongy as instant instead of only at sorcery time. 2014-07-12 23:58:33 +02:00
LevelX2
b602be2b53 * Fixed that spells with target amount distribution did not fizzle if all their targets were illegal at resolution (e.g. Electrolyze). 2014-07-12 19:31:57 +02:00
emerald000
7b7d07fe1b [FIX] Fix SacrificeTargetCost(). 2014-07-11 12:45:00 -04:00
magenoxx
5fcc3b1ba8 [UI] Displaying playable cards in hand 2014-07-11 19:35:01 +04:00
emerald000
b7570cf28f [FIX] Minor fixes. 2014-07-11 00:00:00 -04:00
emerald000
9a26a9c50c [NEW] Added Food Chain + minor fixes. 2014-07-10 18:22:33 -04:00
LevelX2
30839b8a0a [M15] Fixed The Chain Veil and Garruk Apex Predator. 2014-07-10 23:17:17 +02:00
LevelX2
98e3fe9bde [M15] Added The Chain Veil Artifact. 2014-07-10 22:19:09 +02:00
LevelX2
810434932b * Planeswalker - Changed handling of LoyayltyAbilities to a times used based handling. 2014-07-10 08:52:21 +02:00
magenoxx
aadb89a8ef [M15] 6 black cards 2014-07-10 01:02:41 +04:00
LevelX2
9167261223 [M15] Added 6 green cards. 2014-07-09 20:44:31 +02:00
LevelX2
d40a3f591d Changes to game log. 2014-07-09 20:44:06 +02:00
Jeff
5b6bc2ea39 - Added Dusk Urchins, Hollowborn Barghest, and Hollowsage. Fixed Tormented Hero and added optional to BecomesTappedTriggered. 2014-07-08 11:45:59 -05:00
LevelX2
b4a690b402 * Reverted unintended and wrong changes to GetEmblemEffect.java. 2014-07-08 17:53:25 +02:00
LevelX2
6813ce6d14 * M15 - Added Garruk, Apex Predator and Sliver Hivelord. 2014-07-08 17:36:52 +02:00
LevelX2
08d0a3662c * M15 - Added 11 blue cards. 2014-07-08 02:15:45 +02:00
magenoxx
b6bc7c6a51 [M15] Added source to TriggeredAbility. Real fix for Genesis Hydra, works correctly now. 2014-07-07 17:44:50 +04:00
LevelX2
18e78b8294 Some fixes to M15 cards or by M15 used classes. 2014-07-06 16:00:32 +02:00
LevelX2
049744677b * Game handling - Fixed a bug that could lead to java.lang.OutOfMemoryError: Java heap space for the game worker when players left the game while choosing blocker order. 2014-07-06 07:11:45 +02:00
LevelX2
84ac387bbb * M15 - Added 13 white cards. 2014-07-05 11:57:54 +02:00
Quercitron
3fa12ee2bb * Life from the Loam - fix TargetCardInYourGraveyard: zero cards can always be chosen 2014-07-04 18:49:54 +04:00
Quercitron
b82ae7e9ab * M15 - Add 8 red cards 2014-07-04 03:35:54 +04:00
LevelX2
40d6c90438 * M15 - Added 3 white cards and Leyline of Singularity. 2014-07-04 01:11:17 +02:00
Jeff
eeec615ea0 - Added Bloodshed Fever, Cragganwick Cremator, Elemental Mastery, and Ember Gale. DiscardTargetEffect can now store the discarded card. 2014-07-03 15:50:38 -05:00
LevelX2
ad85d4e7f6 * M15 added 5 green cards. Fixed Nissan Worldeaker. 2014-07-03 17:20:18 +02:00
LevelX2
0dd96df9e3 * Fixed that in some cases the converted mana costs of spells were calculated without the value of X costs (e.g. Chalice of the Void). 2014-07-03 15:16:59 +02:00
LevelX2
6de0233f9a * M15 - Added 4 green cards, some framework changes. 2014-07-03 00:02:49 +02:00
Quercitron
41c61a5e3a * M15 - Add 7 red cards 2014-07-02 11:50:28 +04:00
LevelX2
24e1da5375 * M15 - Added 3 green cards, fixed two creatures with missing p/t. 2014-07-02 00:07:58 +02:00
Quercitron
b1097fc9da Add CanAttackAsThoughtItDidntHaveDefenderAllEffect 2014-07-01 23:21:48 +04:00
LevelX2
a6d05371d4 * Tooltip formatting of ReturnToHandChosenControlledPermanentEffect. 2014-07-01 17:31:33 +02:00
LevelX2
eb71833d87 * Added known M15 cards to mtg-cards-data.txt. Implemented the reprints + 1 card. 2014-07-01 14:42:13 +02:00
LevelX2
458ce8c1e6 * Removed general undo if playerImpl.playLand returns false. 2014-07-01 08:34:14 +02:00
LevelX2
09afaaf9ab * Prevent undo if game has already ended. Probably related to #433. 2014-06-30 17:36:09 +02:00
LevelX2
ae4c07da9d * Added some cards (not finished because land replacement effects need still some work). 2014-06-30 08:33:39 +02:00
LevelX2
0115052b81 * Fixed a bug that you can't create tournaments with AI players (Showing the "You can join a table only one time." message). 2014-06-30 01:04:29 +02:00
LevelX2
9609480109 * Cruel Ultimatum - Fixed that wrongly creatures in all graveyards could be selected. 2014-06-29 13:35:28 +02:00
Quercitron
13b8cad131 Change handling of minNumberOfTargets and required status 2014-06-29 02:45:18 +04:00
LevelX2
1129858a6c * Added 6 cards. 2014-06-28 17:57:11 +02:00
LevelX2
53964ee80c * Phyrexian Unlife - Fixed that damage from a combat damage step was not handled as if all damage was dealt at once. This could cause a wrong mix of damage and poison conters. 2014-06-28 10:30:47 +02:00
LevelX2
2406faec63 * Flashback - Fixed that costs reduction and increasement works correctly for flashbacked spells. 2014-06-27 15:59:18 +02:00
LevelX2
d84076ba40 * Added 28 cards from Vintage Masters. 2014-06-27 13:41:28 +02:00
LevelX2
d951d620d0 * Vintage Masters - 17 cards. 2014-06-26 10:38:21 +02:00
LevelX2
5c562e26d7 Merge origin/master 2014-06-26 02:10:22 +02:00
Quercitron
bba23e05cb Fix handling of multiple simultaneous control changing effects 2014-06-26 03:30:05 +04:00
LevelX2
d337e2cc13 * Some changes to logging. 2014-06-25 17:17:17 +02:00
LevelX2
abc441a4ba * Added rough Vintage Masters bonus card booster generation. 2014-06-25 12:29:32 +02:00
LevelX2
c519814f03 * Vintage Masters - Added set and already implemented cards. 2014-06-25 10:37:07 +02:00
LevelX2
513b012dc0 * Fixed draw handling. Fixed concede handling. Fixed message generation for game end view. Added some debug messages. 2014-06-25 01:34:11 +02:00
LevelX2
5ae1f6306b * Target - Setting required to false if minNumberOfTargets = 0. Fixed bug with Kruphix’s Insight. 2014-06-25 01:32:01 +02:00
LevelX2
fc95ef68f1 * Conspiracy - Added Conspiracy set to XMage. Changed order of sets in deck editor set selector. 2014-06-23 15:58:07 +02:00
LevelX2
db68d881da * Banshee's Balde, Five-Alarm Fire, Descendant of Kiyomaro - Fixed that the combat damage triggered ability triggered multiple times if damage was dealt to multiple creatures instead of correctly only once per dealing creature and combat damage step. 2014-06-23 09:37:22 +02:00
LevelX2
8388225f90 * Gifts Ungiven - Fixed that always have to be selected 4 cards instead up to 4 cards. 2014-06-23 01:31:05 +02:00
LevelX2
4e06f60f76 * Umezawa's Jitte - Fixed that combat damage triggered ability triggered wrongly multiple times, if damage of equipped create was dealt to different creatures. 2014-06-23 01:29:21 +02:00
LevelX2
ea9fe5df55 * Signal Pest - Fixed that Signal Pests restriction effect did not work always if more than one Signal Pest was in the game. 2014-06-22 19:51:13 +02:00
LevelX2
acd960343b * Alternative casting costs - Added a check if costs can't be paid to don't ask player for usagage. 2014-06-22 18:26:55 +02:00
LevelX2
8a12fa9b01 * Fixed a bug of TargetCardInHand class, that could lead to game locked down situations (e.g. Force of Will). 2014-06-22 18:26:06 +02:00
LevelX2
2aeb61b2e6 * Minor fixes to Morph tootip generation. Minor changes to other framwork classes. 2014-06-21 15:54:49 +02:00
LevelX2
5f7784602a Fixed possible NPE of AddManaOfAnyColorEffect. 2014-06-20 20:44:10 +02:00
LevelX2
10f6cbc2d5 Some formatting. 2014-06-20 19:26:27 +02:00
LevelX2
d27540a502 * Court Hussar, Azorius Herald fixed mana was spent condition for permanents. Batwing Brume - Fixed both triggered effects that did not work correctly. 2014-06-20 19:26:15 +02:00
LevelX2
7d2b1c076a * Combat - Creatures forced to attack can no longer be removed from attack by using the undo button (e.g. Bident of Thassa). 2014-06-20 14:19:03 +02:00
LevelX2
e51213a72a Some formatting, NPE checking and log messages. 2014-06-20 08:25:03 +02:00
LevelX2
c08d266fce * Added reference for Kithkin Token. 2014-06-20 00:47:01 +02:00
LevelX2
bbf34f90da * Descendant of Kiyomaro - Saved a casting exception of triggered ability. 2014-06-20 00:46:29 +02:00
Quercitron
aa606a1d3c * Search in library -- Set required status depending on whether searched cards have stated quality (rules 701.15b, 701.15d). 2014-06-19 02:58:29 +04:00
LevelX2
ab3386ac25 * Commander - Fixed that commander could not be cast from command zone by using flash. 2014-06-18 15:04:31 +02:00
LevelX2
ada0fb15db * Mana Bloom - Fixed a bug that returing it to hand did not work correctly. 2014-06-18 13:59:31 +02:00
LevelX2
9bd7bbd661 * Fixed some problems with card search in library and cancel button (Primecal Titan). 2014-06-18 08:42:32 +02:00
LevelX2
30cfe6193e * Commander - Fixed commander mulligan select card to exile can't stop bug. 2014-06-18 08:41:09 +02:00
LevelX2
5bc1036ef9 * Stoneforge Mystic - Fixed that for the second effect the artifact had wrongly be selected already during activation instead of resolution. 2014-06-16 21:46:22 +02:00
North
a397dd05f6 [refactor][minor] simplified if experssion (removed always true condition) 2014-06-16 17:15:44 +03:00
North
66faa3006d [refactor][minor] removed redundant set for effectType in copy Constructor 2014-06-16 17:15:04 +03:00
LevelX2
04fa2e0b0c Added Necropotence. 2014-06-16 15:32:51 +02:00
LevelX2
2c85c54b9f * Hideaway - Fixed a bug that the last returned card was put to the top instead of the bottom of the library. 2014-06-15 23:10:42 +02:00
LevelX2
adcbcc75f7 * Fixed NPE in TargetImpl. 2014-06-15 19:05:58 +02:00
Quercitron
e74dc249bc Fix Scry effect 2014-06-15 19:24:26 +04:00
Quercitron
9629c3f0f5 Modify implementation of Target's required status 2014-06-15 19:23:30 +04:00
LevelX2
83c3f92241 * Reanimate - Fixed a problem that abilities of cards brought to battlefield from opponents graveyards did act as if controller would be the owner of the card. 2014-06-15 11:15:37 +02:00
LevelX2
ba885fef91 * Ground Seal - Fixed a problem, that cards that need to target cards in graveyard caused a game lock, if ground seal was on the battlefield. 2014-06-15 11:14:08 +02:00
LevelX2
36ebe56b7f * Undo of mana abilities - Fixed a problem that caused that undo was not done properly (e.g. filterlands (Flooded Grove), Nykthos, Shrine to Nyx, Grinning Ignus, Oppressive Rays, Propaganda). 2014-06-14 12:23:02 +02:00
LevelX2
26297a0b22 * Fixed bug that prevents to use Undo (introduced with a recent commit). 2014-06-14 10:11:08 +02:00
Quercitron
a0fb5bfe22 Merge branch 'master' of https://github.com/magefree/mage 2014-06-13 17:14:56 +04:00
LevelX2
48f149c549 * LogName - Changed some more messages to use the logName instead of name. 2014-06-13 15:09:06 +02:00
Quercitron
f9fc2246e8 Remove unnecessary set of required status with setRequired method 2014-06-13 16:35:31 +04:00
LevelX2
2305cc5274 * LogName - Changed some more messages to use the logName instead of name. 2014-06-13 14:02:56 +02:00
Quercitron
0a0983d7e9 Remove explicit set of required property in constructor 2014-06-13 15:15:16 +04:00
Quercitron
250909a464 Make required status of target based on the type of ability 2014-06-12 23:35:56 +04:00
LevelX2
c0aa97802e * Triggered abilities - Fixed a bug that triggered abilities triggered not at the correct time but too late. 2014-06-12 21:09:59 +02:00
LevelX2
b964758325 * Game log - added move message for permanents moved to graveyard by state based effects. Some formatting. 2014-06-12 17:48:55 +02:00
LevelX2
ec65c89267 Some minor changes. 2014-06-12 08:28:08 +02:00
LevelX2
42a7da9132 * Log messages -Some more changes to handle message of targets without names (Morph) and targetlists that contain 0 targets. 2014-06-10 17:51:21 +02:00
LevelX2
c077a17d86 * Skullsnatcher - Fixed a bug that only one card could be exiled (was located in ExileTargetEffect only supporting one target, so other cards could be affected as well). Some formatting. 2014-06-10 17:49:11 +02:00
LevelX2
78f6e28f33 * TargetNonBasicLandPermanent - Fixed a bug that nonland permanents could be targeted. Made Target by default required. 2014-06-10 17:46:48 +02:00
LevelX2
678b9acbf0 * Made targets mandatory (1333 cards). 2014-06-10 00:15:38 +02:00
LevelX2
d244551e3b * Added Morph ability. 2014-06-09 17:53:55 +02:00
Plopman
1d0cfaefab Added Snow Mana Cost 2014-06-07 19:00:46 +02:00
LevelX2
e2373a709b * Lightning Greaves - Fixed that equiped creature did not get shroud ability. 2014-06-06 19:00:43 +02:00
Plopman
ebb86e199b Added Future Sight. 2014-06-06 14:20:59 +02:00
Plopman
0b880ae2b8 Added Choose color effect 2014-06-06 14:19:27 +02:00
Plopman
390b3d97b8 Fixed cascade. Cards were not put back in library 2014-06-06 14:18:48 +02:00
LevelX2
53b8f1977a * Fixed more possible endless loops of while iterations not ending if a asked player left game. 2014-06-05 23:18:39 +02:00
North
aba725bb17 [refactor][minor] improved generics usage in ContinuousEffectsList 2014-06-03 13:28:27 +03:00
North
626273013b [refactor] removed generic parameter from FilterStackObject 2014-06-03 12:45:42 +03:00
North
782518f336 [refactor] removed generic parameter from PermanentImpl 2014-06-03 12:42:55 +03:00
North
bb7de19d7b [refactor] removed generic parameter from BasicLand 2014-06-03 12:42:40 +03:00
North
9324e93868 [refactor] removed generic parameter from Game classes 2014-06-03 12:33:02 +03:00
North
4fd248c4f8 [refactor] removed generic parameter from remaining Abilities 2014-06-03 12:07:21 +03:00
North
a2e086a152 [refactor] removed generic parameter from Phase 2014-06-03 11:47:04 +03:00
North
c5c23fac1a [refactor] removed generic parameter from Step 2014-06-03 11:45:42 +03:00
North
1867a150c1 [refactor] removed generic parameter from Player 2014-06-03 11:19:49 +03:00
North
99854be1fb [refactor] removed generic parameter from remaining Effect classes 2014-06-02 22:53:49 +03:00
North
e2c7fdf121 [refactor] removed generic parameter from Cost 2014-06-02 22:30:01 +03:00
North
a6f1bc7f00 fixed build 2014-06-02 22:24:29 +03:00
North
5f83ddf5ba [refactor] removed generic from remaining Target classes 2014-06-02 21:53:34 +03:00
North
371918467f [minor] fixed rawtype warning in CardInfo 2014-06-02 21:44:25 +03:00
North
1cc42a7cbb [refactor] removed generic parameter from SplitCard 2014-06-02 21:43:59 +03:00
North
0b3cbdecb1 removed main method from ObjectColor 2014-06-02 21:18:42 +03:00
North
c925b649b3 [refactor] removed generic parmaeter from LevelerCard 2014-06-02 21:17:27 +03:00
North
14fa5b0f57 [refactor] removed generic parmaeter from CardImpl 2014-06-02 21:15:53 +03:00
North
8679e2b3d7 [refactor] removed generic parameter from MageObjectImpl 2014-06-02 21:00:56 +03:00
North
82a45cee88 [refactor] removed generic parameter from Target 2014-06-02 16:06:05 +03:00
LevelX2
7af040e70b * Batterskull - Fixed effect handling so that the Germ token no longer dies before the equipment from living weapon is attached. 2014-06-02 15:03:14 +02:00
LevelX2
7198804796 * Game log - Some minor changes to card move game log messages. 2014-06-02 14:58:06 +02:00
North
c5f7db441e [refactor] removed generic parameter from Effects 2014-06-02 13:12:58 +03:00
North
4403934163 [refactor] removed generic parameter from Ability 2014-06-01 20:44:47 +03:00
North
e43bc35c14 [refactor] removed generic parameter from Spell 2014-06-01 11:58:22 +03:00
LevelX2
289412bbc0 Added 8 cards, some fixes, some formating. 2014-06-01 01:23:29 +02:00
LevelX2
ab721bc1c2 Added can cast cards from graveyard flag to player. 2014-05-31 22:15:52 +02:00
North
86a6251997 deleted commented out code 2014-05-31 22:07:50 +03:00
North
6836fcd610 removed MageObjects (unused) 2014-05-31 22:07:35 +03:00
North
4af606883e [refactor] removed generic parameter from Watcher 2014-05-31 22:02:15 +03:00
North
0cc5308100 [refactor] removed Watcher interface and renamed WatcherImpl to Watcher 2014-05-31 19:35:21 +03:00
North
9a9567c359 [refactor][minor] removed redundant parameter when creating counters with count = 1 2014-05-31 19:14:10 +03:00
North
ca1af753eb [refactor] removed BoostCounter implementations 2014-05-31 18:43:05 +03:00
North
2d102349fd [refactor] deleted Counter implementations (except BoostCounter) 2014-05-31 18:17:51 +03:00
North
519754a96c [refactor] removed dependency to Counter implementations (except BoostCounters) 2014-05-31 17:48:04 +03:00
North
545e4298b7 [refactor] removed generic from Counter 2014-05-31 17:11:11 +03:00
LevelX2
da3936abfb Fixed tooltip text of Resistance Fighter, Crimson Hellkite and Maze of Ith. 2014-05-31 11:06:07 +02:00
LevelX2
90d516f15d * Stromgald Cabal - Fixed that he could counter blue spells instead of correctly white spells. 2014-05-31 10:48:03 +02:00
LevelX2
4fec6e4d7b Made some targets required. Added message to replacement effect of Cavern of Soul to inform player being not able to counter. 2014-05-30 22:46:26 +02:00
LevelX2
94d8ff554f Fixed some tooltip texts and display of choosen color in tooltip. 2014-05-30 21:21:17 +02:00
LevelX2
99a60c3063 * Progenitor Mimic - Fixed a bug that the every turn created token did not trigger "enters the battlefield" tiggers that checked for specific attributes. Added Test for that. 2014-05-30 20:26:30 +02:00
LevelX2
1ae85dc1b4 Some minor formatting. 2014-05-30 18:39:32 +02:00
LevelX2
0e71ac5e53 * Tournament handling - Fixed player handling for swiss tournament. No more quit sound or stat eif player already finished the tournament correctly. 2014-05-30 15:43:59 +02:00
LevelX2
95b9507c0c Added missing change of Flashback - cost modification fix. 2014-05-30 15:03:06 +02:00
LevelX2
83be13a68b * Flashback - Fixed that cost midification effects was applied twice for flashbacked spells. 2014-05-29 16:42:27 +02:00
LevelX2
5c1ffb5942 Some changes to game log messages. 2014-05-29 10:56:16 +02:00
LevelX2
2d7c9a0e1f * Hideaway - Fixed that the hidden card stayed wrongly in face down state as it was played. 2014-05-29 10:50:05 +02:00
LevelX2
8bd3109c87 * Fixed some game locking loops if a player concedes while resolving an effect (e.g. Scry, Discard). Some changes to game log for info about moving cards to library. 2014-05-29 10:27:52 +02:00
LevelX2
dad109b88e * Control player - Fixed the phase names shown to the controlled player (fixes #415). 2014-05-28 17:29:04 +02:00
North
b456770e9c now multiple client instances are supported 2014-05-28 07:46:38 +03:00
LevelX2
944bebbe16 Fixed a spelling error on the shuffle info message. 2014-05-28 01:04:35 +02:00
LevelX2
c13f7a2115 * Mana pool handling - Fixed bug where wrong playerId was used. Fixed that menu check state is the same for all GamePanles of client. 2014-05-27 16:54:38 +02:00
LevelX2
d9e4e99a0f Some changes to manual mana pool handling. 2014-05-27 08:37:16 +02:00
LevelX2
a15deab99d Fixed canPlay method to care abou alternate casting costs. 2014-05-26 16:59:06 +02:00
LevelX2
63208c33ed Fixed canPlay method to care abou alternate casting costs. 2014-05-26 16:58:49 +02:00
Quercitron
b007242761 Fix mulligan process (rule 103.4) 2014-05-26 03:21:14 +04:00
LevelX2
2652316421 Some changes to handling of triggered effects and player response. 2014-05-25 13:53:32 +02:00
North
dbc066c998 [refactoring] removed generic from TargetCreaturePermanent 2014-05-24 22:40:35 +03:00
LevelX2
0443311f0e Fixed some handling problems of triggered abilities. 2014-05-24 21:10:56 +02:00
LevelX2
b572e8c7d6 Some changes to prevention effects. 2014-05-24 19:21:33 +02:00
LevelX2
969aca4b2c Merge origin/master 2014-05-24 19:19:45 +02:00
LevelX2
7fc072f467 * Fixed a bug that effects where applied to early and often (e.g. dying creature during combat damage step raised Nighthowlers tougness, so he survived lethal damage). 2014-05-24 19:19:08 +02:00
North
b97af752a6 Merge remote-tracking branch 'origin/db-change' 2014-05-24 18:43:00 +03:00
LevelX2
71fb7bf25b Added context menu to switch between manual and automatic usage of the mana in mana pool. Manual usage is done by clicking on the mana symbol in the player panel. Still some fine tuning to do. 2014-05-24 02:56:35 +02:00
Quercitron
90756d1e5e Add EachOpponentLosesYouGainSumLifeEffect 2014-05-23 23:49:39 +04:00
Quercitron
613a71393e Add LookAtTargetPlayerHandEffect 2014-05-23 23:48:58 +04:00
Quercitron
e8a8bcec2c Add TapLandForManaAllTriggeredAbility 2014-05-23 23:48:40 +04:00
Quercitron
d7489789d9 Add TurnId to GameState (for Final Fortune card) 2014-05-23 23:48:13 +04:00
LevelX2
19ccd5bc23 * Asceticism - Fixed a bug that no real Hexproof ability was gained (this fixed the problem with the failing PhantasmalImageTest). 2014-05-23 16:06:35 +02:00
LevelX2
90f4c2ea05 SetPowerToughnessAllEffect - Fixed a bug that the effect did not work correctly for static abilities. 2014-05-23 08:28:14 +02:00
Plopman
ad93de847a Added depletionCounter 2014-05-22 18:26:58 +02:00
North
d3046a9a0d changed DB from SQLite to H2 2014-05-22 17:53:13 +03:00
LevelX2
e83ca77b13 * Tezzeret, Agent of Bolas - Fixed that the second ability did overwrite all already existing abilities of the target artifact. 2014-05-22 16:26:21 +02:00
LevelX2
0d8325bc79 Fixed that if a creature get attached to an object (e.g. because equipment becomes a creature), it gets unattached. 2014-05-22 16:25:22 +02:00
LevelX2
b4903488b6 Added SetPowerSourceEffect. Some changes to SetPTSourceEffect calsses. 2014-05-21 08:35:19 +02:00
Quercitron
357308a265 [6ED] Add 4 cards 2014-05-19 13:03:41 +04:00
Quercitron
225118a585 Add ModeChooser to Modes (rule 700.2d) 2014-05-19 13:02:31 +04:00
Quercitron
02b1b0f3f6 Add SpellsCostIncreaseEffect 2014-05-19 13:00:30 +04:00
Quercitron
95863a43f6 Add onlyCombat parameter to PreventDamageByTargetEffect and PreventDamageToTargetEffect effects 2014-05-18 17:00:00 +04:00
LevelX2
e484da4028 Small text change to commander info. 2014-05-18 11:06:11 +02:00
LevelX2
2fdc9498fe Merge origin/master 2014-05-18 09:49:34 +02:00
LevelX2
9fef18af99 Increased card repository version for 2014-10-05v2 dev release. 2014-05-18 09:48:44 +02:00
Plopman
af81914d74 Fixed ReturnToHandChosenControlledPermanentEffect text 2014-05-17 19:14:36 +02:00
LevelX2
da1b8df87d Added 6 cards. 2014-05-17 19:02:04 +02:00
LevelX2
d0e22d48d9 [MIR] Added 7 lands. 2014-05-17 19:01:35 +02:00
LevelX2
20f61b6c79 Fixed bug in game log (combat). 2014-05-17 18:13:44 +02:00
Quercitron
249c9f09ed Add numberCardsToDiscard parameter to DiscardCardYouChooseTargetEffect 2014-05-17 16:17:02 +04:00
Quercitron
f7f67713ef Add RevealHandTargetEffect 2014-05-17 16:13:24 +04:00
LevelX2
d6acd43724 Added 7 cards. 2014-05-17 12:06:35 +02:00
Quercitron
8f2d3d8655 Add PreventAllDamageToAndByAttachedEffect 2014-05-16 02:15:07 +04:00
LevelX2
76402133ab Fixed CantCastMoreThanOneSpellEffect. 2014-05-15 23:04:16 +02:00
LevelX2
5a0a080441 * Eidolon of Rhetoric - Fixed not working cast restriction. 2014-05-15 17:07:31 +02:00
Quercitron
777e25b586 [6ED] Add 5 cards 2014-05-15 02:33:26 +04:00
Quercitron
ebf4c5ba57 Add ReturnToBattlefieldUnderOwnerControlAttachedEffect 2014-05-15 02:29:26 +04:00
LevelX2
ce01d8cf25 * P/T defining static abilities - Fixed that the P/T is also set for the card if it's not a permanent (e.g. fixes that targeting a Nighmare with Margue Burst did always no damage). 2014-05-14 16:17:29 +02:00
LevelX2
d89970afde Some minor formatting. 2014-05-14 16:14:09 +02:00
LevelX2
4ccc85573f * Grand Abolisher - Fixed missing tooltip text. 2014-05-14 00:15:53 +02:00
LevelX2
7ae6054c1e * Added missing changes to commit 06eaa5ab99. 2014-05-13 19:26:51 +02:00
LevelX2
5cc9e22bd5 Fixed token image handling for Rat token. 2014-05-12 15:30:55 +02:00
LevelX2
765652b74b * Iroas, God of Victory - Fixed a bug that all damage to controlled creatures was prevented instead only to attacking creatures you control. 2014-05-12 08:43:24 +02:00
LevelX2
06eaa5ab99 * Added possibility for continuous layer effects to add static abilities (e.g. Flash) to non static cards. 2014-05-11 20:48:11 +02:00
LevelX2
2a2c817d8e * Venser, Shaper Savant - Fixed a bug that only creatures could be targeted. 2014-05-11 20:41:22 +02:00
LevelX2
bfa0922dc2 * Epic - Added info message that player can't cast spell because of Epic effect. 2014-05-11 20:40:02 +02:00
LevelX2
e93cd580dd * Fixed that player turn counter was not reset if game was reset (e.g. Karn Liberated). 2014-05-10 18:21:22 +02:00
LevelX2
8e56d06121 * Geju of the Fiels, Raging Ravine fixed that the given triggered ability was wrongly only given one time instead as often the activated ability was used. 2014-05-10 18:01:41 +02:00
LevelX2
8a4474fadc * Evoke - Fixed that the check if creature came into play with evoke was always true if it came again to play later when it was evoked before. 2014-05-10 17:05:52 +02:00
LevelX2
29c7354bb4 * Fixed some bugs in damage prevention handling. 2014-05-10 11:34:11 +02:00
Quercitron
b746bf108a [6ED] Add 4 cards 2014-05-10 03:35:42 +04:00
Quercitron
ef571dc00f Add PreventDamageSourceEffect 2014-05-10 03:29:08 +04:00
LevelX2
89aa727e05 Some minorlog changes. 2014-05-07 21:44:53 +02:00
LevelX2
6b1e52d094 Made a change to the event handling to get Undying to work. 2014-05-07 01:30:39 +02:00
LevelX2
9364616517 * Fix to handle returning effects correct if multiple objects return at the same time (e.g. two creatures with evolve return from exile because two Banisher Priests die by damage to all effect). (not complete finished yet, because Undying test does not run without error). 2014-05-06 17:51:37 +02:00
LevelX2
f676bd1650 Increased card repository number for new dev release. 2014-05-03 02:50:51 +02:00
LevelX2
7318ecb50e Tournament handling - small change to check who to eliminate. 2014-05-03 02:48:24 +02:00
LevelX2
15e3fd906e Added Ashling the Pilgrim, Reset and Flash of insight. 2014-05-02 19:14:59 +02:00
LevelX2
3b3f136d34 Spells on the stack can now get counters. 2014-05-02 16:45:26 +02:00
LevelX2
13ac2d0103 Tournament panel - Showing the number of rounds now only if tournament is swiss style tournament. 2014-05-02 09:32:51 +02:00
LevelX2
473c9e207b Fixed (probably) the player1 concedes but other player2 wins. Fixed that if player runs out of timer time or player lose of beeing idle, the match will end correctly. 2014-05-01 19:34:52 +02:00
LevelX2
286a65878d Changed layer of GainAbilityControllerEffect to player effects. 2014-04-30 17:38:19 +02:00
LevelX2
f137e623eb Changed DontLoseByZeroOrLessLifeEffect to RulesEffect layer. 2014-04-30 17:29:55 +02:00
LevelX2
5d897ac321 Added some handling for X costs of flashback ability. 2014-04-30 17:17:00 +02:00
LevelX2
367dd0b228 Fixed a bug that spells with alternative costs are written to the game log as if the alternative cost was always used. 2014-04-30 17:15:34 +02:00
LevelX2
c143a6159d Added game log info about playing extra phase. 2014-04-30 17:14:23 +02:00
magenoxx
e82bc6e671 Added exception and error handling for game worker 2014-04-30 16:41:52 +05:30
LevelX2
915651335a Fixed that in tournament a automatically generated deck will be submitted if player doesn't submit a deck in time (fixes #421). 2014-04-29 17:32:24 +02:00
LevelX2
5869f77f0c Added DiscardHandTargetEffect, some additions to game log messages. 2014-04-29 13:47:59 +02:00
LevelX2
2ab18b77a6 Changed log message about player who takes first turn. 2014-04-28 17:08:34 +02:00
LevelX2
c875b764a0 Some minor formatting for extisting cards. 2014-04-28 14:55:06 +02:00
LevelX2
718c220471 Added KinshipAbility. 2014-04-28 14:54:43 +02:00
magenoxx
aae97e0f32 Minor change 2014-04-28 15:56:42 +05:30
magenoxx
7740cc6f66 Made loading cards more verbose (Issue#423) 2014-04-28 15:43:14 +05:30
LevelX2
60838ec386 Added Sakura-Tribe Scout. 2014-04-28 00:06:54 +02:00
LevelX2
3e791a4802 * Ragemonger - Fixed that cost reduction did not work for hybrid mana. 2014-04-27 18:58:35 +02:00
LevelX2
b4dcddd0a9 * FlashbackAbility - Fixed that for flashbacked spells additional optional costs did not work (e.g. Buyback, Replicate, Kicker). 2014-04-27 16:06:07 +02:00
LevelX2
b540f97755 Added Replicate ability. 2014-04-27 14:34:06 +02:00
Quercitron
db68a827ce Fix possible permanent targets for ability that does not target. 2014-04-27 15:44:00 +04:00
LevelX2
7e6c1ede2a * Ad Nauseam - Fixed log output of revealed and moved cards. 2014-04-26 18:40:32 +02:00
LevelX2
d7a8bd64e2 * Phyrexian Unlife - Fixed that the first ability is a continuous effect instead wrongly a replacement effect. 2014-04-26 18:35:37 +02:00
LevelX2
63a083ef0d * Mortal Obstinacy - Mortal Obstinacy was not sacrificed as the triggered effect was used. Decision to sacrifice Mortal Obstinacy takes place now during resolution instead of while ability goes to stack. 2014-04-26 10:39:45 +02:00
LevelX2
ba35f397b0 Fixed a bug in reworked prevention function. 2014-04-25 22:17:19 +02:00
LevelX2
61add5ab5b Fixed ReturnFromExileEffect, some formatting. 2014-04-25 19:27:08 +02:00
magenoxx
27dbcf2d6c Unhinged lands (Issue#416) 2014-04-25 18:10:33 +05:30
LevelX2
ec692902c7 * Training Grounds - Fixed bug that locked the game if activated ability of own creature had no mana costs. 2014-04-25 12:10:57 +02:00
LevelX2
300081d302 Some more rework for prevention effects. 2014-04-25 11:30:54 +02:00
LevelX2
b57b91150b Some more rework of prevention effects. 2014-04-24 16:39:03 +02:00
LevelX2
64e0b4d1b9 * BestowAbility - Fixed that Bestow creatures didn't revert back to creatures, if the enchanted creature left battlefield. Bug introduced with last fix to bestow ability. 2014-04-24 00:26:27 +02:00
LevelX2
81e396555c Handling preventon effects more improved. 2014-04-23 20:51:21 +02:00
LevelX2
e2517264b1 More rework to handling of prevention effects. Some more framework effects created. 2014-04-23 17:15:18 +02:00
LevelX2
60b6af4766 MOved some discard effects to specific package. 2014-04-23 12:44:37 +02:00
LevelX2
712eac2b3d * Added image download source with HQ images (mtgImage). 2014-04-22 17:20:35 +02:00
LevelX2
35b1e776d2 * Banisher Priest - Fixed that the return from exile effect was added to the list of triggered abilities the player has to choose the order for. 2014-04-22 15:13:58 +02:00
LevelX2
e0ce6df6b3 * BestowAbility - Fixed a problem that bestow cards that was put onto the battlefiedl as Auras were affected by abilities that should only affect creatures (e.g. Imposing Sovereign). 2014-04-22 15:12:14 +02:00
LevelX2
772c4f5edd Increased card repository version. 2014-04-20 23:52:50 +02:00
LevelX2
9f2570bf66 Minor formatting. 2014-04-20 23:47:48 +02:00
LevelX2
c40fa87674 Started reworking handling prevention effects. 2014-04-20 09:49:29 +02:00
LevelX2
a9419b4977 * Mangara of Corondor - Fixed that it's own exile itself effect only works, if Mangara is still on the battlefield. 2014-04-19 16:25:00 +02:00
LevelX2
cb15aecb06 * Slaughter Games, Counterflux, Surpreme Verdict - Fixed not working "Can't be countered ability (fixes #413). 2014-04-19 10:58:23 +02:00
LevelX2
cdecd516a2 * Bestow ability - Fixed that bestow could be cast with instant timing. 2014-04-19 03:13:12 +02:00
LevelX2
4c274d7fb8 [JOU] set back booster rarity distribution to default. 2014-04-18 23:38:45 +02:00
LevelX2
c1fdd37ee4 Some minor fixes and changes to framework and some cards. 2014-04-18 18:21:17 +02:00
LevelX2
b2eb3a350e Some minor fixes and changes to framework. 2014-04-18 17:31:17 +02:00
LevelX2
eeee6df026 Some minor fixes and changes to framework and some cards. 2014-04-18 16:04:08 +02:00
LevelX2
0e229fd22a Some minor fixes and changes to framework and some cards. 2014-04-18 14:16:42 +02:00
LevelX2
bddbd03d9f [JOU] Some fixes to card numbers. 2014-04-18 11:39:45 +02:00
LevelX2
6d89011e47 [JOU] Added 6 cards. Fixed some bugs for JOU cards. 2014-04-17 16:40:18 +02:00
LevelX2
4e53ff73ea Improved sorting of tables and matches. 2014-04-17 16:39:19 +02:00
LevelX2
6e28320493 Fixed some bugs in game log for combat information. 2014-04-17 16:38:39 +02:00
LevelX2
92ecc766e9 Added message to game log if a player redirects damage to a planeswalker. 2014-04-17 16:37:28 +02:00
LevelX2
959d55fef2 [JOU] Added 9 cards. Fixed some bugs of JOU cards. 2014-04-16 17:38:41 +02:00
LevelX2
fc56b8bc88 Removed info option from ReturnFromGraveyardToHand, info is always written to log. 2014-04-16 17:38:00 +02:00
LevelX2
fb145b2811 [JOU] Added 2 cards and made some fixes to JOU cards. 2014-04-16 01:41:41 +02:00
LevelX2
5410e10581 Added CantAttackUnlessDefenderControllsPermanent effect. 2014-04-16 01:40:39 +02:00
LevelX2
f9a22291d4 [JOU] Added 6 cards. 2014-04-15 17:39:21 +02:00
LevelX2
d53a3245d6 Changes to connect messages, added some debug messages to narrow down server user handling bug. 2014-04-14 23:11:34 +02:00
LevelX2
56056170e0 [JOU] Added 11 cards. 2014-04-14 15:25:27 +02:00
LevelX2
db3d40b7a6 Minor change to game logging. 2014-04-14 08:32:59 +02:00
LevelX2
c6f771f2b7 * Countersqall - Fixed that spell controller did not lose the 2 life (fixes #410). 2014-04-13 09:36:01 +02:00
LevelX2
b829ad499e * Tournament play - Player state set to "Eliminated" as soon as he lost a match in an elimination tournament. Points for a Bye for player are shown immediately. Players finishing the last round are set to Finishedinstead of wating for next round. 2014-04-13 02:04:43 +02:00
LevelX2
1155cf2049 * Wrench Mind - Fixed a bug that locked the UI while discarding. 2014-04-12 23:27:16 +02:00
LevelX2
bc0bd754dd * Some changes to tooltip texts. 2014-04-12 22:23:46 +02:00
LevelX2
46d124a9d4 * Tournament play - Fixed that player match time was not reset at the begining of a new tournament round. 2014-04-12 18:16:16 +02:00
LevelX2
1074de604a Updated CardRepository number for next dev version. 2014-04-12 18:13:33 +02:00
LevelX2
48b644d9e2 * Toxic Deluge - Fixed that the x costs were not calculated corectly. 2014-04-11 21:10:23 +02:00
LevelX2
5c54bd6d7f [JOU] Added 12 cards. 2014-04-11 15:15:53 +02:00
LevelX2
a5f69e584c * Tezzeret the Seeker - Fixed a bug that the X ability could only search for artifacts with exactly X converted mana costs instead of X or less (fixes #407). 2014-04-11 10:57:46 +02:00
LevelX2
f23af4406b [JOU] Added Spirespine and Sightless Brawler. 2014-04-10 18:09:49 +02:00
LevelX2
6d2499e52f Finished Godsend. 2014-04-09 00:27:35 +02:00
LevelX2
0883ceeff5 [JOU] Added 11 cards. 2014-04-08 16:29:58 +02:00
LevelX2
8dcc0050b7 Added Mystical Teaching 2014-04-08 00:01:36 +02:00
LevelX2
2e0e470333 [JOU] Added Heroe's Bane and some fixes to other JOU cards. 2014-04-07 19:14:27 +02:00
LevelX2
7ba0102415 Merge origin/master 2014-04-07 18:06:59 +02:00
LevelX2
75c67644bc [JOU] Added 9 cards. 2014-04-07 17:14:55 +02:00
LevelX2
5d201ecd02 Added Constellation and Strive AbilityWords. 2014-04-07 15:41:04 +02:00
LevelX2
38f922a200 * Bestow - Fixed a bug that casting a bestow creature as enchantment aura triggered enteres the battlefield events as creatures (e.g. triggering evolve). 2014-04-07 13:44:15 +02:00
LevelX2
f77e709f6b * Neightveil Spector - Fixed a bug that casting with the Spector exiled Enchantment Auras were not handled correctly. 2014-04-07 00:03:41 +02:00
LevelX2
126d628d63 Added Infernal Tudor, Hanna Ships Navigator, Hazezon Tamar. 2014-04-06 17:26:54 +02:00
LevelX2
93b968d92a * Desecration Demon - Made AI not using the sacrifice ability any more. 2014-04-06 17:24:44 +02:00
North
7f2a2ca0a3 removed dependency to trove4j (only used in DeckBuilder) 2014-04-05 21:55:35 +03:00
LevelX2
f49235a34f * Suspend - Fixed that cards with suspend but without costs (e.g. Living End) could be cast for no costs (without Suspend). 2014-04-05 16:18:43 +02:00
LevelX2
6a827fcce8 * Echo ability - Fixed that echo had not to be paid if permanent came into play by other abilities (e.g. Living End). 2014-04-05 16:17:33 +02:00
LevelX2
a4f73a9fde * Golgari Thug - Fixed that card in graveyard was not a mandatory target. 2014-04-05 03:13:27 +02:00
LevelX2
5af7a444d3 * Some formatting. 2014-04-05 02:52:56 +02:00
LevelX2
2d4b1a4619 * Some formatting and a additional Cloudshift test. 2014-04-05 02:52:24 +02:00
LevelX2
d031b93fd4 * Fixed a bug that prevented most continuous effects from recognizing if a permanent made zone changes and so the permanent was considered as a valid target even if the permanent changed zones (e.g. was Cloudshifted). 2014-04-05 02:51:11 +02:00
LevelX2
042552aa1e * Sacrifice cost - Fixed a bug that made wrongly sacrificing invalid, because sacrificed permanent did not go to graveyard (e.g. Rest in Peace in play). 2014-04-05 02:46:21 +02:00
LevelX2
816812f695 * Dredge - Added log info about a successful dredge action. 2014-04-05 02:44:27 +02:00
LevelX2
cefd33b2f1 * Soulbound - Added log info about a successful soulbound action. 2014-04-05 02:44:06 +02:00
LevelX2
87dd02ecfc Added Darien, King of Kjeldor, Captain Sisay, Howltooth Hollow, Blackmail, Cao Cao, Lord of Wei and Diaochan Artful Beauty. 2014-04-04 16:44:19 +02:00
LevelX2
73885ab01d * Iona, Shiel of Emeria - Added choice information to card tooltip. 2014-04-04 08:39:19 +02:00
LevelX2
84f25d72d3 Fixed a possible problem with continuous effect and Mage Singletons. 2014-04-03 15:08:07 +02:00
LevelX2
e5d0de7328 Renamed DrawCardController to DrawCardSourceController. Missing Renames. 2014-04-03 15:07:06 +02:00
LevelX2
d22153362f * Split Second - Fixed a bug that if more than one split second card was in the game, the zone of the owning card ould not be retrieved correctly. 2014-04-02 20:54:09 +02:00
LevelX2
fd51fc8216 * Added Brion Stoutarm and Patrician's Scorn. 2014-04-02 00:33:56 +02:00
LevelX2
85a3864140 Merge origin/master 2014-04-01 17:34:56 +02:00
LevelX2
a558c052ef Added Myr Servitor, Salvaging Station, Porphyry Nodes, and Gaea's Blessing. 2014-04-01 17:33:58 +02:00
LevelX2
98eb510228 * Runed Halo - Fixed a bug that controlling player had protection from every name. 2014-04-01 17:32:15 +02:00
LevelX2
6bc5cf538b Renamed DrawCardController to DrawCardSourceController. 2014-04-01 13:39:42 +02:00
LevelX2
de2a8b66b6 * Discard - Fixed a bug that forced palyer to discard the complete hand instead of the defined amount if discarded card was exiled instead of put into graveyard (e.g. Leyland of the Void and Blighting). 2014-04-01 13:03:38 +02:00
LevelX2
cb018dd0f0 * Changed tournament result genration and disconnect time formatting. 2014-04-01 00:07:49 +02:00
LevelX2
455cca0795 Minor changes to tool tip text generation and token image loading. 2014-04-01 00:06:52 +02:00
LevelX2
b0e32a275d Reworked tournament result string generation. 2014-03-31 15:30:01 +02:00
LevelX2
9ff5bcbd92 Improved reconnect and tournament handling. Reconnect time is now shown for disconneted players on player list and tournament panel. You can now reconnect (during 3 minutes) to a tournament also if meanwhile new game (after sideboarding ended) or round was started. Conceding the complete match in a tournament can no longer result in a draw, if you won games before. Quitting a tournament does now always end all active games of that quitting player. 2014-03-31 02:24:59 +02:00
LevelX2
b5ef4a7f45 * Attacking Planeswalker - Fixed a bug that it was not able to attack a planeswalker that had hexproof. 2014-03-29 17:46:12 +01:00
LevelX2
663d05b866 * Zombie Token - Fixed that token image is always shown. 2014-03-29 02:04:14 +01:00
LevelX2
054973f821 Merge origin/master 2014-03-28 23:31:05 +01:00