betasteward
6f5c862b19
fixed NPE error after user disconnects
2015-09-10 23:41:27 -04:00
betasteward
d0671ee88e
fixed issue with watching games
2015-09-10 13:19:14 -04:00
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
c0e90b9d35
added getCards method - fixes update database issue
2015-09-03 16:05:53 -04:00
betasteward
43bb51edaa
removed showGameEndDialog message
2015-09-02 12:56:19 -04:00
LevelX2
758f56792e
* Added button popup menu to be able to automatically answer ability related "Yes" / "No" requests (related to #328 ).
2015-08-28 11:44:14 +02:00
betasteward
d10bb2ed40
Merge branch 'master' into Network_Upgrade
2015-08-26 16:02:53 -04:00
LevelX2
78071ce0a3
* Fixed a bug that order of triggered abilities of tokens were not shown to human player and the UI was locked ( fixes #910 ).
2015-08-25 23:34:15 +02:00
betasteward
1e60605d84
Merge branch 'master' of https://github.com/magefree/mage into Network_Upgrade
...
Conflicts:
Mage.Client/src/main/java/mage/client/cards/Card.java
Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
Mage.Client/src/main/java/mage/client/game/GamePanel.java
Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
2015-08-25 14:07:31 -04:00
betasteward
83d11baa00
added Cheat method for UI testing
2015-08-25 10:21:09 -04:00
betasteward
432c8ddaa0
cleanup config settings and files
2015-08-24 10:57:40 -04:00
LevelX2
532d4e0af0
* Added automatic handling for order of triggered abilities going to stack ( fixes #701 / related to #328 ).
2015-08-22 19:29:57 +02:00
betasteward
129b6d1e82
cleanUp
2015-08-19 11:05:33 -04:00
betasteward
d9f1d71d98
Merge branch 'master' into Network_Upgrade
...
Conflicts:
Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
Mage.Common/src/mage/view/CardView.java
2015-08-17 09:20:44 -04:00
betasteward
9be04769f9
improved disconnect handling
2015-08-17 08:47:19 -04:00
LevelX2
662ee7ca10
* Fixed handling of face down card selection (e.g. for Scroll Rack).
2015-08-05 17:45:45 +02:00
LevelX2
efb5e06e57
* Rollback - Fixed that UI is locked after a accepted rollback request ( fixes #1158 ).
2015-08-02 12:39:02 +02:00
betasteward
8bff961caf
fixed some bugs + improved some messages
2015-07-20 21:34:18 -04:00
LevelX2
635c33fa87
Merge pull request #1117 from brodee/master
...
random draft bug fix and random draft ui improvements
2015-07-15 08:30:22 +02:00
brodee
c7a349f65f
random draft bug fix:
...
packs are forced to be 15 cards; weirdness occurs if the packs are uneven sizes including the draft ending early.
Random draft ui improvements:
only the sets that will be used are displayed in the lobby, and the number of characters is large but still greatly reduced.
the pack selector ui will prevent you from chosing fewer than 2 packs.
2015-07-14 22:34:58 -07:00
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
betasteward
4bb7ffd452
added watch game methods
2015-07-11 07:40:06 -04:00
LevelX2
b80e27f3b3
* Fixed handling of Phyrexian mana.
2015-07-09 01:43:26 +02:00
LevelX2
d847fb7109
Some minor changes.
2015-07-08 22:51:31 +02:00
Wehk
6e5acee2dc
Avatar test
...
Testing access to a "normal" avatar that is not added to "available_avatars". Can't test name cases in local build.
2015-07-06 21:53:22 +02:00
betasteward
8225a4080c
added draft and tournament methods + some refactoring
2015-07-05 08:57:14 -04:00
LevelX2
946af6913d
Fixed NPE handling.
2015-07-03 21:05:05 +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
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
betasteward
8aeadf1143
added sendPlayerAction
2015-06-23 22:08:39 -04: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
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
