External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions
12344 commits 38 branches 229 tags 960 MiB
Commit graph

37 commits

Author SHA1 Message Date
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
betasteward
8bff961caf fixed some bugs + improved some messages 2015-07-20 21:34:18 -04: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
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
d74efbfb0b even more refactoring 2015-06-25 21:46:28 -04:00
betasteward
46c4349362 more package refactoring 2015-06-25 21:41:14 -04: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
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
8dab053d3b more cleanup 2015-06-18 11:22:46 -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
betasteward
19ad01ced8 use same paradigm on server side - reduces the number of handlers in the pipeline 2015-06-16 13:51:03 -04:00
betasteward
dd8fe2d05c simplified client message handling 2015-06-15 14:27:58 -04:00
betasteward
a241556fdc added listeners so that exceptions get thrown 2015-06-13 14:06:23 -04:00
betasteward
864a318b3f fixed some merge issues + added additional connection properties 2015-06-12 15:59:02 -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
betasteward
c47da1f5b3 added handlers for create table + adjusted connection code to better handle failed connections 2015-06-08 14:05:00 -04:00
betasteward
71c7bc38e1 cleanup server code 2015-06-01 21:42:18 -04: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
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
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