External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into Network_Upgrade

Browse source 
Conflicts:
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
	Mage.Server/src/main/java/mage/server/Session.java
	Mage.Server/src/main/java/mage/server/User.java
	Mage.Server/src/main/java/mage/server/game/GameController.java
	Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
	Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
This commit is contained in:
betasteward 2015-07-12 12:25:44 -04:00
commit 5c829b79d5
552 changed files with 30213 additions and 6146 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Server.Console/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.1</version>
<version>1.4.2</version>
</parent>
<groupId>org.mage</groupId>
@ -28,7 +28,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>

4
Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java
View file

@ -381,7 +381,7 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient {
}
@Override
public void gameAsk(UUID gameId, GameView gameView, String question) {
public void gameAsk(UUID gameId, GameView gameView, String question, Map<String, Serializable> options) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@ -406,7 +406,7 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient {
}
@Override
public void gamePlayMana(UUID gameId, GameView gameView, String message) {
public void gamePlayMana(UUID gameId, GameView gameView, String message, Map<String, Serializable> options) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}