Commit graph

1537 commits

Author SHA1 Message Date
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
ffa959d536 Removed KTK image download stop. 2014-09-18 23:39:48 +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
LevelX2
1285df5da3 Added some modern sample decks. 2014-08-31 17:27:43 +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
Dustin Conrad
809d61d5ea Use dependency management to use common versions of log4j and junit in all the projects. 2014-08-09 19:38:34 -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
LevelX2
3aab091492 Some changes to client and server logging messages. 2014-08-04 17:21:14 +02:00
LevelX2
9f6555240a * Changes to logging. 2014-08-03 15:01:33 +02:00
LevelX2
9bcbdbb73d * Updated log4J version. 2014-08-03 14:59:51 +02: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
7b8a6e3f46 * Added an example deck. 2014-07-27 01:57:33 +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
LevelX2
63612b4291 [M15] Removed M15 image download prevention. 2014-07-09 17:32:36 +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
e02b3377b3 Added modern event deck March of the Multitudes to the example decks. 2014-05-24 19:22:43 +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
6480fb33b9 Added JOU token images definition for download. 2014-05-12 15:30:31 +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
26036b4a6b Added some modern sample decks. 2014-05-11 20:49:47 +02:00
LevelX2
2d109222a8 * Changed some links and messages. 2014-05-11 20:45:20 +02:00
LevelX2
8e56d06121 * Geju of the Fiels, Raging Ravine fixed that the given triggered ability was wrongly only given one time instead as often the activated ability was used. 2014-05-10 18:01:41 +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
15adf7be70 * JOU Intro Packs - changed basic lands to THS lands. 2014-05-05 19:30:03 +02:00
LevelX2
02e6ba045b * Deck editor - Some changes to card movement with double click. 2014-05-05 17:52:29 +02:00
LevelX2
64f6c58887 Added sample deck. 2014-05-03 09:24:20 +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
0a5bb7329e Added Jouney into NyxIntro packs to the example decks. 2014-04-30 19:09:38 +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
LevelX2
2a2e411a6f Added JOU to the list of sets for image download. 2014-04-25 22:39:03 +02:00
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