betasteward
5c829b79d5
Merge branch 'master' into Network_Upgrade
...
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
2015-07-12 12:25:44 -04:00
LevelX2
244b1fbf89
Xmage Release 1.4.2v2
2015-07-09 11:45:27 +02:00
LevelX2
f0efc17f49
XMage 1.4.2v1
2015-07-04 19:50:33 +02:00
LevelX2
cd0cba6ec7
XMage Release 1.4.2v0
2015-07-04 01:28:19 +02:00
LevelX2
3eb1fd4047
Added a button to attack with all available cratures.
2015-07-02 17:03:14 +02:00
betasteward
1ff7f4ba5c
and more refactoring
2015-07-02 09:08:56 -04:00
LevelX2
0cbe590cac
* Fixed that mana auto-payment settings were not correctly set from previous settings on game start.
2015-07-02 13:18:12 +02:00
betasteward
27da366eea
added Construct and Sideboard callbacks
2015-07-01 23:26:07 -04:00
betasteward
1d2108fe7f
added UpdateDeck + filled out callback method templates
2015-07-01 15:10:23 -04:00
betasteward
88e30ee6e1
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/PreferencesDialog.java
Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java
Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
Mage.Client/src/main/java/mage/client/game/GamePanel.java
Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java
Mage.Common/src/mage/interfaces/MageServer.java
Mage.Common/src/mage/remote/Connection.java
Mage.Common/src/mage/remote/SessionImpl.java
Mage.Server/src/main/java/mage/server/MageServerImpl.java
Mage.Server/src/main/java/mage/server/Session.java
Mage.Server/src/main/java/mage/server/SessionManager.java
Mage.Server/src/main/java/mage/server/TableController.java
Mage.Server/src/main/java/mage/server/User.java
Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
2015-06-30 23:13:29 -04:00
betasteward
14f156d626
fixed ConcurrentModificationException
2015-06-28 18:59:30 -04:00
LevelX2
87f3978589
Some changes to userData handling. Added country flag to some dialogs. Saved and restored some more table columns width and order information.
2015-06-28 00:10:38 +02:00
emerald000
07a8474721
Fixed typo.
2015-06-24 01:25:41 -04:00
LevelX2
ca9e52f99b
Merge pull request #1052 from brodee/master
...
code review comments for chaos/random booster draft:
2015-06-24 06:56:45 +02:00
Brodee
ac0aa65aab
code review comments for chaos/random booster draft:
...
1. rename chaos booster draft to random booster draft
2. save packs selected in the user preferences
3. print "Random Boosters" in the player draft viewer during the draft
2015-06-23 20:59:05 -07:00
LevelX2
0a3c081ded
Merge pull request #1048 from brodee/master
...
Chaos booster draft implementation
2015-06-23 21:59:46 +02:00
brodee
e3b84eaab5
chaos booster draft implementation first check-in
2015-06-22 21:55:43 -07:00
LevelX2
78188d6f24
Removed dispay of card ID for looked at cards to prevent unfair use of card identity.
2015-06-22 15:31:15 +02:00
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
a7369fabd4
some minor changes
2015-06-20 09:30:28 -04:00
LevelX2
757b9ea99e
* XMage Release 1.4.1v3
2015-06-20 13:14:06 +02:00
betasteward
8d5ab2c9d1
remove JBoss Remoting dependency + renamed Main to ServerMain
2015-06-18 14:58:17 -04:00
LevelX2
ca19cd95f2
Mage release 1.4.1v2
2015-06-15 08:25:13 +02:00
LevelX2
725e7c5454
Update version to 1.4.1v1 to fix the graphical UI problems on the client.
2015-06-14 14:53:57 +02:00
LevelX2
060a468d4b
Update to release 1.4.1.
2015-06-14 02:43:16 +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
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
8ae9293c98
* Added user country flag. View of image in user list is still missing.
2015-06-10 17:52:18 +02:00
LevelX2
c27ef5ee97
* Started to fix color setting for cards (e.g. Painter's Serverant) #408 (not completely finished yet).
2015-06-10 01:24:38 +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
bafd27f5b3
Identifier are shown for Looked at and revealed cards view
2015-06-03 17:05:59 +02: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
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
LevelX2
76aa9c128d
* Release 1.4.0v1
2015-05-24 14:50:24 +02:00
betasteward
e45345d87a
initial commit - only table pane chat is working atm
2015-05-23 10:18:36 -04:00
LevelX2
f5245ade01
* Game timer - Fixed that the timer count down was not shown while selecting the starting player and deciding for mulligan.
2015-05-20 23:27:00 +02:00
LevelX2
4054b6fc91
* Fixed that cards in graveyard did not show their id in tooltip.
2015-05-13 23:26:06 +02:00
LevelX2
fa847e8feb
* Update to version 1.4.0v0.
2015-05-12 23:11:25 +02:00
LevelX2
ed501cad21
* Some minor adjustements/changes.
2015-05-12 23:00:34 +02:00
LevelX2
69b381779b
* Added a simple skill level to set and filter for tables.
2015-05-12 15:10:24 +02:00
LevelX2
5abcefa09e
Minor changes to log and tooltip text generation.
2015-05-10 11:24:43 +02:00
LevelX2
9c97953b6b
Added some font color to object and player names output to game logging and feedback area.
2015-05-09 21:18:00 +02:00
LevelX2
9e8157827a
* Fixed that face down exiled cards were revealed in player specific exile view window.
2015-05-02 12:19:09 +02:00
LevelX2
a47c0adfda
Some minor fixes.
2015-04-21 00:09:29 +02:00
