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

1448 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
fb4f6aa331 * Token - Fixed some wrong token names (GTC / MMA). 2014-02-15 22:31:02 +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
efb04f2b9a Merge pull request #377 from jbonofre/master 
Some improvements for Unix on Mage Server and Client
 2014-02-02 16:03:25 -08: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
Jean-Baptiste Onofré
67133cc2e8 Set *.sh Unix scripts executable by default 2014-01-30 03:13:43 +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
96d4126684 *BNG Added to expansions with downloadable images. 2014-01-29 08:32:07 +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
43fed81ff4 Sort user list case insensitive. 2014-01-26 11:26:45 +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
bb6424cd4f Added M14 links to download token and emblem images. 2013-11-04 07:59:43 +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
3c695f09a9 Added Theros token download URL's. 2013-09-27 16:12:48 +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
70899ec4f8 [THS] Added Gift of Immortality, fixed some wrong names, minor formatting. Allow download of THS images. 2013-09-18 08:27:30 +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
68333a2eff Added names to download the Modern Masters token images. 2013-08-19 12:49:35 +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
Li REN
dcce8c30a1 [minor] fix a bug causes assembly plugin error 2013-07-18 04:36:21 -04:00
Plopman
e6847a472d [Commander] Display Commander in client 2013-07-17 20:35:52 +02:00
Li REN
1cea80fd5d fix error of audioManager when start client from IDE. 2013-07-17 13:51:59 -04: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
60d81ffb37 fix a bug that cause incomplete multimedia files released 2013-07-13 17:18:00 -04: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
55a6de849e Ignoring M14 cards for download. 2013-06-29 20:51:54 +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
5cb438f701 Added the one token image of DGM. 2013-06-03 08:28:49 +02: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
4647221868 Open DGM image download. New PreventAllDamageToControllerEffect. Rule text formating to DetainTargetEffect. 2013-04-27 02:04:47 +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