betasteward
4bb7ffd452
added watch game methods
2015-07-11 07:40:06 -04:00
betasteward
8225a4080c
added draft and tournament methods + some refactoring
2015-07-05 08:57:14 -04:00
betasteward
1ff7f4ba5c
and more refactoring
2015-07-02 09:08:56 -04:00
betasteward
27da366eea
added Construct and Sideboard callbacks
2015-07-01 23:26:07 -04:00
betasteward
a316b01b15
added JoinTournamentTable + more refactoring
2015-07-01 22:53:22 -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
LevelX2
c774e95335
* Fixed some possible java exception causes.
2015-06-27 09:32:50 +02:00
betasteward
72a301d604
add more methods + refactored some packages
2015-06-25 21:32:05 -04:00
betasteward
95e9623186
added sendFeedback
2015-06-24 15:23:40 -04:00
betasteward
4ddb871f9b
added setPreferences
2015-06-24 15:01:14 -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
betasteward
8aeadf1143
added sendPlayerAction
2015-06-23 22:08:39 -04:00
LevelX2
0a3c081ded
Merge pull request #1048 from brodee/master
...
Chaos booster draft implementation
2015-06-23 21:59:46 +02:00
fireshoes
f13c1a5794
Added Holiday Cube 2015
2015-06-23 00:50:14 -05:00
brodee
e3b84eaab5
chaos booster draft implementation first check-in
2015-06-22 21:55:43 -07:00
LevelX2
87f919ecac
* Reworked handling of revealed and look at windows. Windows can stay open now and moved to a position and stay there.
2015-06-21 23:49:16 +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
betasteward
8d5ab2c9d1
remove JBoss Remoting dependency + renamed Main to ServerMain
2015-06-18 14:58:17 -04:00
betasteward
637c45d3ce
cleaned up server code
2015-06-18 09:25:03 -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
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
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
betasteward
8d6716b2a0
added remove table and swap seats methods + combined several message handlers
2015-06-12 08:40:41 -04: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
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
71c7bc38e1
cleanup server code
2015-06-01 21:42:18 -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
b41cbe2703
added optional SSL encryption
2015-05-28 21:04:53 -04:00
betasteward
2143e87543
added disconnect handling
2015-05-26 22:13:39 -04: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
d2ae55fff6
fixed timeout issue - HeartbeatHandler now monitors connection health
2015-05-23 22:42:42 -04:00
betasteward
e45345d87a
initial commit - only table pane chat is working atm
2015-05-23 10:18:36 -04:00
LevelX2
64ea893ea0
Some changes to logging.
2015-05-22 22:33:01 +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
