Commit graph

1970 commits

Author SHA1 Message Date
LevelX2
97a8b351b4 Fixed a problem that show cards window was not closed (e.g. for libraray card selection). 2015-08-26 16:30:32 +02:00
LevelX2
0ee22d90ca Allow hand card ordering by drag'n'drop only with left mouse button. 2015-08-26 16:29:57 +02: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
LevelX2
386204c085 * Draft log - Fixed a bug that the last pick was logged twice. 2015-08-19 11:46:57 +02:00
LevelX2
e2625fd60e * Show card pick dialog - Fixed a bug that the select window was hidden if you clicked and released the mouse button on the edges of the window. 2015-08-18 12:29:57 +02:00
fireshoes
1d86561dd3 Updated mtg-cards-data with 4 new BFZ cards and all DDP cards. Added DDP set and reprints. Implemented Retreat to Kazandu and Veteran Warleader for BFZ/DDP. Implemented Battle Squadron and Lithophage. Fixed Phage the Untouchable creature type. 2015-08-17 14:20:01 -05:00
Gerhardt Schulle
54c1e4f66c Add option to log draft picks into a file for post review after the game. 2015-08-09 21:35:49 +02:00
LevelX2
7a90db7995 * Fixed sluggishness of player selection. Reworked flag display in avatar image. 2015-08-06 00:31:50 +02:00
LevelX2
cbbc70d26b * Made table filter more accurate and moved Historical and Super Standard format to Other filter. 2015-08-05 00:07:53 +02:00
LevelX2
8dca887fad * Added tooltip to the flag in the player avatar. 2015-08-02 12:41:29 +02:00
LevelX2
768fd17d93 * Some spelling changes. 2015-07-26 09:19:46 +02:00
fireshoes
5897f1595a Implemented Glissa Sunseeker, Phyrexian Furnace, Flickering Ward, Cho-Manno's Blessing, Meng Huo Barbarian King, Sword of the Chosen, Pentarch Ward, Order of the Stars, Ancestral Mask, Jedit Ojanen of Efrava, Krosan Restorer, & Nature's Kiss. Added set Battle for Zendikar and spoiled Evolving Wilds. 2015-07-24 00:21:32 -05:00
Simown
a6bab84c85 Generated deck name/path is now a timestamp.
Changed deck generator to use a timestamp of the current time to the millisecond as the generated deck name.
This gets rid of the random UUID filling up the deck path and generated deck name.
2015-07-19 13:39:38 +01:00
Simown
cedf16806e Fix to #1128 Deck generation throws IndexOutOfBoundsException.
Reserve cards now counted correctly.
Fixed reserve card adding algorithm to stop trying to add cards out of range.
2015-07-19 12:12:10 +01: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
LevelX2
6cf0a59644 * Fixed possible null pointer exception in client. 2015-07-12 09:19:43 +02:00
LevelX2
b38885b7bf * Fixed a bug that prevented that the width of connection column in user list was restored. 2015-07-09 09:59:20 +02:00
Simown
6a5eb8ff83 Small fixes to constants, added header and standardised spelling 2015-07-09 01:58:45 +01:00
LevelX2
b80e27f3b3 * Fixed handling of Phyrexian mana. 2015-07-09 01:43:26 +02:00
Simown
a1fd4e91f0 Overhaul and fix of random deck generation. 2015-07-08 23:13:21 +01:00
Nidhoegger
9be613beb9 Fixed Issue #1054. Buttons in Feedback panel will only get focused, if the MageFrame has the focus thus preventing focus theft from other programs. 2015-07-06 10:51:06 +02:00
LevelX2
d33f85d04a Fixed wrong name for download of Kothophed, Soul Hoarder image. 2015-07-04 19:26:48 +02:00
LevelX2
1c157a20ae * Fixed a bug caused by now possible column order setting in tournament panel. 2015-07-03 22:44:08 +02:00
LevelX2
0f5f8493c7 Improved fix for #584 by Nidhoegger. 2015-07-03 12:34:13 +02:00
LevelX2
589b63c5b1 Fix for the "Modal Window bug under Linux (e.g. X value announcement) by Nidhoegger. 2015-07-02 20:48:32 +02:00
LevelX2
3eb1fd4047 Added a button to attack with all available cratures. 2015-07-02 17:03:14 +02: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
LevelX2
0a0cb40783 * Fixed that creatures that have to pay costs to block were wrongly forced to block causing UI locks. 2015-07-01 23:00:22 +02:00
LoneFox
ca0793a5c1 Fix systematic misspelling of "hover" 2015-06-30 21:28:32 +03:00
LevelX2
df3e6db569 Please test! Some changes to the display of user choices, showing also a longer text in tooltip window. 2015-06-28 21:55:48 +02:00
LevelX2
d24777cd15 Merge pull request #1062 from brodee/master
random booster draft UI improvement
2015-06-28 18:37:27 +02:00
brodee
cd1352eb01 Switch to a separate window to chose the packs for random booster drafts. 2015-06-27 23:16:59 -07: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
81934e32e3 * Revealing the top card of the library is now also shown by an extra window (no longer hiding life). Now Iconyfying and deiconifying does not change the postion of the reveal window. Iconifyed window width was a bit raised to be able to read more of the title in that state. 2015-06-25 01:07:34 +02:00
LoneFox
e139e4524f Don't use a proprietary class. Fixes build on OpenJDK. 2015-06-24 19:31:15 +03:00
LevelX2
72408a7f52 Added card frame downloader. 2015-06-24 13:41:14 +02: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
38235d9023 Update NewTournamentDialog.java
removing commented code
2015-06-23 21:08:39 -07:00
brodee
4113976b7e 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 21:04:59 -07: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
fireshoes
35d47229ea Merge origin/master 2015-06-23 20:39:07 -05:00
fireshoes
0568f16788 Added 3 Premium Deck Series sets and all From the Vault sets, and added all existing cards for them. 2015-06-23 20:37:26 -05:00
LevelX2
0a3c081ded Merge pull request #1048 from brodee/master
Chaos booster draft implementation
2015-06-23 21:59:46 +02:00
LevelX2
2547753dcb Added Sen Triplets (Alara Reborn = 100%). 2015-06-23 16:15:14 +02:00
LevelX2
5b02b5b32c Exile, Reveal, Looked At windows of a game are hidden now as you switch to another pane (e.g. other game, tables, deck editor) and shown again as you switch back. 2015-06-23 16:14:11 +02:00
LevelX2
6b2bfc5e19 Merge origin/master 2015-06-23 08:36:28 +02:00
LevelX2
ba9d616a27 Fixed two old URLs. 2015-06-23 08:35:23 +02:00
brodee
e3b84eaab5 chaos booster draft implementation first check-in 2015-06-22 21:55:43 -07:00
fireshoes
cda11b280c Merge origin/master 2015-06-22 18:47:51 -05:00
fireshoes
00569c4047 Added 12 Clash Pack promos, 5 judge promos, 2 upcoming FNM promos, renamed MerfolkToken to MerfolkWizardToken, added collector's number that were missing for ORI in mtg-cards-data.txt, added other various cards. 2015-06-22 18:46:01 -05:00
LevelX2
67e9ee1fa9 * Changed graveyard window handling to a window that can stay open. 2015-06-23 00:46:27 +02: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
LevelX2
cd0f273122 Fixed a bug that if a human player had to discard more cards than he had on hand, the game UI was blocked. 2015-06-15 17:35:48 +02:00
LevelX2
0b2e61081a Fixed a problem with the country flag resource name causing null pointer exceptions and graphical problems on the client side. 2015-06-14 14:53:23 +02: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
526a93df7e Some fixes to user table. 2015-06-14 02:42:32 +02:00
LevelX2
adefaf890a [ORI] Added 47 cards. 2015-06-13 21:52:54 +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
LevelX2
0f37d0fcd0 Added country name to tooltip of country icon in user list. 2015-06-13 11:30:25 +02:00
LevelX2
d28a956754 Merge origin/master 2015-06-13 00:33:58 +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
LoneFox
90486afdbb If saving a thumbnail image fails, delete the resulting file.
OpenJDK throws "javax.imageio.IIOException: Invalid argument to native writeImage", because it
does not support transparency, and that results in zero-sized thumbnail files being created.
2015-06-11 09:17:05 +03:00
LoneFox
658daa65e3 Fix typo 2015-06-11 08:43:12 +03: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
LevelX2
8ae9293c98 * Added user country flag. View of image in user list is still missing. 2015-06-10 17:52:18 +02:00
LevelX2
21e2066bba * Akron Legionnaire - Fixed not correct working restrict ability. 2015-06-08 22:51:48 +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
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
a50447c84d * Setting of mana automatic payment option is saved and restored now so persistent between games (fixes #1002). 2015-06-05 00:05:40 +02:00
LevelX2
3b9cb1dc6e Add land dialog is now also shown during free deck building. Added a set selection drop down box to select the set the lands are used from. 2015-06-04 19:37:54 +02:00
LevelX2
bafd27f5b3 Identifier are shown for Looked at and revealed cards view 2015-06-03 17:05:59 +02:00
LevelX2
022d8790fc Saved skill filter setting of active tables list. 2015-06-03 00:11:15 +02:00
LevelX2
51397a93df Added some checking for valid deck and game type combinations on match creation dialog. 2015-05-22 22:37:54 +02:00
LevelX2
ae89cef011 * Fixed a bug in table sort that could produce a cast error if tables are sorted by skill level. 2015-05-22 21:25:59 +02:00
LevelX2
ab79a6a308 * Changed some references from xmage.info to xmage.de. 2015-05-22 00:42:02 +02:00
LevelX2
ed501cad21 * Some minor adjustements/changes. 2015-05-12 23:00:34 +02:00
LevelX2
28d46e2a95 * Added a simple identifier to tooltip and game log to be able to identify the exact target if multiple objects with the same name exist. 2015-05-12 17:30:14 +02:00
LevelX2
69b381779b * Added a simple skill level to set and filter for tables. 2015-05-12 15:10:24 +02:00
LevelX2
15efe14fd5 * Fixed human players controlling other human players turn (e.g. by Mindsliver). 2015-05-12 01:10:56 +02:00
LevelX2
be11d287dc [MM2] Added new download source mythicspoiler.com. 2015-05-11 22:06:38 +02:00
LevelX2
5c018b15af Changed Modern Masters 2015 short designation to MM2. 2015-05-10 11:26:35 +02:00
LevelX2
7e9340dee7 Fixed that action column was not handled correctly after client restart if user changed their position in column order. 2015-05-10 10:54:54 +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
951198a578 Added some more handling for missing images. 2015-05-07 23:54:28 +02:00
LevelX2
4cf21739c4 * Saved position and size of choice window during a game session. 2015-05-06 16:58:14 +02:00
Nathaniel Brandes
2f476b7c53 Cleanup sets.
This is an extensive renaming of sets to their correct names. "Duel
Decks" and "Not Standard Legal" have been merged into a "Supplemental"
set type. MTGO-only sets have been put into their own set type, just
like magiccards.info. Supplemental sets now have a "block" which is the
block that they have under magiccards.info, for easier organization. The
deck builder on the client now relies on an autogenerated list instead
of a hardcoded one.
2015-05-03 20:07:13 -07: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
efb02f633c Fixed handling of default columns width. 2015-04-27 23:13:00 +02:00
emerald000
ffaffa39f8 Fixed NPE in the Tables panel. 2015-04-27 16:52:10 -04:00
LevelX2
0adeb0770f Added limited as format to the active table filter. 2015-04-26 21:45:24 +02:00
LevelX2
e662111ddd Added save/restore of active table columns order. 2015-04-26 21:31:27 +02:00
Nathaniel Brandes
e53079c36c Fix some gatherer image loading. 2015-04-26 04:13:20 -07:00
LevelX2
987a62448e Added save/restore of column width of active tables. 2015-04-26 10:31:24 +02:00
LevelX2
b846d0c411 Some minor changes to active table handling. 2015-04-25 16:37:08 +02:00
LevelX2
8add25f74f Finished table selection updates. 2015-04-25 13:06:50 +02:00
LevelX2
a3dba9b1d0 Added some error handling client startup. 2015-04-25 11:07:01 +02:00
LevelX2
b096379881 Update to table filtering. 2015-04-25 02:20:54 +02:00
LevelX2
26b88d3b48 Update table selection. 2015-04-24 16:34:50 +02:00
LevelX2
c285fc6c4d Started adding a simple filter to list of open tables. 2015-04-23 17:51:05 +02:00
LevelX2
2157c63160 State if table with completed games is shown is saved in java prefs now. 2015-04-23 16:19:24 +02:00
LevelX2
55322b4015 Added Masters Edition Sets I - IV. 2015-04-23 15:44:01 +02:00
LevelX2
49e89a9a19 Fixed a problem with downloading cards with AE in name from Gatherer. 2015-04-23 15:42:34 +02:00
LevelX2
d245ce1ad2 * Fixed that card name text was covered by next card beneath if cards are displayed close together (library search). 2015-04-16 16:29:54 +02:00
LevelX2
e556dcea51 * Trail of Mystery - Made basic land selection optional. 2015-04-15 17:18:14 +02:00
LevelX2
809bf663df * Fixed land image downloading from gatherer and handling of Anthology Duel Decks. 2015-04-12 10:37:16 +02:00
LevelX2
bfa82a9c3f Added the handling of paged visual lists for image download from Gatherer. 2015-04-10 15:13:25 +02:00
LevelX2
c65adebc57 Fixed that to allow watchers of a game to see the hand cards of players did not work correctly. 2015-04-10 12:36:22 +02:00
LevelX2
d3dba58358 * Fixed that continuous effects of copied cards with limited duration stop to work as the copied card stops to exist. 2015-04-10 00:39:06 +02:00
LevelX2
7292a1625c [TPR] Added Dracoplasm. 2015-04-09 18:09:05 +02:00
LevelX2
5c2189fdd7 Added Exception to read of server list that shows local buffered list. 2015-04-05 09:43:45 +02:00
LevelX2
2723bf6cb7 * Fixed some problems with order selection of triggered abilities not showing the card images. 2015-04-04 14:11:49 +02:00
fireshoes
2b2db2df6c Added set Tempest Remastered and reprints. Added Pit Trap. Updated latest Game Day, FNM, Buy-a-box, WMCQ, and Release promos. 2015-03-30 22:17:43 -05:00
LevelX2
45aa5f675c * Update Gatherer Downloader. 2015-03-29 03:48:55 +02:00
fireshoes
4f63793578 Submitted Skeleton Shard (Planechase) and Wall of Deceit (Jace vs Chandra) 2015-03-28 09:30:28 -05:00
LevelX2
740611119b * Mikaeus, the Unhallowed - Fixed that the given undying ability did not trigger. 2015-03-22 19:47:46 +01:00
LevelX2
2198a01781 Changed font for feedback area from "times" to logical java font "Dialog". 2015-03-18 10:07:03 +01:00
betasteward
9ad8530dee moved faceDown property from Card to CardState 2015-03-12 22:09:12 -04:00
LevelX2
e29eea791c * Fixed null pointer exception for tooltip and triggered abilities (made a kind of workaround and it's still unclear to me what caused this problems). 2015-03-12 16:54:30 +01:00
LevelX2
68255ac316 Removed http://mtgimage.com/ from image download sources. 2015-03-11 17:11:30 +01:00
fireshoes
977645f88f Fixed minor spelling errors 2015-03-06 17:25:17 -06:00
fireshoes
392631953d [DTK] Updated mtg-cards-data.txt. Added Epic Confrontation. [ORI] Added set Magic Origins. [MMB] Added set Modern Masters 2015 and Karn/Emrakul/Goyf reprints. 2015-03-06 17:18:39 -06:00
LevelX2
68efd82ee8 * Storm counter - Moved the counter to hot key area to prevent area movement for small screen resolutions. Added an option in preferences to switch counter on/off. 2015-03-05 18:03:43 +01:00
fireshoes
db379f6ff5 Added set Prerelease Events foralready implemented pre-release promos. Added latest Game Day and Launch promos. 2015-03-04 21:44:58 -06:00
fireshoes
97a1c2228f Added Dragons of Tarkir set 2015-03-01 20:29:34 -06:00
LevelX2
6bd17716cd Some minor changes. 2015-02-27 18:09:49 +01:00
LevelX2
fa59699769 Made the storm counter more visible. 2015-02-27 01:08:08 +01:00
LevelX2
79e9312893 * Fixed the annoying SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" on client start. Updated a lot of POM references. Fixed warnings of Test Project. Some changes to logging. 2015-02-20 13:58:13 +01:00
LevelX2
d8e1a843c6 * Tidehollow Sculler - Fixed that the exiled card did not return opponents hand. 2015-02-16 20:46:23 +01:00
LevelX2
ea8446d097 * Added some error handling for connect to server action. 2015-02-07 18:15:11 +01:00
LevelX2
4e56e584b6 * Fixed that PriorityTimer was not canceled. Added gaeId to Timer name. 2015-02-05 22:43:51 +01:00
LevelX2
0f61f5269d * Fixed storm counter (removed +99 amount and showing only figues > 0). 2015-02-04 17:31:21 +01:00
LevelX2
41c6c47092 * Added promotional, Duel Deck and Non-standard-legal sets to SetType. Changed sets and set selection accordingly. 2015-02-04 00:34:18 +01:00
LevelX2
91fe62b396 Added a little spell cast during current turn counter (Storm) below the phase panel. 2015-02-03 17:31:40 +01:00
fireshoes
e97dd1299f Added WPN Gateway set and reprints, Sol Grail, Spike Rogue, Quirion Elves, Krosan Wayfarer, Crookclaw Transmuter, and Centaur Glade 2015-02-03 00:46:33 -06:00
Kranken
f8dd3a1491 Fixed a bug when showing and hiding drafted cards
This commit fixes the following bug:

1) Draft a couple of cards in draft mode
2) Hide a card
3) Show all cards
4) Hide another card

Here both cards got hidden, this commit makes sure
only the card in 4) gets hidden
2015-02-01 16:45:05 +01:00
LevelX2
8d6c25b3e8 * Fixed handling of morphed cards in exile zone. 2015-01-31 12:45:54 +01:00
LevelX2
6ef8b4f976 * Reworked DB comparison between client and server. 2015-01-25 19:21:50 +01:00
LevelX2
3d55659568 * Fixed that permanets attached to non permanents (Enchant player and no curse / enchant card in graveyard) are shown wrongly attached to the first other permanent on the battlefield (fixes #632). 2015-01-24 23:21:00 +01:00
LevelX2
001e17a73e * Fixed handling of enlarged view for manifested and morphed cards. 2015-01-24 19:43:53 +01:00
fireshoes
89a991156d Updated some Media Inserts set information and added some reprints 2015-01-13 02:28:56 -06:00
LevelX2
f2a9a75e8f * Client cards db will be compressed nos as you close XMage client. 2014-12-31 15:57:18 +01:00
LevelX2
64176c1fa6 * Fixed possible null pointer exception for add land dialog. 2014-12-29 15:06:56 +01:00
LevelX2
dda73f304e * Fixed possible null pointer exception for add land dialog. 2014-12-29 15:05:01 +01:00
LevelX2
d4ad6cf6a6 * Added some more set aliases. 2014-12-27 17:35:46 +01:00
LevelX2
c4ad51c4af * Tournament password - Fixed that the dialog to enter the password was not opened. 2014-12-27 03:52:07 +01:00
LevelX2
7d30d288be * Chnages to text of priority prompt. 2014-12-26 23:00:02 +01:00
LevelX2
071a611f91 * Added phase step name to the priority prompt text. 2014-12-25 02:08:24 +01:00
LevelX2
9ff1f60903 * Added card name and set abbr. to error message if download failed. 2014-12-25 02:00:58 +01:00
fireshoes
f3707e1f53 Added Grand Prix, Launch Party, and WMCQ promos 2014-12-24 02:41:45 -06:00
fireshoes
8d0e277dbb Added Judge Promos 2014-12-23 22:08:13 -06:00
fireshoes
c93c5c3011 Added Game Day promos 2014-12-23 14:52:09 -06:00
fireshoes
a8b20f23d5 Added Friday Night Magic promos 2014-12-23 06:49:01 -06:00
fireshoes
086f860396 Added Fate Reforged set, Valorous Stance FRF card, KTK Block Constructed option, added missing card to Holiday 2014 Cube 2014-12-21 19:57:23 -06:00
fireshoes
9ea54b38c2 Merge origin/master 2014-12-20 04:47:33 -06:00
fireshoes
bf29352ba6 Added Fate Reforged set and Pride of the Clouds card 2014-12-16 14:07:59 -06:00
LevelX2
424448b38f * Handling of resource images fixed. 2014-12-14 22:54:58 +01:00
LevelX2
213275de5a Some changes to play of audio clips. 2014-12-12 18:16:23 +01:00
LevelX2
1ed1bc2e0d * Added a color indication in the tooltip window. 2014-12-12 11:34:34 +01:00
LevelX2
44c797f88e Added 4 missing duel sets and the already implemented cards. Some changes to logging of download. Some fixes to token download configuration. 2014-12-11 12:46:06 +01:00
LevelX2
30869beca0 * Some changes to game start logic (better handling for disconnected users). Changes to server logging. 2014-12-08 01:30:18 +01:00
LevelX2
cee5d0d487 * Added sound for starting game. 2014-12-05 20:13:48 +01:00
LevelX2
07b509684a * Fixed some handling problems with face down creatures (Ixidron). 2014-11-28 17:38:53 +01:00
LevelX2
4262850553 Modified logic that decides when the popup window will be enlarged. 2014-11-28 09:13:28 +01:00
LevelX2
4ae5ac129d Some tweaking to the size of the card popup window. 2014-11-27 15:20:45 +01:00
LevelX2
eca6042257 [C14] Added some colorless cards. + Ruhan of the Fomori. 2014-11-27 15:20:08 +01:00
LevelX2
1cdf2ab4b0 [C14] Added two planeswalker and 10 black cards. 2014-11-27 00:56:35 +01:00
LevelX2
67479bb5a4 * Fixed wrong timer handling while other player controlled a player's turn. Attackers now marked with blue frame. Playable cards have a violet frame. If a player has to select cards from hand, the possible cards are marked yellow now. Discard of multiple cards now marks already selected cards and happens in one selection. 2014-11-26 01:48:00 +01:00
LevelX2
7e145d2cfd * Added possibility to allow other players to see hand cards of player. 2014-11-24 23:03:21 +01:00
LevelX2
c22b54d262 *Draft - Non hidden picked cards go to the deck. Hidden cards to sideboard. 2014-11-23 18:43:31 +01:00
LevelX2
fb2d367992 * Phasing- Fixed that permanets with phasing did not phase out at controllers untap step and phased out permanents where count as on the battlefield. 2014-11-23 13:00:58 +01:00
LevelX2
bf3fa37e5d * Draft - Added possibility to hide (and show again) cards from the picked cards area. 2014-11-22 18:19:59 +01:00
LevelX2
6d23ab616d * Server list - Added pref configuration for server list URL. Server list will now be saved to client dir and used if configured URL is not reachable. 2014-11-21 15:42:13 +01:00
LevelX2
2e68f6c692 * Draft - Fixed that first draft direction is shown as left, second as right and third again to left. 2014-11-19 15:12:17 +01:00
LevelX2
2b5c95b6a7 Added some Odyssey cards, added Archenemy Set, added some Squirel cards. 2014-11-16 11:07:31 +01:00
LevelX2
a2484cc6d9 Added F10 to skip priority while the stack resolves. 2014-11-16 08:59:59 +01:00
LevelX2
108faf4c8c * Commander 2014 - Added set and already implemented cards. 2014-11-09 11:07:53 +01:00
LevelX2
ef75597fa2 * Fixed includes. 2014-11-08 02:13:23 +01:00
LevelX2
a835c19533 Changed handling of tooltip size calculation. 2014-11-06 23:13:34 +01:00
LevelX2
220331dcd9 * Animate Dead (finished). Only Battlefield layout can't handle a attached card in graveyard yet. 2014-11-06 15:34:18 +01:00
LevelX2
e747326028 Added logger message to card DB exception. 2014-11-03 17:21:57 +01:00
LevelX2
999528e633 Added audio waning 1 minute before timeout for constructing or sideboarding deck. 2014-11-03 07:59:58 +01:00
LevelX2
532345e28a * Darft - Play countdown sound during drafting only if no card from curretn booster was draft. 2014-11-02 12:12:39 +01:00
LevelX2
8426816b09 * Some changes to table and match view. 2014-11-01 14:24:23 +01:00
LevelX2
18d71a9377 * Added display of player order to the draft panel. Added tray info for next card to pick if the XMage window is not active. 2014-11-01 01:59:33 +01:00
LevelX2
2a2c593dd8 * Fixed a bug that changing player type started unwanted cascading change loop that needed longer time to resolve. 2014-11-01 01:57:26 +01:00
LevelX2
1396760d5e * Fixed a problem that prevented cards from beeing marked as choosable in select card panel after the changes made for displaying resized counters. 2014-10-31 18:34:41 +01:00
LevelX2
e6c7fa5f96 * Draft - Added possibility to mark a card to draft on timeout. Added sounds to draft. Changed compression of some sound files. 2014-10-31 16:22:10 +01:00
LevelX2
c3adb1337b * Game layout fix to prevent unneccessary area movement. 2014-10-31 10:36:41 +01:00
LevelX2
2ac1340af7 * Some changes to version handling. Added display of server version (incl. minor server version) in client window titel. 2014-10-31 10:35:53 +01:00
LevelX2
b158ef4f3c * Added acustic an optical signals for use of skip buttons. 2014-10-30 23:43:32 +01:00
LevelX2
df71237f46 * Added logic to auto select replacement effects. Some changes to counter size and font size handling. 2014-10-30 20:40:23 +01:00
LevelX2
ab9c0ae893 * Create tournament dialog - Set min number of swiss rounds in relation to number of players. 2014-10-29 17:20:10 +01:00
LevelX2
791cc828c4 Fixed tournament panel color setting. 2014-10-25 16:01:44 +02:00
LevelX2
2cc129daa6 Changed ChatPanel transparency setting. 2014-10-25 16:00:56 +02:00
LevelX2
ac4c7048c0 [BOK] Added 3 cards. 2014-10-22 19:57:48 +02:00
LevelX2
c3c0d047b1 * Some minor changes to pom files. 2014-10-22 11:55:19 +02:00
LevelX2
2fae1df8c7 * Reverted chat focus handling change. 2014-10-20 00:50:52 +02:00
LevelX2
58bbe60c72 Merge origin/master 2014-10-18 23:04:15 +02:00
LevelX2
b9285c0118 * Fixed wrong imports. 2014-10-18 23:03:36 +02:00
betasteward
55d2233f2e Merge branch 'master' of https://github.com/magefree/mage 2014-10-18 14:11:13 -04:00
LevelX2
0ecb04d8d2 * Minor change to user info. 2014-10-18 18:23:05 +02:00
LevelX2
2bd14269d6 * Finished button handling above stack. 2014-10-18 12:15:40 +02:00
LevelX2
26e1e5daa5 Moved button panel from third split panel above stack area (functional but not finished yet). 2014-10-17 17:23:43 +02:00
betasteward
9e28fa9b0c fix to allow Launcher to start client - also slightly improves performance 2014-10-14 13:58:52 -04:00
LevelX2
fd3b8f4c29 * F4/F5/F7 can also be used now without having priority. 2014-10-14 15:29:21 +02:00
LevelX2
bdd163080d * Draft - Show draft time and draft progress. Show game threads and ma games. Fixed a problem with AI player and password. 2014-10-12 22:37:39 +02:00
LevelX2
499b548a14 * Some changes to chat handling to fix unintended empty line. 2014-10-12 18:56:37 +02:00
LevelX2
b206983e75 * Fixed that deck elements visible state of JoinTablePanel was set wrongly. 2014-10-12 12:34:29 +02:00
LevelX2
5ccc1c91ae * Tournaments - Added handling for constructed formats and password protection. 2014-10-12 04:19:28 +02:00
LevelX2
8f690f7e02 * Added option to start matches with password protection. 2014-10-11 16:29:37 +02:00
LevelX2
e424635d20 * Fixed typo in info message. 2014-10-11 10:19:26 +02:00
LevelX2
05ba67a9c9 Added player life to tooltip of small player name label (if no avatar images is shown). So life can be shown (at least with tooltip) if the top card of library is turned face up. 2014-10-06 14:34:26 +02:00
LevelX2
7f46323f67 * Added F7 to skip until next main phase. Added some preference options to skip handling. Clicking on phase bar opens now phase bar preferences. 2014-10-05 14:33:47 +02:00
LevelX2
af4fa9d542 * Fixed that watching tournament could not be started. 2014-10-05 00:39:52 +02:00
LevelX2
140ffb256a * Fixed Standard Format selection. Client used fixed date. Check on deck validator used wrong month (1.11 insted of 1.10). 2014-10-02 16:59:25 +02:00
magenoxx
922e35ff1c Fixed NPE in tooltips for Emblem choose-trigger 2014-10-02 12:17:25 +04:00
LevelX2
8ac8d36c03 * Some connection handling changes. 2014-10-02 01:14:32 +02:00
LevelX2
e0ffef40cc Added possibility to set some more JBoss Remoting parameters with config.xml on server start. 2014-10-01 16:04:26 +02:00
LevelX2
e765e3a0b9 * Fixed show card name preferences handling that prevented to switch off card names. 2014-09-29 20:00:40 +02:00
LevelX2
2835a4e152 Some fixes to reconnect handling. 2014-09-28 15:45:15 +02:00
LevelX2
d2f7063e25 Fixed that tooltip popup window was not shown if additional card name was deactivated. 2014-09-27 19:59:16 +02:00
LevelX2
4f5c8fc45d Removed some debug messages. 2014-09-27 19:58:22 +02:00
LevelX2
0a068e2258 * Fixed chat command handling (\list), the user chat input is now escaped to prevent using html tags. 2014-09-26 19:42:58 +02:00
LevelX2
54ec3b658e * Added preferences setting to switch on/off to write card names in bigger font on card panels. 2014-09-26 19:40:57 +02:00
LevelX2
02ca83324c * Client - Don't load games again if not neccessary if "Games" menu item is clicked. 2014-09-26 13:44:57 +02:00
LevelX2
2c63d3bff8 * Client connect - Fixed that reconnect request was also shown if no successful connection was set up before. 2014-09-25 23:13:05 +02:00
LevelX2
341db7b01f * Morph Ability - Some fixes for displaying / handling morph cards/permanents. 2014-09-25 16:51:41 +02:00
LevelX2
f3ea64e27c * Changed handling of phases to stop to server based handling. 2014-09-25 00:33:58 +02:00
LevelX2
aa842efacc Added F5 button to skip priority until end step of opponent. Added PlayerAction handling. 2014-09-24 16:55:51 +02:00
LevelX2
ebd21eab1d Fixed a problem that manual mana payment was sometimes hard because the mana labels covered the mana buttons. 2014-09-24 16:54:33 +02:00
LevelX2
cc713808cf * Download definition for M15 + CNS token and emblem images. 2014-09-22 23:31:26 +02:00
LevelX2
da0100d3fd Increased window size of pick choice dialog. 2014-09-20 17:45:23 +02:00
LevelX2
a57ebc5314 * Table handling - Fixed a bug that if table owner tried to create a table with invalid deck, the table was added to the finished tables with no players. 2014-09-19 13:37:59 +02:00
LevelX2
c3fba626a2 Some changes to Morph card image display. 2014-09-16 07:53:00 +02:00
LevelX2
bc5dc80f95 * Chat panel - Fixed that the text of the chat panel was changable by the user. 2014-09-13 21:06:28 +02:00
LevelX2
5578e4c158 Added names to AboutDialog. 2014-09-13 11:21:54 +02:00
LevelX2
b2fc6923b9 Some changes to format of messages. 2014-09-10 22:37:35 +02:00
LevelX2
19124de0bd Some changes to format of messages. 2014-09-10 22:37:13 +02:00
LevelX2
27f658f250 Changed format of some messages to html. 2014-09-10 17:51:46 +02:00
LevelX2
e8f9c0822f * Chat / game log - Switched to html output. So mana symbols and html tags are correctly shown. Colors have to be adjusted still a bit. 2014-09-10 17:13:26 +02:00
LevelX2
382223bb90 * Deck Editor - Show images for amna symbols. 2014-09-10 17:11:06 +02:00
LevelX2
9c1f69983b Fixed a problem with NPE and match start. Chanes to handling of logging. 2014-09-09 07:45:53 +02:00
LevelX2
da44199b3d Fixed possible npe in debug info generation. 2014-09-07 15:44:21 +02:00
LevelX2
c3c77e3974 * Server - Some changes to user / match / table handling. 2014-09-07 02:28:47 +02:00
LevelX2
d051aef63f Fixed a bug of handling of tournament sub tables if a user left. Some changes to match view. 2014-09-04 19:03:48 +02:00
LevelX2
8b331eefce * Fixed a bug in table expired check. Changed expired check. Some fixed for table / tournament state handling. 2014-09-03 15:38:45 +02:00
LevelX2
fec0744315 Fixed a bug that while a match or tournament was just starting a player could still leave the table, setting the table / tournament / match to an undefined state. Now the player can only leave the Match / Tournament if it has started properly. 2014-09-03 01:02:10 +02:00
LevelX2
cb835f4f9b [KTK] Added Kahns of Tarkir set. 2014-09-01 19:25:32 +02:00
LevelX2
b98c16f061 Added connection speed information per user (milliseconds the ping needs). Some minor changes to server console. 2014-08-31 17:46:14 +02:00
magenoxx
92479c0ba0 [UI] sorting layout if counters on a permanent were changed 2014-08-29 13:33:23 +04:00
LevelX2
ee5831bdc9 * Moved workaround for #451 to first possible position main of client. 2014-08-28 01:30:04 +02:00
magenoxx
d516137a5b [UI] Putting lands with counters separately (without using land stack) 2014-08-27 13:49:10 +04:00
LevelX2
a2fe968582 Adjusting font position and size of counter amount. 2014-08-27 08:45:03 +02:00
LevelX2
dce2b027ee Updated HelperPanel button handling, try to fix #451. 2014-08-24 18:43:43 +02:00
LevelX2
aad1a2da89 * Client - Added number of active games to the header of the games column of the user list. 2014-08-24 07:03:01 +02:00
LevelX2
19de064710 Merge truevfs branch
Conflicts:
	Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
2014-08-22 12:23:43 +02:00
LevelX2
3757a4a6c9 Merge truevfs branch
Conflicts:
	Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
2014-08-22 12:23:24 +02:00
LevelX2
4990bdc9c9 Counter display - don't display counters if 0 amount. 2014-08-22 08:22:52 +02:00
LevelX2
d9a1cc1334 Added display of counters on card panel (needs probably some more fine adjusting and testing). 2014-08-22 02:38:10 +02:00
LevelX2
05f1a88157 Added image for displaying counter. 2014-08-21 17:06:38 +02:00
North
15d10f5797 upgraded truezip to truevfs 2014-08-21 16:05:55 +03:00
magenoxx
3454b2db8a For Issue#524: added connect task timeout, reduced number of auto connection retries to one 2014-08-20 08:25:30 +04:00
LevelX2
175280b381 Setting java.util.Arrays.useLegacyMergeSort=true in client main to avoid Comparison method violates its general contract of swing class. (Fixes #451). 2014-08-14 11:49:46 +02:00
LevelX2
357e80c7c2 Prevent NPE after disconnect for open tournament panel. 2014-08-13 22:01:06 +02:00
LevelX2
9020a287d6 Some NPE fixing for server and client. 2014-08-12 08:51:06 +02:00
magenoxx
97ca70318b minor change 2014-08-11 15:29:04 +04:00
magenoxx
26d763611a [UI] Fixes #481 : removed gap and moved cards up so scrollbar doesn't hide part of the hand cards 2014-08-11 15:24:03 +04:00
magenoxx
5f040b218a Fixed #467 : changing attacker color to red 2014-08-11 14:55:32 +04:00
magenoxx
eb6dc10faa [UI] Param for starting in fullscreen mode (osx only) 2014-08-11 14:39:58 +04:00
magenoxx
0e2255f71f Fixes Issue#467 : marking possible attackers with blue instead of yellow 2014-08-11 14:18:32 +04:00
magenoxx
13d80e72f1 Fixes #492 : Tarmogoyf p/t stats now also displayed in grave&exile zones 2014-08-11 13:55:07 +04:00
magenoxx
58e4c66af6 Fixes #492 : Tarmogoyf p/t stats are not displayed in hand 2014-08-11 11:10:27 +04:00
magenoxx
d1a8678086 [UI] Capitalize first leffer of abilities in ability (mode) picker 2014-08-09 10:41:17 +04:00
magenoxx
7adf282ff5 [UI] Fixed question dialogs always appearing on root virtual table instead of current one (linux&macos) 2014-08-07 15:38:05 +04:00
magenoxx
53453243dc [UI] Exile dialog 2014-08-07 15:30:44 +04:00
magenoxx
14d899ea79 [UI] Fixed only lands with two enchant lands were put aside 2014-08-07 09:07:08 +04:00
magenoxx
15dc313ffb [UI] Made land cards in stack close to each other 2014-08-07 08:46:07 +04:00
magenoxx
fbf3554051 [UI] Removing black borders for cards with images as it gives more space 2014-08-06 10:27:36 +04:00
magenoxx
9f76582bff Issue#479: increased attachments offset 2014-08-06 10:26:59 +04:00
magenoxx
95843f6fa3 [UI] Fixed Issue#470: equipped wasn't positioned correctly if equipped creature was returned to owner's hand 2014-08-01 14:04:33 +04:00
magenoxx
bd56decfd3 Fixed Issue#470: curses not displayed correctly on the battlefield 2014-08-01 13:45:41 +04:00
LevelX2
69ce53e6e8 * New Tournament dialog - Changed look of player 1 name field. 2014-07-30 20:38:15 +02:00
LevelX2
865665767b * Client - After reconnect still active game or deck editor of build step gets topmost panel again (because tablesPanel is loaded automatically now after connect to server). 2014-07-30 17:30:02 +02:00
LevelX2
ecc6295638 Added sound if player leaves table. Changed some sounds. 2014-07-26 14:59:42 +02:00
LevelX2
e25a60b312 * Changed table maneger to remove chat sessions that were never removed. Minor formattings. 2014-07-25 15:54:51 +02:00
magenoxx
b52e526c0f Fixed Issue#454: offset for enchanted permanents 2014-07-24 12:18:20 +04:00
LevelX2
3a62115c3a Added icon for triggered and activated abilities on the stack to better distinct it from casting a card. 2014-07-23 17:23:49 +02:00
LevelX2
4a3a5ff7d1 * TablesPanel - Fixed that restoring of divider positions did not work properly (update). 2014-07-23 17:21:51 +02:00
LevelX2
84f67f1fcd * TablesPanel - Fixed that restoring of divider positions did not work properly. 2014-07-23 12:07:42 +02:00
LevelX2
59142feb41 * Client - The table panel is loaded automatically as getting connected to a server. 2014-07-22 17:28:27 +02:00
magenoxx
65a0c9fc79 [UI] Displaying creatures that can attack 2014-07-18 16:05:21 +04:00
magenoxx
e949918da9 [UI] Fixed Issue#464: Play card interaction with set hand order 2014-07-18 12:07:08 +04:00
LevelX2
ee44e41da0 * Added Starter 1999 + 2000 sets + known and simple cards. 2014-07-16 16:36:57 +02:00
magenoxx
60d04e2614 [UI] Showing choosable cards in dialog - Issue#456 2014-07-15 16:31:41 +04:00
magenoxx
118196c8c3 [UI] CardPanel code clean up 2014-07-15 15:12:51 +04:00
LevelX2
0d31e319c5 * Card download - Fixed a bug that prevented to download some cards with blanks in names from MtgImageSource. 2014-07-15 01:09:20 +02:00
magenoxx
5dc2a1b8f5 [UI] removing y offset effect because of no rely on mouse message existing/order 2014-07-14 18:11:48 +04:00
magenoxx
b368e3661c [UI] Fix for NPE on battlefield cards 2014-07-14 13:49:23 +04:00
magenoxx
6cdef93426 [UI] Added minor y offset effect on d'n'd 2014-07-14 13:41:59 +04:00
magenoxx
43a31f6d98 [UI] Fixed wrong card position on d'n'd with small moves 2014-07-14 13:30:02 +04:00
magenoxx
b6e0544c95 [UI] Fixed stack cards offset 2014-07-14 13:29:32 +04:00
magenoxx
8ca8d80a5c [UI] Fixed Issue#454: Enchanted land position is not correct on the layout 2014-07-12 11:20:01 +04:00
magenoxx
bcb91dade1 [UI] Fixed popup location 2014-07-11 21:52:24 +04:00
magenoxx
5fcc3b1ba8 [UI] Displaying playable cards in hand 2014-07-11 19:35:01 +04:00
magenoxx
2b76bbf2c6 Fixed Issue#438: Enchanted permanent can't be clicked because out of sight 2014-07-11 14:40:37 +04:00
magenoxx
045a81e66a Fixed Issue#396: Display of stacking auras 2014-07-11 13:14:44 +04:00
magenoxx
f8a1b327b4 [UI] Order of cards in hand is changable 2014-07-11 10:49:00 +04:00
magenoxx
6d0d511323 [UI] Changing from card.mousePressed to card.mouseReleased. Shouldn't matter. 2014-07-10 11:00:18 +04:00
LevelX2
03e6ccf4ab [M15] Added temp. fix for image download of M15 cards from Wizards side. Problems caused by new web design of wizards. Images are now added as png files. Png images are saved with a jpg suffix name but they are correctly displayed in XMage. Needs more work for a clean solution. 2014-07-09 17:36:07 +02:00
magenoxx
41a2046479 [UI] FullScreen mode for Mac OS clients 2014-07-07 15:09:21 +04:00
LevelX2
14a58b0338 * Added Magic 2015 set. 2014-07-01 08:34:39 +02:00
LevelX2
6c6d12f40f * Fixed that game name for menu works also for watching games. 2014-06-25 12:28:43 +02:00
LevelX2
c519814f03 * Vintage Masters - Added set and already implemented cards. 2014-06-25 10:37:07 +02:00
LevelX2
eb1e8dda14 * Client Windows - Name of game in windows sub menu is now build with player names. 2014-06-25 01:32:55 +02:00
LevelX2
fc95ef68f1 * Conspiracy - Added Conspiracy set to XMage. Changed order of sets in deck editor set selector. 2014-06-23 15:58:07 +02:00
Plopman
64b0da7aab Deck editor. Don't reload all cards every times. Fix scrolling issue #439 2014-06-22 14:28:04 +02:00
Plopman
0d3223ff0e Deck editor. Simplify code 2014-06-22 12:46:06 +02:00
LevelX2
d244551e3b * Added Morph ability. 2014-06-09 17:53:55 +02:00
magenoxx
97dd0dd8a7 New XMage Logo 2014-06-04 10:45:45 +04:00
North
77d05d665d fixed Mage.Client build 2014-06-02 16:06:09 +03:00
magenoxx
c09215a7f3 build fix 2014-06-02 16:01:47 +04:00
magenoxx
4e1901166b Undo old implementation change (caused an enchant land bug) 2014-06-02 10:12:04 +04:00
LevelX2
b39eeac103 * Client - fixed wrong borders on some of the client menu bar items at the top of the window. 2014-05-30 23:00:22 +02:00
LevelX2
03f01bba3b Updated some texts, changed from MAGE to XMage. 2014-05-30 21:00:01 +02:00
LevelX2
1ae85dc1b4 Some minor formatting. 2014-05-30 18:39:32 +02:00
magenoxx
ca49dc7a31 Moved card layout strategy to separate class 2014-05-30 18:44:17 +04:00
LevelX2
09669baedc * Table / Games list - Selecting watch game for an already watched game brings the panel of the watched game to front. 2014-05-29 18:22:32 +02:00
LevelX2
37a1c9a6f9 Face down cards use now the cardback image. 2014-05-29 16:41:41 +02:00
North
2b8afe379a fixed auto reconnect feature 2014-05-28 08:35:10 +03:00
LevelX2
c13f7a2115 * Mana pool handling - Fixed bug where wrong playerId was used. Fixed that menu check state is the same for all GamePanles of client. 2014-05-27 16:54:38 +02:00
LevelX2
d9e4e99a0f Some changes to manual mana pool handling. 2014-05-27 08:37:16 +02:00
LevelX2
5481841b9f Some name changes MAGE to XMage. 2014-05-27 00:14:51 +02:00
LevelX2
71fb7bf25b Added context menu to switch between manual and automatic usage of the mana in mana pool. Manual usage is done by clicking on the mana symbol in the player panel. Still some fine tuning to do. 2014-05-24 02:56:35 +02:00
Plopman
9d8d1409b2 Added Portal and Portal Second Age set 2014-05-23 15:31:22 +02:00
LevelX2
2c5fbe20c0 Minor formatting. 2014-05-20 23:25:59 +02:00
LevelX2
f3551a1055 * Client Draft panel - Minor UI changes. 2014-05-15 08:34:43 +02:00
LevelX2
f19d4910d0 * Client - Fixed that saying "No" to confirm close didn't stop closing the client. 2014-05-14 18:45:11 +02:00
LevelX2
703529901a * HQ Images download - Fixed downlaod of basic lands and split cards. 2014-05-12 15:30:02 +02:00
LevelX2
be9da26100 Download Pictures - Writing Error Stream to log if Request is not successful. 2014-05-12 15:29:25 +02:00
LevelX2
2d109222a8 * Changed some links and messages. 2014-05-11 20:45:20 +02:00
LevelX2
0e34720611 * Some more changes to the deck editor. 2014-05-10 11:35:07 +02:00
LevelX2
5a9ccecd90 * Changed some setting for player list in main lobby. 2014-05-10 11:34:35 +02:00
LevelX2
0561499d5b * Deck editor - Added possibility to edit number of cards for deck and sideboard directly if deck editor is in normal mode to build a deck from complete card pool. 2014-05-09 16:00:37 +02:00
LevelX2
7d714947aa * Deck editor - some minor changes. 2014-05-09 01:08:07 +02:00
LevelX2
76ce168436 * Deck editor - Changed wrong reference to images. 2014-05-08 22:20:59 +02:00
LevelX2
46fb16b228 * Deck editor - Some more improvements UI changes. 2014-05-08 17:15:03 +02:00
LevelX2
dff2c9ab73 * Deck editor - Some minor changes to deck editor design. 2014-05-07 22:52:32 +02:00
LevelX2
4a83b416d4 * Deck editor - Some minor layout changes (not finished yet). 2014-05-07 18:13:20 +02:00
LevelX2
02e6ba045b * Deck editor - Some changes to card movement with double click. 2014-05-05 17:52:29 +02:00
LevelX2
473c9e207b Fixed (probably) the player1 concedes but other player2 wins. Fixed that if player runs out of timer time or player lose of beeing idle, the match will end correctly. 2014-05-01 19:34:52 +02:00
LevelX2
6d039e4262 Tournament view some design changes and the remaining construction time and the round running time is shown. 2014-05-01 19:28:33 +02:00
LevelX2
57d1dc0f6d Some additional info to the game end window. 2014-05-01 19:27:26 +02:00
LevelX2
915651335a Fixed that in tournament a automatically generated deck will be submitted if player doesn't submit a deck in time (fixes #421). 2014-04-29 17:32:24 +02:00
magenoxx
23e1f9196c Issue#424: Client now detects connection loss and asks for reconnecting 2014-04-28 22:02:29 +05:30
magenoxx
ee030c7b06 Added displaying Mem usage in Mage.Client 2014-04-28 14:53:53 +05:30
magenoxx
27dbcf2d6c Unhinged lands (Issue#416) 2014-04-25 18:10:33 +05:30
LevelX2
b930c5aae7 * HQ Image source mtgImage - Removed wrong set name conversion. Fixed name creation for split cards. 2014-04-25 11:30:13 +02:00
magenoxx
812099a9ff Probably a fix for Issue#418 2014-04-25 14:04:10 +05:30
LevelX2
236ebe2a12 Some changes to debug logging messages. 2014-04-23 08:12:40 +02:00
LevelX2
712eac2b3d * Added image download source with HQ images (mtgImage). 2014-04-22 17:20:35 +02:00
LevelX2
ce72b0a744 Added Journey into Nyx set. 2014-04-07 15:40:38 +02:00
North
e46399c1e0 removed unused state from CallbackClientImpl 2014-04-05 17:48:36 +03:00
North
af345ac299 removed unused method from MageClient interface 2014-04-05 16:47:14 +03:00
LevelX2
253bdd5d5d Added simple preference setting to download the card images in the prefered language from magiccards.info. 2014-04-03 17:14:08 +02:00
LevelX2
9ff5bcbd92 Improved reconnect and tournament handling. Reconnect time is now shown for disconneted players on player list and tournament panel. You can now reconnect (during 3 minutes) to a tournament also if meanwhile new game (after sideboarding ended) or round was started. Conceding the complete match in a tournament can no longer result in a draw, if you won games before. Quitting a tournament does now always end all active games of that quitting player. 2014-03-31 02:24:59 +02:00
LevelX2
c40dd7fb4b * Select card window - Fixed a bug that the window (also if reqiured) was closed, if you clicked on the frame of the window (e.g. to resize). Now the window is not closed in this case and can also be resized (fixes #100). However if the target is not set to required, the window is not modal and clicking anywhere beside the window, will still close the window without having made a selection. 2014-03-27 17:05:29 +01:00
LevelX2
856dd35686 * Enlarged View - Mousewheel down shows now the original image of the source card if used for an ability on stack or select window (Mouswheel up uses like before the text overlay with the ability text). 2014-03-27 17:00:58 +01:00
LevelX2
3e22c50ed6 * Card panel - Fixed a bug in deck Editor that card images were not displayed, if the number of displayed cards exactly equal to the limit of cards (300) that are shown with images. Raised the liit from 300 to 350. 2014-03-27 08:44:56 +01:00
LevelX2
c88eb2ead6 * Player types - If you connect to another MAGE server, the available player types are updated now correctly. Removed some redundant update of server information in client. 2014-03-24 14:57:55 +01:00
LevelX2
e98e63ed02 * Duel Decks - Added 4 more duel deck sets. 2014-03-20 23:41:38 +01:00
LevelX2
bc775a7d05 * Tooltip handling - Tooltip window is always closed if you click on a card panel. 2014-03-20 16:53:49 +01:00
LevelX2
d9dfa0ef37 * Exile windows - Resize of the exile windows is now allowed . 2014-03-20 13:44:06 +01:00
LevelX2
79b319777f Some clean up of the lose life framework effects. 2014-03-20 13:42:46 +01:00
LevelX2
694e1f2bf2 * Game Panel - Fixed that an open tooltip window and enlarged image view at end of game was not automatically closed. 2014-03-16 01:43:10 +01:00
LevelX2
982b95d47a * Tooltip window - Window is not forced to close as game state is updated. 2014-03-15 17:43:31 +01:00
LevelX2
17253fa099 * Battlefield layout - Permanents getting creatures and vice versa move now always immediately to the correct area / row on the battlefield (fixes #387). 2014-03-14 08:38:59 +01:00
LevelX2
c075b42e9d Improved enlarged card display if no image exists (uses same code as tooltip text creation now). 2014-03-13 15:42:26 +01:00
LevelX2
7e768ed707 * Mindslaver - Fixed a bug that cards on opponents hand showed your own cards only instead. 2014-03-13 01:09:21 +01:00
LevelX2
88aca77695 * Split cards - The images of split cards are now rotated in the enlarged image view (moueswheel up/down). 2014-03-13 00:20:37 +01:00
LevelX2
7786db1566 * Added Born of the Gods URL's for download token images. 2014-03-11 23:55:22 +01:00
LevelX2
401d65a17e * Changes to image handling of copied permanents (image is more often shown now). 2014-03-09 22:09:00 +01:00
LevelX2
2d9f260b1e * Changed mouse wheel handling for card enlargement. 2014-03-07 23:11:59 +01:00
LevelX2
59d907c981 * Improved handling of enlarged images. Added mode to show other side of flip and transform cards. Added icon for copied cards and possibility to show enlarged original or copied card. 2014-03-06 21:51:51 +01:00
LevelX2
dc73d85cd0 Minor changes to readme.md. Some minor formatiing. 2014-03-02 21:58:13 +01:00
LevelX2
595fd1a700 * Linux - Fixed that the battlefield popup menu also works when running on a linux system. 2014-03-02 21:52:02 +01:00
LevelX2
3cf7fd33ed * Elves vs. Goblins - Added missing cards and exmple decks. 2014-03-01 16:17:49 +01:00
LevelX2
8d2f4cc9ac * Draft - Added "Quit Tournament" button to draft panel. Minor formatting. 2014-02-28 17:47:27 +01:00
LevelX2
4bd4ad3d8a Fixed a bug that during sideboarding the display of the card the mouse hoovered on did stop to show in the big card panel. 2014-02-26 20:41:27 +01:00
LevelX2
562e586c26 Added missing cards for Garruk vs. Liliana duel deck. 2014-02-26 12:39:02 +01:00
LevelX2
13d39326e0 Added Elves vs. Goblins, Jace vs. Chandra, Divine vs. Demonic and Garruk vs. Liliana as sets and the already implemented cards fo this sets. 2014-02-25 03:06:17 +01:00
LevelX2
8549f72010 * Reduced created JBoss OneWay Threads on Client from 100 to 10. Some formatting. 2014-02-21 15:03:24 +01:00
LevelX2
8491b5b90b * Cleanup of server memory handling - removed memory leaks for Chat, Player, Match, Game etc. 2014-02-21 01:13:27 +01:00
LevelX2
2b2594d993 * Tournament - Show players of tournament sorted by their tournament points. 2014-02-20 15:03:14 +01:00
LevelX2
e40b44ed79 * Tables - Added the possibility to show the tournament panel for finished tournaments. 2014-02-20 12:10:15 +01:00
LevelX2
90d75a65a7 Added Portal Three Kingdoms set to Mage. 2014-02-19 19:47:08 +01:00
LevelX2
0beace4547 Removed wrong/old Preference load of sortType. 2014-02-19 17:29:25 +01:00
LevelX2
0074f2a487 * Prevented possible error when closing game panel while popup text is going to be shown. 2014-02-18 01:09:15 +01:00
LevelX2
724d84c532 * Sort setting - catched possible integer parse error. 2014-02-18 01:08:09 +01:00
LevelX2
e44abc5244 * Deck editor sort setting - fixed a bug where setting wrong data type leads to java exception. 2014-02-17 22:36:17 +01:00
LevelX2
4e5de2b7f9 * Tournament handling - Finished pairing are updated now to tournament players list immediately. 2014-02-17 00:41:40 +01:00
LevelX2
88d8c30b6c * Fixed a problem of defaulting pile setiing in deck editor. Pile setiing is now saved separate for different usages. 2014-02-15 22:34:08 +01:00
LevelX2
f2cf060b21 * Client memory - Some more changes to maximize objects for gc. 2014-02-14 15:15:04 +01:00
LevelX2
6646aaf5b2 Client memory need - Removed some unneeded references. 2014-02-13 17:12:02 +01:00
LevelX2
67e25d43bd * Finished changes for new preference option to force showing ability picker for 0 mana spells or abilities with only tap costs. 2014-02-12 20:52:33 +01:00
LevelX2
ee76ccfee4 Added option that AbilityPicker is forced to show if ability or spell has no or only tap cost (not finished yet). 2014-02-12 17:18:06 +01:00
LevelX2
81eaac46c7 * Added new preference option to enable sound in game and other sounds separately. 2014-02-12 08:35:27 +01:00
LevelX2
d4592b2ee2 * Simplified version info handling. 2014-02-11 19:36:05 +01:00
LevelX2
7f8ced259a Added missing change to MageFrame concering last memeory leak commit. 2014-02-11 14:22:30 +01:00
LevelX2
b92a2c83b9 * Memory leaks - removed some more memory leaks for match / game handling. 2014-02-11 02:23:13 +01:00
LevelX2
753ada0a01 * Fixed a cleanup problem that locked the game at game end. Minor formattings and cleanup additions. 2014-02-11 00:38:10 +01:00
LevelX2
fcce47fd28 * Table waiting dialog - changed default window size and divider position. 2014-02-07 16:05:01 +01:00
LevelX2
40c25fae34 Fixed some bugs in table handling. Fixed that matches were not set to finished yet, if players left match during sideboarding phase. 2014-02-07 02:04:14 +01:00
LevelX2
df9c200753 * Memory handling - some more changes to improve object deallocation. 2014-02-06 18:00:45 +01:00
LevelX2
2427b714a1 MageFrame changed logic the handle the activeFrame. 2014-02-06 15:22:21 +01:00
LevelX2
6fe430ecba * Changes to clear of card panel on panel remove. 2014-02-05 16:58:19 +01:00
LevelX2
f1956e4a12 * memory leaks - Made collection viewer removeable for gc. 2014-02-05 08:35:21 +01:00
LevelX2
bf4ccf185c Some minor formatting. 2014-02-03 17:47:12 +01:00
LevelX2
3cd4e9ecb7 * Memory leaks - TornamentPane can now be removed by gc. 2014-02-03 01:37:13 +01:00
LevelX2
ae555aea0e * Memory leaks - TornamentPane can now be removed by gc. 2014-02-03 01:18:35 +01:00
LevelX2
0a18a7bea6 Removed majority of memory leaks from game / editor / dialog handling. 2014-02-02 21:57:02 +01:00
LevelX2
dda33f86a4 Removed more memory leaks in game and editor panes and panels of client. 2014-02-01 18:15:42 +01:00
LevelX2
1f8555447d Removed mana leaks for deck editor and draft panels. 2014-02-01 03:26:27 +01:00
LevelX2
30ddcaf99b Some changes to reduce memory leaks. 2014-01-31 15:08:40 +01:00
LevelX2
e2c0e211ef More changes to reduce memory leaks. 2014-01-31 08:22:47 +01:00
LevelX2
da2dc4cd5a Some changes to prevent memory leaks from gamePane (not fiished yet). 2014-01-30 17:35:12 +01:00
LevelX2
c3e48a0117 * About dialog - making it modal. 2014-01-30 08:17:36 +01:00
LevelX2
4ab572bd0e * MageDialog - Removed some memory leaks for client dialogs (more to come soon). 2014-01-30 03:05:49 +01:00
LevelX2
2302b39b47 Card panels sort handling added set init value from prefs. 2014-01-29 21:08:23 +01:00
LevelX2
926210a159 * Chat time - Fixed a bug that the chat time was not updated. 2014-01-27 15:06:14 +01:00
LevelX2
89fa841d52 Set Version 1.3.0. 2014-01-25 15:55:58 +01:00
LevelX2
00b03c91b6 Some fixes for the sort setting of deck editor. 2014-01-21 17:18:02 +01:00
LevelX2
f3992bd2d5 Redesigned sorting handling of deck, sideboard and draft card area (keep sorting if and view if cards move). 2014-01-20 22:13:28 +01:00
LevelX2
e892d4388d * Draft shows now cards to draft in optimized size. Added some elements to cardPanel only if needed. Removed some legacy code about foiled card display. 2014-01-15 01:45:07 +01:00
LevelX2
418fa8dd7c * Born of the Gods - added the new set to MAGE. 2014-01-14 08:41:37 +01:00
LevelX2
e490d6af61 Added cubes for Sealed and Daft Tournaments. Added a simple Swiss like tournament format. 2014-01-10 19:58:55 +01:00
LevelX2
c0323c168c Added user info text that user can set. Addd chat whisper command. Some minor changes to chat. Impoved display of user list. 2014-01-09 13:26:25 +01:00
LevelX2
0303138a49 Minor changes to ligging and command zone tooltip. 2014-01-03 12:39:41 +01:00
LevelX2
74e3fa63a8 * Bestow - Fixed that creature with bestow went to graveyard if enchanted target got protection from a color of the bestow permanent. 2014-01-03 12:38:51 +01:00
LevelX2
b724d7fe13 Mage 1.2.0 Release 2013-12-31 17:29:00 +01:00
LevelX2
8ed26a1fe8 * new Table - Save and restore number and type of players. 2013-12-31 12:51:36 +01:00
LevelX2
a1ba324dba * Token images - added possibility to set a original set for the token to get the correct token image if it does not exist for the card itself. Fixed a lot of not found token images. Some more have to be corrected. 2013-12-27 16:43:58 +01:00
LevelX2
8cf788e9cc [C13] Added Tempt with Reflections. 2013-12-07 15:47:59 +01:00
Plopman
eb0183b79d [Client]Improve load cards for graveyard 2013-11-28 22:54:40 +01:00
Nicolas
6ad969f735 [Client]Move some unused files into "unusedFiles" directory.those files should probably be removed 2013-11-28 13:28:49 +01:00
Plopman
0d88b4055b [Client]Load cards from db only once during a game.
Display library with effects like "fetchland" are faster
2013-11-27 21:59:17 +01:00
LevelX2
0878ddb05c Added spaces to tooltip counters display. 2013-11-13 00:18:48 +01:00
LevelX2
81c8385237 Added Commander 2013 Edition. 2013-10-31 08:23:29 +01:00
LevelX2
63889f5bd4 Pushed version to 1.2.0dev. 2013-10-26 13:01:42 +02:00
LevelX2
d094f291aa Pushed version to 1.2.0dev. 2013-10-26 13:01:31 +02:00
LevelX2
18d8d3a753 Added timer to small layout (fixes #353). Added option to show player name on avatar permanently. 2013-10-26 13:01:04 +02:00
LevelX2
203dd13b44 Updated about text. 2013-10-26 12:59:20 +02:00
LevelX2
6c54812068 * User list added info about games and tournaments. Fixed a logging NPE. 2013-10-21 23:58:11 +02:00
LevelX2
c22a75a6c3 * PopUp Menus -Added F2/F3/F4/F9 to menu. Set correct popup menu for watcher. 2013-10-19 18:40:20 +02:00
LevelX2
d6c1075125 * Release Mage 1.1.0 final 2013-10-12 11:22:06 +02:00
LevelX2
cddff5fbac * Chnaged intervall for getting tables and macthes from server to 3000 milliseconds instead of 1000. 2013-10-09 17:11:13 +02:00
LevelX2
d34779fa68 * Changed logging level back to info, changed level of a lot of messages to debug from info. Added check that certain AI players can't join a table with no appropriate format. 2013-10-09 15:22:40 +02:00
LevelX2
21f101c5fa * Player list - Sorting of player names is now case unsensitive. 2013-10-08 23:21:17 +02:00
LevelX2
360a62917b Added optional server config parameter to limit the number of AI players when creating tournaments. 2013-10-07 18:14:27 +02:00
LevelX2
628569fbc9 * Players panel - The number of player online is appended to the heading text "Players (xx)". 2013-10-05 19:34:12 +02:00
magenoxx
38d5a50b23 Issue #329: displaying a token image only from the same set, displaying magic card back image otherwise. 2013-10-04 12:35:53 +04:00
magenoxx
48445a4b87 Downloading backside image. 2013-10-04 11:34:21 +04:00
magenoxx
7800f62b70 Downloading all token images even if Type 2 only is chosen. 2013-10-04 11:34:04 +04:00
magenoxx
006d3b5a87 Forgot to commit in previous commit 2013-10-02 18:26:08 +04:00
magenoxx
9d5e1dee69 Possible fix for Issue #204: The [Done] button does not appear some times 2013-10-02 18:11:05 +04:00
magenoxx
9230acffaf [images] Added the ability to download Type 2 images only (80 Mb instead of 700 Mb) 2013-10-02 12:27:26 +04:00
magenoxx
c4b1105dd4 Updated list of sets included into Type 2 format 2013-10-02 12:26:25 +04:00
magenoxx
591547d878 formatting 2013-10-02 12:25:46 +04:00
LevelX2
44ccb830b7 * Added missing function for the auto save game log function. 2013-09-30 11:21:32 +02:00
LevelX2
49db840d77 * Heroes vs. Monsters - Added duel set. 2013-09-30 08:38:18 +02:00
LevelX2
842c07e093 * Game log - Added an option to the preferences to auto save the game logs as txt files. 2013-09-30 00:18:12 +02:00
LevelX2
b6e1497b5c Minor formatting. 2013-09-28 19:13:33 +02:00
LevelX2
fe82b49930 * Join Table - Changed handling of messages while creating or joining a table. 2013-09-28 16:59:43 +02:00
LevelX2
0d6853bd8f * MageBook - Won't be loaded by default if the client starts (now the change is included). 2013-09-27 08:26:22 +02:00
LevelX2
3af0532623 * MageBook - Won't be loaded by default if the client starts. 2013-09-27 00:16:20 +02:00
LevelX2
893a3acb65 * Card editor - Done some code cleanup, done some speed up for card loading time. 2013-09-26 17:26:23 +02:00
LevelX2
0468fe7299 Show info in card tooltip of permanents if controller not equal owner. 2013-09-23 14:58:21 +02:00
LevelX2
825277bad9 Load and save setting of deck generator. 2013-09-23 14:57:50 +02:00
LevelX2
4b15dafda3 Save and load tournament settings. 2013-09-23 08:39:34 +02:00
LevelX2
6066cc2308 Removed unused Constants class. 2013-09-05 16:27:12 +02:00
LevelX2
7f6eca171e Redesigned handling of chat start message. 2013-09-05 16:25:14 +02:00
LevelX2
5496cb4afd Added the Theros set. 2013-09-02 17:10:38 +02:00
LevelX2
182839d41a Added some new sound files (PlayerLost, PlayerWon, PlayerSubmittedDeck, PlayerLeft). 2013-08-31 19:00:38 +02:00
LevelX2
ae697db2d8 * Fixed possible NPE in CardView (fixes #278). 2013-08-28 16:23:04 +02:00
LevelX2
ae44981cfa Added a game end dialog, that shows the result of the finished game. 2013-08-07 16:50:25 +02:00
LevelX2
2225c6f988 [Minor] Formatting. 2013-08-05 18:03:38 +02:00
LevelX2
78dc712944 Allow to generate 40 or 60 cars decks. 2013-07-30 13:42:20 +02:00
LevelX2
3d2f262ff4 Field alignment in new table dialog. 2013-07-30 13:41:40 +02:00
LevelX2
0ba83a7d5d [minor] Formatting. 2013-07-30 13:41:07 +02:00
LevelX2
a0c3f32b9b Added tip to tips shown at chatpanel at game start. 2013-07-23 17:21:03 +02:00
LevelX2
7d0cf3cd8c Set version to 1.1.0 dev. 2013-07-21 22:52:25 +02:00
LevelX2
2e5fc5fc98 Some small changes for Release 1.0.3 2013-07-21 09:45:58 +02:00
LevelX2
57bec7a0c1 Fixed that the chat text input area's high was to small to show the descender of letters completely. 2013-07-19 14:20:16 +02:00
LevelX2
41034ccdd8 Split pane divider positions of table panel and tournament panel are saved and restored now. 2013-07-19 14:04:59 +02:00
LevelX2
85b8edf630 Improved player quits / leaves mage handling for tournaments (not perfect yet, will more improve it). 2013-07-18 17:40:06 +02:00
Plopman
e6847a472d [Commander] Display Commander in client 2013-07-17 20:35:52 +02:00
LevelX2
10fd7c6f6a Removed old debug messges. 2013-07-17 17:31:49 +02:00
LevelX2
9838dea551 Added possibility to show tournament panel and watch tournament games (if allowed at tournament start) for spectators . 2013-07-16 17:39:02 +02:00
LevelX2
178b4cb158 Fixed random set for basic land definition. (Fixed issue #274) 2013-07-15 13:27:12 +02:00
Li REN
ec1ee245f8 adjust path of sounds and music
add sample BGM
delete a sample deck that cause error in release
2013-07-12 16:57:58 -04:00
LevelX2
c4f6d95f5a Fixed deck generator for client decoupling. 2013-07-10 20:07:33 +02:00
LevelX2
68b2f589f0 Added some missing configurations for M14. 2013-07-10 14:11:11 +02:00
LevelX2
034f71cead Fixed NPE for picking order of triggered abilities. 2013-07-09 22:52:17 +02:00
LevelX2
5a8a7b19de Client add land set search uses now ExpansionRepository. 2013-07-07 18:23:31 +02:00
LevelX2
ec3565e5f7 Using now ExpansionRepository or tournament booster selection in client. 2013-07-07 18:22:13 +02:00
LevelX2
a3e041e364 Cleaned up PhaseManager. 2013-07-07 18:18:40 +02:00
LevelX2
51e4caca19 Tables panel - check for null value of date finished. 2013-07-06 15:15:20 +02:00
North
4657268476 fixed bug where one couldn't create a sideboard in the deck editor 2013-07-06 10:46:18 +03:00
Nicolas
ff5d16e132 Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-05 18:51:20 +02:00
LevelX2
f540e78045 Fixed some display problems with emblems and there abilities on the stack. 2013-07-05 18:49:42 +02:00
Plopman
e3ab68bb37 Added M14 in ConstructedFormats 2013-07-05 18:48:40 +02:00
LevelX2
42dc0d142c Improved Emblem handling. Added a MageObjectType to CardView (in progress). 2013-07-05 15:29:55 +02:00
LevelX2
5897f764e5 Fixed a NPE bug when calling the test.dck. 2013-07-04 23:36:51 +02:00
North
96ff08dc9a Merge branch 'decouple-client'
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
2013-07-03 21:42:40 +03:00
LevelX2
c28bdf8a02 Added alternate part as commets to get UI editor to run. 2013-07-02 23:48:02 +02:00
LevelX2
7b260c960b Added a quit match option. FFA game gets no more killed if host left mage or quitted match. 2013-07-02 22:15:49 +02:00
North
ae86414658 Removed getAllCards method from CardRepository 2013-07-01 23:46:27 +03:00
LevelX2
06163d6ac5 Adding Player state to TournamentPlayer and TournamentPanel. 2013-07-01 17:11:44 +02:00
LevelX2
319135b8ed Cleanup preferences dialog. 2013-07-01 12:41:13 +02:00
LevelX2
7ef8753183 Cleanup wrong includes in TournamentPanel. 2013-07-01 10:13:31 +02:00
LevelX2
4c129706ca Cleanup layout of preferences dialog. 2013-07-01 08:27:33 +02:00
Li REN
df6f43761e Merge pull request #257 from Noahsark/master
update
2013-06-30 12:07:20 -07:00
Li REN
70ebb6bfbc add UI to adjust BGM path 2013-06-30 15:05:30 -04:00
LevelX2
eaf55be919 * Draft tournament - NPE on draft construct deck start. 2013-06-30 16:40:11 +02:00
North
1fccbd6b87 Merge remote-tracking branch 'origin/master' into decouple-client
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
2013-06-30 11:26:40 +03:00
LevelX2
17c893799f Added a close button, tournament header infos, name in window item and movable divider bars to the tournament panel. 2013-06-29 22:30:43 +02:00
LevelX2
4cb4a377d2 Changed message of the day panel to full width. 2013-06-29 22:28:52 +02:00
LevelX2
63783d9fe2 * Tornament construction time - Fixed that the selected value was not used. 2013-06-29 17:52:19 +02:00
North
dc0db40428 removed planechase from wizards image source (doesn't exist) 2013-06-29 18:00:18 +03:00
North
3558a67f77 added M14 to wizards download source 2013-06-29 17:26:09 +03:00
North
619b7222e7 refactoring to cards downloading and image path generation 2013-06-29 16:59:23 +03:00
North
6c51bcd599 fix for lands download (wizards source) 2013-06-29 16:58:53 +03:00
North
a43bc8bed6 fixed issue where second face was considered a card 2013-06-29 12:52:43 +03:00
North
4c83fd7d6a fix for downloading cards from wizards spoilers 2013-06-29 00:08:10 +03:00
North
a5eebbbf12 fixed NPE at downloading card images 2013-06-27 23:57:38 +03:00
LevelX2
e1ae922214 Some match time options added. Set the deafult macth time to 25 minutes per player. 2013-06-24 17:09:21 +02:00
LevelX2
5898f8a798 [minor] Changed layout of create tournament table dialog. 2013-06-23 02:45:30 +02:00
LevelX2
738efcc47f Added option to select time limit (also none) on match or tournament creation. 2013-06-21 21:34:06 +02:00
magenoxx
66d1a66967 [Timers] Removed debug logging. 2013-06-20 18:09:30 +04:00
magenoxx
7c187a1d2a Fixes for timers. 2013-06-20 15:50:06 +04:00
Li REN
64f2452089 simplify image file filter for background 2013-06-20 01:24:16 -04:00
Li REN
7a6f42556e simplify image file filter for background 2013-06-20 01:21:36 -04:00
magenoxx
b6fddc301c Merge branch 'master' of https://github.com/magefree/mage 2013-06-20 00:20:42 +04:00
magenoxx
6532aaffdf Timers on client side. Refactored. 2013-06-20 00:17:06 +04:00
North
1b3a51484e replaced Card instances in client with MockCard 2013-06-19 22:53:53 +03:00
North
462992e838 removed dependency to Mage.Sets and Mage.Server 2013-06-19 21:21:35 +03:00
magenoxx
42dd9d81b4 Timers (In progress) 2013-06-19 17:12:31 +04:00
North
fb2ea95f55 removed card scanning from the client 2013-06-18 22:47:01 +03:00
North
0166975e83 refactored getSetCodes to be used from ExpansionReposiitory 2013-06-18 22:46:09 +03:00
LevelX2
e1db02baec Added a sound playing if human player joins a match. 2013-06-17 21:38:30 +02:00
Li REN
b8e7a50415 Merge pull request #11 from magefree/master
update
2013-06-17 11:28:58 -07:00
Li REN
200c791eed fix a bug causes npe. 2013-06-17 14:27:54 -04:00
LevelX2
95a12028e6 Added small icon for tokens on token permanents. Token copied from permanents (Giant Adephage) show now the image of the permanent. 2013-06-17 17:00:17 +02:00
LevelX2
5216eddb71 In the card info (tooltip) tokens have now the work "Token" written below the expansion symbol. Some code cleaning concering handling of counters. 2013-06-17 13:59:23 +02:00
Li REN
848e542ee4 clean 2013-06-17 00:01:37 -04:00
Li REN
b057857485 Transfer timeout counter to clock format (minute:second, for example, 100 -> 01:40) 2013-06-16 23:53:25 -04:00
North
d91813b08a removed Card dependency for image downloading 2013-06-16 18:13:51 +03:00
North
b13394f03c refactoring to CardImageSource 2013-06-16 17:19:10 +03:00
North
467d246a12 renamed CardInfo to CardDownloadData 2013-06-16 16:14:40 +03:00
North
1d4b3a2be6 Merge branch 'constants-refactor' 2013-06-16 15:25:35 +03:00
North
0bb110be45 [refactor] moved enums from Constants class 2013-06-16 12:28:10 +03:00
Li REN
2424c80718 Set default view of Sideboard to cardGrid. Make it similar to MTGO setting. 2013-06-16 04:06:28 -04:00
Li REN
1749eb7ded Add a feature to addlandDialog. Now it can help player calculate lands they need as the same function on MTGO. 2013-06-16 03:29:56 -04:00
Li REN
fab2759579 update and adjustment 2013-06-15 04:12:26 -04:00
Li REN
11ed1f57d4 fix a bug of package importation that cause code not be able to compiled 2013-06-15 02:50:02 -04:00
Li REN
8ac58cfc41 Combine ThemePluginImpl into Mage Client project to avoid cycling dependency. 2013-06-15 02:01:58 -04:00
Li REN
c5873fdc2a Add UI for background image selection - selection, random, default 2013-06-15 00:53:18 -04:00
LevelX2
84df0f2c43 * Added tournament options for adjustable construction time and free mulligans
* Added duel options for free mulligans
2013-06-14 23:45:30 +02:00
Li REN
7ce050641d fix a bug of MusicPlayer that cause nullpointer exception 2013-06-14 13:04:48 -04:00
Li REN
cc49f71b3c Clean the code 2013-06-13 20:24:26 -04:00
Li REN
c41a2df3ac Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well. 2013-06-12 23:34:43 -04:00
Li REN
6bbaa9fda1 Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well. 2013-06-12 22:55:25 -04:00
Li REN
7102d08637 Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well. 2013-06-12 22:27:08 -04:00
Li REN
3eef0b1080 Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well. 2013-06-12 22:18:49 -04:00
LevelX2
3dbdba32e9 * Number of wins can be set for tournaments. * Current score of running matches is shown in the table list. 2013-06-10 16:25:31 +02:00
LevelX2
dec8f24c68 * The list of completed matches and tournaments shows now also columns with start and end time. 2013-06-10 14:12:24 +02:00
LevelX2
00f22afdf0 Added Modern Masters set and already implemented cards. 2013-06-06 21:44:16 +02:00
magenoxx
b25b91b325 Issue#232: Avatar pictures sometimes missing 2013-06-05 10:39:48 +04:00
LevelX2
010645b406 Fixed that PC2 mythic expansion symbol was not loaded. 2013-06-03 08:28:28 +02:00
LevelX2
6718332f6a Workaround for issue #213, removing object from the stack that wasn't correctly removed. 2013-05-23 20:28:30 +02:00
LevelX2
5336d4c0f9 Pushed version to 1.0.3 dev. 2013-05-12 16:00:25 +02:00
LevelX2
6b38cd5b18 Mage Version 1.0.2 2013-05-11 23:06:30 +02:00
LevelX2
101194acf7 Many changes to split cards handling (showing arrows and log text for fused spells., handling protection and other things correctly). 2013-05-11 20:11:58 +02:00
LevelX2
b352217e17 Some improvements to split card handling. Better display of tooltip of split cards, also added handling if not cast from hand. 2013-05-09 21:26:15 +02:00
LevelX2
a29dc6cb18 Changed split card name using " // " as separator to be more conform with elsewere used name. But image save name uses " - ". 2013-05-09 14:02:15 +02:00
LevelX2
25948e089e Implemented Split cards, not yet finished. Fuse does not work. Comparation for e.g. converterted mana (708.6a) does also not work correctly. 2013-05-01 21:41:56 +02:00
LevelX2
b6ddaabe44 Show user name in title bar of MAGE. Clear table chat after disconnect. Remove user from chat after disconnect. Some tweaking about the messages if a user disconnected/session expired. 2013-04-29 17:18:43 +02:00
LevelX2
a37a5e0e1c Display life > 99 and cards in graveyard > 99 with smaller font. 2013-04-15 18:50:05 +02:00
LevelX2
8fc9ca7a94 Fixed a bug that the sets Shards of Alara and Alara Reborn were swapt in client logic. 2013-04-11 16:38:12 +02:00
LevelX2
2fc53fa71e Added Commander and Dragon's Maze set objects to MAGE. 2013-04-10 16:55:31 +02:00
LevelX2
f644ffe041 Changed color of frame of avatar for active player to green again. Checked that a player of a game can't also watch his own game. Added a match score to the start of the game log. Changed the color of the Turn [X] message. Tips and join messages during a game are displayed in the chat panel instead the game log panel. Display of the player name when hovering over the avatar is more vertical centered. 2013-04-07 21:29:27 +02:00
LevelX2
cb6ac8e619 Some spelling changes to reminder text of shortcut keys. 2013-04-05 23:44:59 +02:00
LevelX2
b4f424a9a9 Send now also event to server if you click on a face down card. 2013-04-04 00:07:11 +02:00
LevelX2
6a9a245c15 Setting from new table dialog are saved and restored from java prefs when the client is started. 2013-04-03 21:24:18 +02:00
LevelX2
de20fcb5cc [minor] formatting 2013-04-02 13:46:43 +02:00
magenoxx
97acebacdd Pumped version to 1.0.2.dev 2013-04-01 16:00:30 +04:00
magenoxx
143f0f76e7 Fixed #180 : Paying additional cost of Mana Leak or Spell Rupture isn't handled correct 2013-04-01 14:24:56 +04:00
LevelX2
7ef08656f6 [Minor] change of phase display. 2013-04-01 03:31:57 +02:00
LevelX2
c88093d699 The table list of current matches / tournaments shows now all names of players. 2013-03-31 20:13:04 +02:00
LevelX2
ca9b424f1a Made background of top area of the cardSelector brighter to make it better readable. 2013-03-31 19:17:00 +02:00
magenoxx
29b84e0d92 Closed #169: Make it possible to untap lands 2013-03-29 20:35:16 +04:00
magenoxx
dd9aec6a49 Minor fix 2013-03-29 19:11:00 +04:00
magenoxx
fab1417421 Fixed #178: During watching a game you get Concede and Cancel as menu point with right mouse button 2013-03-29 17:36:03 +04:00
magenoxx
05191e8793 Closed #168 : Enhance priority hot keys 2013-03-29 17:18:12 +04:00
LevelX2
402f7fffd9 Tournaments status is updated now and if tournament finished, it's moved to the lower finished matches view. 2013-03-27 22:31:15 +01:00
LevelX2
095c3c5776 Improved message transformation. 2013-03-27 22:29:50 +01:00
LevelX2
7014b28797 Improved sceduled logic to remove bugged tables. Reactivated logic to show the list of the last finished 50 matches (no replay possible). 2013-03-27 16:58:34 +01:00
LevelX2
30b738b3ad Fixed a bug for loading selected view from java prefs. Minor formatting. 2013-03-27 14:52:03 +01:00
LevelX2
39d67eec8a Last settings for CardView concering view, piles and order are always saved and restored in Java Prefs now. 2013-03-27 08:26:04 +01:00
LevelX2
12a01788e6 Added a new column to the table list showing the number of wins for matches and number of used / total seats for tournaments. 2013-03-26 17:18:43 +01:00
LevelX2
d4e12b2fea Fixed a small bug that player list was not updated if size didn#t changed but values. 2013-03-26 15:33:47 +01:00
LevelX2
d8961a7a82 [minor] formatting 2013-03-26 13:43:24 +01:00
magenoxx
3a59ca9465 Not changing hand ui size in small mode 2013-03-22 08:39:35 +04:00
magenoxx
3afa5cc867 Fixed Issue #[166]: Allow table creator to remove table - added confirm dialog 2013-03-22 08:26:57 +04:00
magenoxx
67fcf4a911 Implemented Issue#166: Allow table creator to remove table - added remove action also for watch/replay state 2013-03-20 08:29:57 +04:00
magenoxx
4adb63cc7a Fixed Issue#165: Decksize over 99 cards not displayed correct 2013-03-20 08:27:55 +04:00
magenoxx
13c2b2d477 Implemented Issue#166: Allow table creator to remove table 2013-03-20 08:09:36 +04:00
magenoxx
3191ad7e32 Fixed Issue#158: The select a pile window is shown over the tooltip window 2013-03-15 11:53:32 +04:00
North
a7a565bb8f [minor] access modifer order 2013-03-10 14:53:02 +02:00
LevelX2
aa0290fd32 Set Version to 1.0.1 2013-03-10 11:40:56 +01:00
LevelX2
dc131fa8dd Changes to show name and number of counter on a card. 2013-03-04 00:03:21 +01:00
LevelX2
cc96a55523 Some changes to logging. 2013-03-04 00:01:12 +01:00
North
2daae9fb47 [minor] code style 2013-03-03 10:41:31 +02:00
North
122e9c700d URL hash and equal methods do IO operations; replaced with URI 2013-03-02 20:06:57 +02:00
North
a327668660 fixed possible NPEs 2013-03-02 18:02:09 +02:00
North
c0f837c2e0 removed unused fields 2013-03-02 18:02:08 +02:00
North
cdd5c3f2d3 [minor] removed redundant modifiers 2013-03-02 18:02:05 +02:00
North
5f6f1c7528 [minor] removed unused imports 2013-03-02 18:02:02 +02:00
magenoxx
6444ff723f Fixed Issue#131: If I'm using not the default location for images, the handling of symbols is faulty 2013-02-26 16:37:14 +04:00
magenoxx
441a9870c8 Pumped version in java files and main pom 2013-02-26 15:44:21 +04:00
magenoxx
23c93be6a8 Displaying loading time for checking images 2013-02-26 13:42:07 +04:00
magenoxx
cd7b0f5b08 Client start up time speed up: don't check for new images by default 2013-02-25 20:29:09 +04:00
magenoxx
0ca04e0285 Fixed Issue#142: Player's panel cosmetic bug 2013-02-22 23:47:38 +04:00
magenoxx
7f6d730975 Fixed Issue#125: Show source/reason of triggering abilites 2013-02-22 22:54:43 +04:00
LevelX2
e4145c90b5 Fixed issue #135 that cards with miracle were always shown on the stack if it was possible to cast them with miracle also if the owner of the card dicided not to use the miracle ability. Minor formating. 2013-02-14 14:50:41 +01:00
LevelX2
13e008f102 Added a new sort mode to editor that sorts by color detailed by color combinations. 2013-02-10 10:47:44 +01:00
LevelX2
fcd24572dd Computer generated decks for tournaments use now also appropriate basic lands for the cards included in the deck. 2013-02-06 00:50:00 +01:00
LevelX2
cf62ba330d Fixed a bug that froze the game if you finished a game, pushed ok and directly started to open a new game. The FeedbackPanel.endWithTimeout() task triggered after 8 seconds and locked the client. 2013-02-04 17:00:34 +01:00
LevelX2
5f3a8eb360 Changed logic of adding basic lands in deck generation and the add land function in limited deck editor to use lands from the sets of the cards in the decks. Added missing attributes to set definitions. 2013-02-03 16:54:03 +01:00
magenoxx
2c652770fb Fixed Issue#122: Check of deck and game type during creating a new table doesn't show a qualified error message 2013-01-21 21:14:22 +04:00
magenoxx
9f241a7041 Fixed Issue#109: Unwanted blue rectangle in UI 2013-01-15 17:30:36 +04:00
LevelX2
0d3785937b Setting position of dialog centered. 2013-01-15 00:53:32 +01:00
magenoxx
3908d8f9cd Fixed Issue#108: Display of flipped cards is erroneous 2013-01-14 22:09:28 +04:00
magenoxx
3df5466d8a Added downloading flipped card images. Removed counting images for ignored sets. 2013-01-14 22:07:07 +04:00
LevelX2
6a138740ba Fixed NPE in deck editor cause by changes for issue #73. 2013-01-14 17:11:16 +01:00
magenoxx
55f40d2e9d Implemented Issue#73: Enchant Player enchantments - show enchanted player 2013-01-14 18:57:13 +04:00
magenoxx
17b8619b3e Implemented Issue#106: Display emblems of players 2013-01-14 18:16:12 +04:00
magenoxx
1fac540639 Fixed 'Graveyard' label cut on top in grave dialog 2013-01-14 17:57:03 +04:00
magenoxx
1de8321f44 Fixed Issue#107: Text of tooltip is shown behind the exile windows. 2013-01-14 11:52:05 +04:00
magenoxx
5ed24f1488 Fixed Issue#99: The choices window should be positioned centered of the battlefield 2013-01-11 16:03:31 +04:00
magenoxx
5345e93c30 Fixed Issue#75: tooltip textbox stays sometimes undesired 2013-01-11 15:52:56 +04:00
LevelX2
8b4b1691a4 Fixed set icon load of conflux. 2013-01-08 22:32:05 +01:00
LevelX2
8dab110060 Fixed a NPE in deck editor caused by fix of #84. 2013-01-08 22:31:43 +01:00
magenoxx
ec5b5845ef Fixed Issue#84: Arrows that show the targets are always on top 2013-01-08 15:58:48 +04:00
LevelX2
1b8adc2b25 Added download/image information. 2013-01-08 00:16:54 +01:00
magenoxx
c53bcd6b2b Minor fix for fixed Issue#45 2013-01-07 19:27:25 +04:00
magenoxx
fd7ab45a14 Fixed Issue#85: Frame resizing doesn't handle display of hand 2013-01-07 19:23:22 +04:00
magenoxx
78e1bb99d9 Fixed Issue#45: Textbox for tooltip is sometimes too small to show all the text 2013-01-07 18:02:45 +04:00
magenoxx
d951df41ec Fixed Issue#75: tooltip textbox stays sometimes undesired 2013-01-07 16:02:47 +04:00
LevelX2
11e2df7a86 Fixed symbol replacement and format definition. 2013-01-06 11:17:06 +01:00
LevelX2
36a2906ab5 Added "Unlimited Edition", "Revised Edition", "Limited Edition Beta", "Limited Edition Alpha" to the Format selector. 2013-01-06 09:26:18 +01:00
North
8e2b094837 Added LEA, LEB, 2ED and 3ED sets. 2013-01-05 18:14:38 +02:00
LevelX2
3b948a1e70 Added GTC (gatecrash) to some objects and lists. 2013-01-03 20:31:24 +01:00
LevelX2
5517474c90 Changed set selection for tournament boosters to only show sets with boosters. Closes issue #91. 2013-01-02 15:46:21 +01:00
LevelX2
03f419d176 Added Gatecrash to the available sets. 2013-01-02 13:33:00 +01:00
Loki
aa31ef23d3 bump version to 0.10.1 2012-12-28 12:48:26 +13:00
North
c0ad7812cd minor changes (mostly code style) 2012-12-24 18:43:54 +02:00
North
fde10788db removed redundant modifiers from interfaces 2012-12-20 23:45:47 +02:00
LevelX2
dcb904308c Game panel uses now a bigger vertical area for the bigCardPanel. Positions of the dividers of the game panel are saved and restored now. 2012-12-20 16:38:48 +01:00
North
f0b32e7ca3 Removed unused imports 2012-12-20 00:26:21 +02:00
LevelX2
4b2e6a8bc0 Redesigned handling of various art for cards. 2012-11-27 15:24:29 +01:00
LevelX2
f72e1a1038 Improved the handling of image files for handling also different images of non basic lands (e.g. Fallen Empires). 2012-11-25 20:09:13 +01:00
Loki
45316daf88 version bump to 0.10.0 dev 2012-11-17 01:46:36 +13:00
LevelX2
91b2d7056f Fixed wrong size of textbox when showing big card for the spell/ability on the stack. 2012-11-16 08:31:15 +01:00
LevelX2
ced533709d Fixed bug that the path for zip files of the card images is always the default path and never the individual defined preferences path. 2012-11-15 20:52:44 +01:00
Loki
f017ab903c version bump to 0.10.0 2012-11-15 22:47:15 +13:00
LevelX2
facfc6f1ce Added tooltip to window titel bar to show longer titels of windows at least as tooltip. 2012-11-09 01:28:28 +01:00
LevelX2
baedfd54bf Fixed card selector not removing card from sideboard. 2012-11-09 01:22:45 +01:00
North
dfbe144ad2 Fixed drafting cards 2012-11-08 23:26:41 +02:00
LevelX2
903c98b0ba Fixed loading and saving of preferences - Images options. 2012-11-08 13:59:26 +01:00
LevelX2
5e4d0a2008 Added Planechase 2012 edition to mage. Added missing Planechase entry to set selector. 2012-11-07 14:31:12 +01:00
North
e049f39cb1 Fixed image download when name contains ":" 2012-11-05 20:31:19 +02:00
North
cc306b2119 Removed CardsStorage. 2012-11-05 20:09:09 +02:00
North
f64149971a Merge branch 'CardRepository' 2012-11-05 19:37:51 +02:00
North
6f23ce362e Deleted CardTableSelector (unused) 2012-11-04 16:15:38 +02:00
North
bc80844fbe Fixed booster generation in Deck Editor 2012-11-04 16:15:27 +02:00
North
25cd490be3 [CardRepository] moved Sets, DeckImporter and CardRepository to Mage Framework 2012-11-04 12:52:02 +02:00
LevelX2
7eb6ee15c0 ExileFromHand Cost, some small changes 2012-11-03 16:41:19 +01:00
magenoxx
10ba5c2e72 Downloading images according to save_to_zip option 2012-10-23 17:10:56 +04:00
magenoxx
789ed428b7 [ui] disabled choosing path for images. added zip files option 2012-10-23 15:59:46 +04:00
magenoxx
6e1e27f51d [ui] updated about dialog 2012-10-23 15:55:13 +04:00
North
9acb0e23bc Removed unused code from Sets and ExpansionSet 2012-10-22 23:57:14 +03:00
North
08815ffb88 [CardRepository] Replaced findCard methods from Sets and ExpansionSet 2012-10-22 23:48:52 +03:00
LevelX2
62844401ee fixed M13 emblem picture download (emblem pictures are not used yet?) 2012-10-22 16:08:05 +02:00
North
271aaab5fd [CardRepository] replaced Sets.findCard(setCode, cardNum) 2012-10-21 18:30:15 +03:00
North
8d83251428 Renamed method in CardRepository 2012-10-21 18:23:27 +03:00
North
6faca63354 Removed unused methods from CardsStorage
Only ratings are left and should be moved
2012-10-21 18:15:44 +03:00
North
809910e8c7 Used CardRepository in Deck Editor 2012-10-21 18:15:43 +03:00