Commit graph

5 commits

Author SHA1 Message Date
betasteward
49558e091d Merge branch 'master' into Network_Upgrade
Conflicts:
	Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
	Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
2015-09-10 10:30:51 -04:00
betasteward
432c8ddaa0 cleanup config settings and files 2015-08-24 10:57:40 -04:00
betasteward
3a96ff7933 fixed old version + improved wait for server method 2015-08-20 15:31:17 -04:00
betasteward
7135cffc01 added more tests 2015-06-23 21:45:58 -04:00
betasteward
a2db10ca6f added unit tests for client server communications 2015-06-20 09:45:23 -04:00