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

11230 commits

This branch
This branch
All branches
Author SHA1 Message Date
betasteward
8d5ab2c9d1 remove JBoss Remoting dependency + renamed Main to ServerMain 2015-06-18 14:58:17 -04:00
betasteward
8dab053d3b more cleanup 2015-06-18 11:22:46 -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
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
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
LevelX2
8acfbf0ab3 * Repercussion - Some updates. 2015-06-12 13:51:20 +02:00
LevelX2
eba0cbbd34 Merge pull request #1023 from cbrianhill/repercussion 
Repercussion
 2015-06-12 13:30:59 +02:00
LevelX2
7f5e3a262e * Added test and some minor changes. 2015-06-12 08:13:41 +02: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
Brian Hill
81c4ae5d84 Incorporate feedback from LevelX2 2015-06-11 16:28:29 -04:00
Brian Hill
0d0cc34309 Added Repercussion 2015-06-11 16:28:29 -04:00
LevelX2
f7bce827fe * Refraction Trap - Fixed a bunch of problems with that card. 2015-06-11 17:14:43 +02:00
LevelX2
d713ae424f * Enduring Renewal - Fixed that the creature did not come back to hand. 2015-06-11 15:52:47 +02:00
LevelX2
753340efc6 * Teferi, Mage of Zhalfir - Fixed that Flash was not given to cards in the libraray (so e.g. Mystical Teachings did not work for creatures that did not have Flash by itself). 2015-06-11 12:57:00 +02:00
LevelX2
ab4ed4f973 * Fixed a bug that cards with added abilities of continuous effects were not found always. 2015-06-11 12:54:23 +02:00
LevelX2
65401f1cbc * Tiny Leaders - Fixed wrong split cards converted mana costs check. Added check for sideboard card that was missing. 2015-06-11 08:36:21 +02:00
LevelX2
5c6629919f * Nemesis of Reason - Fixed IndexOutOfBoundsException. 2015-06-11 00:31:17 +02:00
LevelX2
50250176ed * Recurring Insight - FIxed target handling. 2015-06-11 00:16:38 +02: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
93dcf2d59f * Finished card attribute change handling for color of cards (card subtype not supported yet) related to #408 2015-06-10 14:00:37 +02:00
LevelX2
199ff16c0c * Erratic Portal - Fixed that the mana costs had not to be paid if the players said he wants to pay. 2015-06-10 13:26:49 +02:00
LevelX2
4a4a949f3f * Helm of Possession - Added missing activation cost of {2}. 2015-06-10 12:57:50 +02:00
LevelX2
4543aac30e Overwrote checkEventType for Death Pits of Rath. 2015-06-10 08:09:45 +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
Justin Godesky
119422750c Minor readme changes. 2015-06-09 12:08:04 -04:00
Justin Godesky
597211fcb1 Readme changes: fixed spelling error, improved some grammatical things, and added a couple more resources for developers. 2015-06-09 10:54:31 -04:00
LevelX2
21e2066bba * Akron Legionnaire - Fixed not correct working restrict ability. 2015-06-08 22:51:48 +02:00
LevelX2
256b93ffd8 * Sphinx Summoner - Fixed that the searched card was not revealed. 2015-06-08 22:02:46 +02:00
Justin Godesky
f4f3083238 Added a bunch of misc. cards: Ronom Unicorn, Shattering Pulse, Shivan Zombie, Vodalian Zombie, False Summoning, Searing Flesh, Preemptive Strike, Thundersong Trumpeter, Break Asunder, Compulsion. 2015-06-08 14:24:00 -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
LevelX2
1cf93e6c43 Fixed AI test class. 2015-06-08 19:46:22 +02:00
LevelX2
3b61a10237 Fixed some bugs and added a AI Test player class. 2015-06-08 18:31:54 +02: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
emerald000
8066fe911c Added Forcefield. 2015-06-06 19:32:47 -04:00
LevelX2
f2cf08d5b2 Cleaned up ReturnToHandChosenControllesPermanentEffect. 2015-06-07 01:07:49 +02:00
LevelX2
76a7aeb957 Merge pull request #1017 from Zeplar/master 
Added Dust Elemental. Modified "bounce a permanent" effect so it does…
 2015-06-07 00:54:00 +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
5736efa103 Merge origin/master 2015-06-06 20:47:08 +02:00
LevelX2
80189f19af * Apostle's Blessing - Fixed that choice of type of protection had wrongly to be done while going to stack instead during resolution. 2015-06-06 20:46:42 +02:00
Zeplar
58b0903dc4 Added Dust Elemental. Modified "bounce a permanent" effect so it doesn't fizzle if too few targets are selected-- this bug only affected Dust Elemental and Stormfront Riders to my knowledge. 2015-06-05 17:44:57 -07:00
Justin Godesky
f8532ab587 Merge branch 'master' of https://github.com/magefree/mage 2015-06-05 12:06:20 -04:00