From 2e5fc5fc98193347d1d21c13e2373079f7f2a9b0 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 21 Jul 2013 09:45:58 +0200 Subject: [PATCH] Some small changes for Release 1.0.3 --- Mage.Client/src/main/java/mage/client/MageFrame.java | 2 +- Mage.Server/release/server.msg.txt | 4 ++-- .../src/main/java/mage/server/game/GameController.java | 1 + Utils/release/getting_implemented_cards.txt | 5 ++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index f7dd010faa..e5b7fb15a7 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -112,7 +112,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class); private JLabel title; private Rectangle titleRectangle; - private static final MageVersion version = new MageVersion(1, 0, 3, "dev"); + private static final MageVersion version = new MageVersion(1, 0, 3, ""); private UUID clientId; private static MagePane activeFrame; private static boolean liteMode = false; diff --git a/Mage.Server/release/server.msg.txt b/Mage.Server/release/server.msg.txt index 3ef103bae6..048bbfd79d 100644 --- a/Mage.Server/release/server.msg.txt +++ b/Mage.Server/release/server.msg.txt @@ -1,3 +1,3 @@ -Welcome! You are playing Mage version 1.0.2. -Find what was changed since previous versions on project Wiki. +Welcome! You are playing Mage version 1.0.3. +Find what was changed since previous versions on project Wiki https://github.com/magefree/mage/wiki. Contact us on www.slightlymagic.net. \ No newline at end of file diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java index 6257c2ea34..b3abf29881 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameController.java +++ b/Mage.Server/src/main/java/mage/server/game/GameController.java @@ -710,6 +710,7 @@ public class GameController implements GameCallback { private void sendMessage(UUID userId, Command command) { final UUID playerId = userPlayerMap.get(userId); + // player has game under control (is not cotrolled by other player) if (game.getPlayer(playerId).isGameUnderControl()) { // if it's your priority (or game not started yet in which case it will be null) // then execute only your action diff --git a/Utils/release/getting_implemented_cards.txt b/Utils/release/getting_implemented_cards.txt index 4d6b5239f3..d25f5898bf 100644 --- a/Utils/release/getting_implemented_cards.txt +++ b/Utils/release/getting_implemented_cards.txt @@ -7,7 +7,10 @@ git log tagOrSha1..HEAD --diff-filter=A --name-status | sed -ne 's/^A[^u]Mage.Se for Windows: you need to replace ' by "" and remove -u in sort Example for cards implemented from 0.8.7 till 0.9: -git log 9ac166abc92f70aebdbe34825880ff8f909465ed..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt +git log 9ac166abc92f70aebdbe34825880ff8f909465ed..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt +since 1.0.2-release: +git log 6b38cd5b18298b07962b969bfa2eb69c62839575..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt +since 1.0.3-release: 3. Copy added_cards.txt to trunk\Utils folder 4. Run script: