Merge branch 'master' into minmax

2015-08-28 23:48:54 +02:00
parent 504160a740 30f5a49988
commit a25b010429
56 changed files with 14221 additions and 552 deletions
--- a/projects/mtg/include/Player.h
+++ b/projects/mtg/include/Player.h
@@ -68,6 +68,7 @@ public:
    MTGInPlay * inPlay();
    ManaPool * getManaPool();
    void takeMulligan();
+    void serumMulligan();
    ManaCost * doesntEmpty;
    ManaCost * poolDoesntEmpty;
    void cleanupPhase();