github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-27 20:06:31 +00:00
Code Issues Projects Releases Packages Wiki Activity
13341 commits 2 branches 0 tags 782 MiB
Commit graph

1781 commits

Author SHA1 Message Date
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
c8c6cbc550 * Added Decklist - Speed vs. Cunning. 2014-12-26 21:31:18 +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
LevelX2
4d658909ee Added Sentinel, Wakestone Gargoyle, Silhana Starfletcher and Orchard Warden. 2014-12-17 15:28:33 +01:00
fireshoes
bf29352ba6 Added Fate Reforged set and Pride of the Clouds card 2014-12-16 14:07:59 -06:00
LevelX2
7b738474a9 * Some fixes to the exile effects with duration. Fixed that exiled cards/permanets did not come back if causing card was put into play and exiled by Whip of Erebos. 2014-12-14 22:56:37 +01:00
LevelX2
424448b38f * Handling of resource images fixed. 2014-12-14 22:54:58 +01:00
LevelX2
f5b131f7fa Readded unintended deleted wav file. 2014-12-13 17:57:44 +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
b3f1cc002e * Changes to server lock handling and logging. 2014-12-10 15:00:55 +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
8748220ce2 * Updated serverlist.txt. 2014-12-05 20:13:31 +01:00
LevelX2
496331995a [C14] Added decklist of the green deck. 2014-12-03 20:21:34 +01:00
LevelX2
00bbadd0c3 * Added red C14 deck. 2014-12-02 16:59:34 +01:00
LevelX2
2af52cfd3a [C14] 11 white cards + 1 Artifact + white deck list + some minor fixes to framework and other cards. 2014-12-01 16:59:36 +01:00
LevelX2
1b80bc3cfb [C14] Added the blue C14 deck (complete). 2014-11-29 01:45:24 +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
4cd5fa9636 Moved Commander 2013 decks to subfolder. 2014-11-27 15:21:38 +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
6e368d51a8 Added sample decks from Jace vs. Vraska. 2014-11-04 13:22:20 +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
6d0e276c8f Added some standard example decks. 2014-11-02 13:27:08 +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
d50e98f38a * Some legacy example decks from championship Philadelphia. 2014-10-31 09:45:26 +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
8c66667b7f * Some changes to pom files to use local repository for com\googlecode\jspf\jspf-core\0.9.1\. 2014-10-22 14:52:03 +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
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
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
be0db95dbe * example decks - Some standrd deck examples with Journex into Nyx cards. 2014-04-22 16:38:05 +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
3d5fff71f4 * Sample decks - Added modern sample decks. 2014-03-25 17:48:24 +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
a5e5351b70 * Added modern sample deck. 2014-03-11 00:35:11 +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
db1278b6f2 Added missing token image definition Dragon Egg. 2014-03-02 21:52:53 +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
b837273cb5 * Duel deck: Garruk vs. Liliana - Added decklists to sample decks. 2014-02-26 12:39:41 +01:00
LevelX2
562e586c26 Added missing cards for Garruk vs. Liliana duel deck. 2014-02-26 12:39:02 +01:00
LevelX2
9b10da0551 Some minor changes/formatting. 2014-02-26 12:34:58 +01:00
LevelX2
ee9f92fb4b * Duel Decks - Added the Elspeth vs. Tezzeret duel decks as sample decks. 2014-02-25 03:09:40 +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
3a47ea3250 Added Legacy sample deck. 2014-02-19 19:49:07 +01:00
LevelX2
90d75a65a7 Added Portal Three Kingdoms set to Mage. 2014-02-19 19:47:08 +01:00
LevelX2
8b455aca40 Added some more Legacy example decks. 2014-02-19 17:30:08 +01:00
LevelX2
0beace4547 Removed wrong/old Preference load of sortType. 2014-02-19 17:29:25 +01:00
LevelX2
87772fcb1b Some legacy and modern sample decks. 2014-02-18 17:37:01 +01:00
LevelX2
1f3687cc86 Switched to binary/source format java 1.7. 2014-02-18 17:35:32 +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
fb4f6aa331 * Token - Fixed some wrong token names (GTC / MMA). 2014-02-15 22:31:02 +01:00