betasteward
f4aff4a121
Merge branch 'master' into Network_Upgrade
...
Conflicts:
Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
Mage.Common/src/mage/remote/SessionImpl.java
Mage.Server/src/main/java/mage/server/Session.java
2015-06-20 23:00:34 -04:00
betasteward
55fea43f20
added a bunch of game methods
2015-06-17 19:54:33 -04:00
betasteward
58e85df735
added startMatch and joinGame
2015-06-17 13:53:39 -04:00
LevelX2
cd0f273122
Fixed a bug that if a human player had to discard more cards than he had on hand, the game UI was blocked.
2015-06-15 17:35:48 +02:00
LevelX2
0b2e61081a
Fixed a problem with the country flag resource name causing null pointer exceptions and graphical problems on the client side.
2015-06-14 14:53:23 +02:00
LevelX2
060a468d4b
Update to release 1.4.1.
2015-06-14 02:43:16 +02:00
LevelX2
6420666668
Some fixes to player handling.
2015-06-14 02:42:56 +02:00
LevelX2
526a93df7e
Some fixes to user table.
2015-06-14 02:42:32 +02:00
LevelX2
adefaf890a
[ORI] Added 47 cards.
2015-06-13 21:52:54 +02:00
LevelX2
ce26bc8ed0
Added option to deactivate to ask th eplayer in which order cards go to gaveyard.
2015-06-13 12:27:50 +02:00
LevelX2
0f37d0fcd0
Added country name to tooltip of country icon in user list.
2015-06-13 11:30:25 +02:00
LevelX2
d28a956754
Merge origin/master
2015-06-13 00:33:58 +02:00
betasteward
864a318b3f
fixed some merge issues + added additional connection properties
2015-06-12 15:59:02 -04:00
betasteward
38da157f8c
Merge branch 'master' into Network_Upgrade
...
Conflicts:
Mage.Client/src/main/java/mage/client/MageFrame.java
Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java
Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
Mage.Common/src/mage/remote/SessionImpl.java
Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
2015-06-12 08:56:26 -04:00
LevelX2
4f6d3f3a1a
* Password join value is now distinct from password you set of for a new table.
2015-06-12 08:12:38 +02:00
LoneFox
90486afdbb
If saving a thumbnail image fails, delete the resulting file.
...
OpenJDK throws "javax.imageio.IIOException: Invalid argument to native writeImage", because it
does not support transparency, and that results in zero-sized thumbnail files being created.
2015-06-11 09:17:05 +03:00
LoneFox
658daa65e3
Fix typo
2015-06-11 08:43:12 +03:00
LevelX2
132ded19f6
Show country flag icon in user table. Save and restore column width and order.
2015-06-11 00:11:40 +02:00
betasteward
dcd2907112
handle table join and waiting
2015-06-10 15:59:48 -04:00
LevelX2
8ae9293c98
* Added user country flag. View of image in user list is still missing.
2015-06-10 17:52:18 +02:00
LevelX2
21e2066bba
* Akron Legionnaire - Fixed not correct working restrict ability.
2015-06-08 22:51:48 +02:00
betasteward
c47da1f5b3
added handlers for create table + adjusted connection code to better handle failed connections
2015-06-08 14:05:00 -04:00
LevelX2
9da44a547d
Added an option that player has to confirm if he passes priority with empty stack and has mana in his pool. Implements #707 .
2015-06-07 22:37:12 +02:00
LevelX2
907ec7abb0
Added new option for mana payment handling of mana already in the mana pool. Reworked the battlefield context menu a bit.
2015-06-07 17:14:43 +02:00
LevelX2
8acf28eed1
* Added optional rollback current turn and up to 3 previous turns to the battlefield menu. All other players have to agree to the rollback to let it happen.
2015-06-07 00:53:08 +02:00
LevelX2
a50447c84d
* Setting of mana automatic payment option is saved and restored now so persistent between games ( fixes #1002 ).
2015-06-05 00:05:40 +02:00
LevelX2
3b9cb1dc6e
Add land dialog is now also shown during free deck building. Added a set selection drop down box to select the set the lands are used from.
2015-06-04 19:37:54 +02:00
LevelX2
bafd27f5b3
Identifier are shown for Looked at and revealed cards view
2015-06-03 17:05:59 +02:00
LevelX2
022d8790fc
Saved skill filter setting of active tables list.
2015-06-03 00:11:15 +02:00
betasteward
20a25ffdab
improved handling of disconnects
2015-06-01 14:58:26 -04:00
betasteward
481e177d71
added pingInfo to user info
2015-06-01 10:51:20 -04:00
betasteward
bc51a8fc79
completed Room handling
2015-05-29 21:40:13 -04:00
betasteward
e7bb3a0dbf
Merge branch 'master' into Network_Upgrade
2015-05-28 21:06:32 -04:00
betasteward
b41cbe2703
added optional SSL encryption
2015-05-28 21:04:53 -04:00
betasteward
a168d53966
handle reconnects
2015-05-27 20:44:18 -04:00
betasteward
2143e87543
added disconnect handling
2015-05-26 22:13:39 -04:00
LevelX2
eb96b08dfa
Release 1.4.0v2
2015-05-25 23:33:41 +02:00
betasteward
b68cd765b7
client registration is now a blocking call on the client side + added server messages handlers
2015-05-24 22:56:11 -04:00
betasteward
e45345d87a
initial commit - only table pane chat is working atm
2015-05-23 10:18:36 -04:00
LevelX2
51397a93df
Added some checking for valid deck and game type combinations on match creation dialog.
2015-05-22 22:37:54 +02:00
LevelX2
ae89cef011
* Fixed a bug in table sort that could produce a cast error if tables are sorted by skill level.
2015-05-22 21:25:59 +02:00
LevelX2
ab79a6a308
* Changed some references from xmage.info to xmage.de.
2015-05-22 00:42:02 +02:00
LevelX2
bc61ef6fb8
* Update to version 1.4.0v0.
2015-05-13 01:05:12 +02:00
LevelX2
ed501cad21
* Some minor adjustements/changes.
2015-05-12 23:00:34 +02:00
LevelX2
28d46e2a95
* Added a simple identifier to tooltip and game log to be able to identify the exact target if multiple objects with the same name exist.
2015-05-12 17:30:14 +02:00
LevelX2
69b381779b
* Added a simple skill level to set and filter for tables.
2015-05-12 15:10:24 +02:00
LevelX2
15efe14fd5
* Fixed human players controlling other human players turn (e.g. by Mindsliver).
2015-05-12 01:10:56 +02:00
LevelX2
be11d287dc
[MM2] Added new download source mythicspoiler.com.
2015-05-11 22:06:38 +02:00
LevelX2
5c018b15af
Changed Modern Masters 2015 short designation to MM2.
2015-05-10 11:26:35 +02:00
LevelX2
7e9340dee7
Fixed that action column was not handled correctly after client restart if user changed their position in column order.
2015-05-10 10:54:54 +02:00
