Mage Version 1.0.2

This commit is contained in:
LevelX2 2013-05-11 23:06:30 +02:00
parent ad4ff095de
commit 6b38cd5b18
37 changed files with 1721 additions and 1708 deletions

View file

@ -119,7 +119,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class); private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
private JLabel title; private JLabel title;
private Rectangle titleRectangle; private Rectangle titleRectangle;
private static final MageVersion version = new MageVersion(1, 0, 2, "dev"); private static final MageVersion version = new MageVersion(1, 0, 2, "");
private UUID clientId; private UUID clientId;
private static MagePane activeFrame; private static MagePane activeFrame;
private static boolean liteMode = false; private static boolean liteMode = false;

View file

@ -372,7 +372,8 @@ public class ConnectDialog extends MageDialog {
private void findPublicServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed private void findPublicServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
BufferedReader in = null; BufferedReader in = null;
try { try {
URL serverListURL = new URL("http://download.magefree.com/files/server-list.txt"); // URL serverListURL = new URL("http://download.magefree.com/files/server-list.txt");
URL serverListURL = new URL("http://176.31.186.181/files/server-list.txt");
Connection.ProxyType configProxyType = Connection.ProxyType.valueByText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_TYPE, "None")); Connection.ProxyType configProxyType = Connection.ProxyType.valueByText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_TYPE, "None"));

View file

@ -30,7 +30,7 @@ public class MultiConnectTest {
private static final CountDownLatch latch = new CountDownLatch(USER_CONNECT_COUNT); private static final CountDownLatch latch = new CountDownLatch(USER_CONNECT_COUNT);
private static final MageVersion version = new MageVersion(1, 0, 1, ""); private static final MageVersion version = new MageVersion(1, 0, 2, "");
private static volatile int connected; private static volatile int connected;

View file

@ -57,7 +57,7 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient {
private static Session session; private static Session session;
private ConnectDialog connectDialog; private ConnectDialog connectDialog;
private static Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class); private static Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class);
private static final MageVersion version = new MageVersion(1, 0, 2, "dev"); private static final MageVersion version = new MageVersion(1, 0, 2, "");
/** /**
* @return the session * @return the session

View file

@ -4,14 +4,17 @@ MAGE is a client/server implementation of a popular CCG without the collecting p
The server hosts games and enforces the rules. The client creates or joins games, The server hosts games and enforces the rules. The client creates or joins games,
displays the current state of a game in progress and sends user events to the server. displays the current state of a game in progress and sends user events to the server.
You will need to have the Java Runtime Environment Version 6 Update 10 or greater. You will need to have the Java Runtime Environment Version 6 Update 33 or greater.
You can download this from: http://java.com/ You can download this from: http://java.com/
----------------------------------------------------------------------------------- -----------------------------------------------------------------------------------
Installing and running MAGE Installing and running MAGE
You will need to download both the client and the server applications. These can be You will need to download both the client and the server applications. These can be
obtained from http://code.google.com/p/magic--another-game-engine/downloads/list. obtained from
http://download.magefree.com
or
http://176.31.186.181/
Extact the client and the server to separate folders. Extact the client and the server to separate folders.
To play a game you can either connect to a server or start your own server. To To play a game you can either connect to a server or start your own server. To
@ -55,4 +58,5 @@ Notes
MAGE is still very much in the testing phase so there can be lots of bugs and/or MAGE is still very much in the testing phase so there can be lots of bugs and/or
missing functionality. Please be patient. If you notice anything or want to missing functionality. Please be patient. If you notice anything or want to
make suggestions please contact me at BetaSteward@googlemail.com make suggestions goto https://github.com/magefree/mage/issues

View file

@ -1,3 +1,3 @@
Welcome! You are playing Mage version 1.0.1. Welcome! You are playing Mage version 1.0.2.
Find what was changed since previous versions on project Wiki. Find what was changed since previous versions on project Wiki.
Contact us on www.slightlymagic.net. Contact us on www.slightlymagic.net.

View file

@ -2,5 +2,5 @@ New HotKeys: Alt+E - Enlarge card image;
Wheel zoom in/out - Enlarge card image; Wheel zoom in/out - Enlarge card image;
F4 - end current turn, response to stack; F4 - end current turn, response to stack;
F9 - skip all opponents' turns, no response to stack; F9 - skip all opponents' turns, no response to stack;
Welcome! You are playing Mage version 1.0.1 dev Welcome! You are playing Mage version 1.0.2
Contact us on www.slightlymagic.net. Contact us on www.slightlymagic.net.

View file

@ -1,6 +1,8 @@
#default levels #default levels
log4j.rootLogger=info, console, logfile log4j.rootLogger=info, console, logfile
#log4j.logger.mage.player.ai=TRACE
#log4j.logger.mage.player.ai.ComputerPlayer6=debug
#log4j.logger.mage.player.ai.ComputerPlayer7=debug
#log4j.logger.mage.player.human=DEBUG, console, logfile #log4j.logger.mage.player.human=DEBUG, console, logfile
#log4j.additivity.mage.player.human=false #log4j.additivity.mage.player.human=false

View file

@ -17,7 +17,7 @@ import java.util.UUID;
public class SimpleMageClient implements MageClient { public class SimpleMageClient implements MageClient {
private UUID clientId; private UUID clientId;
private static final MageVersion version = new MageVersion(1, 0, 1, ""); private static final MageVersion version = new MageVersion(1, 0, 2, "");
private static final transient Logger log = Logger.getLogger(SimpleMageClient.class); private static final transient Logger log = Logger.getLogger(SimpleMageClient.class);

View file

@ -82,6 +82,7 @@ $raritiesConversion{'C'} = 'COMMON';
$raritiesConversion{'U'} = 'UNCOMMON'; $raritiesConversion{'U'} = 'UNCOMMON';
$raritiesConversion{'R'} = 'RARE'; $raritiesConversion{'R'} = 'RARE';
$raritiesConversion{'M'} = 'MYTHIC'; $raritiesConversion{'M'} = 'MYTHIC';
$raritiesConversion{'Special'} = 'SPECIAL';
my %manaToColor; my %manaToColor;
$manaToColor{'B'} = 'Black'; $manaToColor{'B'} = 'Black';

View file

@ -0,0 +1,5 @@
@ECHO OFF
cd ./mage-client
call startClientWin7
cd ../mage-server
call startServerWin7