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
@@ -1909,6 +1909,13 @@ void GameObserver::Mulligan(Player* player)
    player->takeMulligan();
 }

+void GameObserver::serumMulligan(Player* player)
+{
+    if(!player) player = currentPlayer;
+    logAction(player, "mulligan serum powder");
+    player->serumMulligan();
+}
+
 Player* GameObserver::createPlayer(const string& playerMode
                                #ifdef TESTSUITE
                                , TestSuiteGame* testgame