github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-30 19:10:36 +00:00
Code Issues Projects Releases Packages Wiki Activity
10195 commits 2 branches 0 tags 782 MiB
Commit graph

1575 commits

Author SHA1 Message Date
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
LevelX2
d9f2f8a4a7 * Remove JRE6 from start scripts. Reduced Xmx value of client to 512m (should be enough and reduces problems that client does not start because of not available memory). 2014-02-15 09:30:01 +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
f492c2072b * Sample Decks - Added some standard format sample decks. 2014-02-04 08:34:32 +01:00
LevelX2
bf4ccf185c Some minor formatting. 2014-02-03 17:47:12 +01:00
LevelX2
9c5d5208b9 Some updates to pom dependency. 2014-02-03 17:46:19 +01:00
LevelX2
3cd4e9ecb7 * Memory leaks - TornamentPane can now be removed by gc. 2014-02-03 01:37:13 +01:00
LevelX2
7945f4ad80 * start scripts - changes Xms value back to 256m. 2014-02-03 01:23:40 +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é
378bb6ca5e Fix JVM arguments order to avoid weird OutOfMemoryError 2014-01-30 03:21:02 +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
abec411d55 * Sample deck. 2014-01-29 08:31:25 +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
ad71ec6aad Set Version 1.3.0. 2014-01-25 15:55:39 +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
6e610199b1 * Some Standard exampe decks. 2014-01-11 16:35:29 +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
7c4829cce4 * Sample decks - Added 2 sample decks. 2013-12-31 12:55:17 +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
a1fcdb63bd [C13] Commander example deck (Mind Seize). 2013-12-15 14:19:38 +01:00
LevelX2
8cf788e9cc [C13] Added Tempt with Reflections. 2013-12-07 15:47:59 +01:00
LevelX2
56f04ff9df * Sample decks - Modern sample decks. 2013-12-07 15:46:24 +01:00
LevelX2
bc47c1af61 [C13] Added ample deck Ethernal Bargain. 2013-11-30 23:29:05 +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
2c4d8df739 [C13] Added Commander sample deck Evasive Maneuvers. 2013-11-21 14:31:31 +01:00
LevelX2
cfb2a3e585 * Sample decks - More Standard sample decks. 2013-11-14 08:00:44 +01:00
LevelX2
107848bc36 Added example deck commander 2013 Power Hungry. 2013-11-13 00:19:13 +01:00
LevelX2
0878ddb05c Added spaces to tooltip counters display. 2013-11-13 00:18:48 +01:00
LevelX2
7ea59bd232 [C13] Added Mystic Barrier, Mosswort Bridge. 1 Commander sample deck. 2013-11-05 17:03:50 +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
9050288e40 * Sample deck - Standard UB control. 2013-10-26 10:01:34 +02:00
LevelX2
25a342a507 * Sample decks - format standard. 2013-10-22 16:52:48 +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
15374134ac * Sample decks - 4 moden decks from GP Brisbane from October 6 2013 2013-10-07 08:29:38 +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
LevelX2
aa2fcb09d2 Added commander sample deck. 2013-10-05 16:30:24 +02:00
LevelX2
3e71b3dbd5 * Example decks - Added the theros event deck (Inspiring Heroics) and the decks from Duel: Heroes vs Monsters. 2013-10-04 17:53:22 +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
87218c2847 More standard example decks. 2013-09-28 19:14:13 +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
d8f90c6908 Some post Theros standard decks. 2013-09-23 19:53:17 +02:00
LevelX2
330ff60bc5 Theros intro packs. 2013-09-23 18:23:25 +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
8836a5637b More Standard sample decks. 2013-08-20 16:26:26 +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
235d314104 Sample decks DailyMTG ReConstrcted Standard 2013-07-24 17:01:11 +02:00
LevelX2
0db3164ae4 Updated sample decks to use cards from newest editions. 2013-07-24 16:31:38 +02:00
LevelX2
94f5a0cc0f Sample decks SCG Richmond open (Standard) 2013-07-24 16:14:16 +02:00
LevelX2
a0c3f32b9b Added tip to tips shown at chatpanel at game start. 2013-07-23 17:21:03 +02:00
LevelX2
f76ee65bf5 Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-21 22:55:45 +02:00
LevelX2
7d0cf3cd8c Set version to 1.1.0 dev. 2013-07-21 22:52:25 +02:00
KholdFuzion
a6a09e0008 linux fixes (dox2unix) and basic lands added from LEA to 3ED 2013-07-21 03:18:23 -05: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
69c3ae0666 Added 13 standard format decks using already M14 cards. 2013-07-17 16:09:53 +02:00
LevelX2
ffa8e53a68 Added another sample deck to client. 2013-07-17 14:22:05 +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
2abeba7c47 Deleted sample music. 2013-07-15 21:17:14 +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
52d90a8d6f Added sample decks from GP Kansas City (Modern). 2013-07-07 09:25:05 +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
LevelX2
d39a581df9 Sample Deck: Craig Wescoe's WR Aggro 2013-07-02 07:54:15 +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
LevelX2
106b3831c4 One more sample deck. 2013-06-28 08:17:20 +02: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
ba7bf794f5 Some more Modern sample decks. 2013-06-24 16:33:20 +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
LevelX2
b7c88b3c6d * Added Sample deck. 2013-06-18 21:49:38 +02: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
af4759f127 Added some background images to client/backgrounds. 2013-06-18 12:28:49 +02: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
LevelX2
df2fd3f68e Removed mage-theme-plugin dependency because it causes cyclic reference. 2013-06-15 20:02:39 +02: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
511170c645 * Some more Standard format example decks. 2013-06-09 10:04:51 +02:00
LevelX2
50c43c839c Renamed some decks. 2013-06-08 22:41:58 +02:00
LevelX2
00f22afdf0 Added Modern Masters set and already implemented cards. 2013-06-06 21:44:16 +02:00
North
90e6db057e deleted mage-rate-executable.jar 2013-06-05 21:51:39 +03:00
LevelX2
332697282d Some more modern sample decks. 2013-06-05 17:26:54 +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
a8f463e862 Sample decks from GP Guadalajara. 2013-05-27 19:40:32 +02:00
LevelX2
908b9194c3 Added some more sample decks. 2013-05-27 08:15:17 +02:00
LevelX2
e22400d0ae Sample deck from GP Portland. 2013-05-25 15:47:08 +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
54daf4ee13 Added a werewolve sample deck 2013-05-22 17:26:02 +02:00
LevelX2
449195daed Added check for JRE7 directory to the windows start .bat files. 2013-05-20 17:02:58 +02:00
LevelX2
43b641ff17 2 modern sample decks (GP Portland) 2013-05-18 06:46:34 +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
9eb3e8f308 Some more sample decks. 2013-05-10 15:21:02 +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
d799fa86d9 [DGM] Intro and event decks, some more example decks. 2013-05-09 13:59:44 +02:00
LevelX2
d00e953ad9 Added Levacy to the construced formats. 2013-05-03 08:37:30 +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
a8c430e839 A new standard sample deck. 2013-04-29 22:58:11 +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
7c06d242dd More sample decks. 2013-04-11 00:54:53 +02:00
LevelX2
2fc53fa71e Added Commander and Dragon's Maze set objects to MAGE. 2013-04-10 16:55:31 +02:00
LevelX2
f644ffe041 Changed color of frame of avatar for active player to green again. Checked that a player of a game can't also watch his own game. Added a match score to the start of the game log. Changed the color of the Turn [X] message. Tips and join messages during a game are displayed in the chat panel instead the game log panel. Display of the player name when hovering over the avatar is more vertical centered. 2013-04-07 21:29:27 +02:00
LevelX2
cb6ac8e619 Some spelling changes to reminder text of shortcut keys. 2013-04-05 23:44:59 +02:00
LevelX2
b4f424a9a9 Send now also event to server if you click on a face down card. 2013-04-04 00:07:11 +02:00
LevelX2
6a9a245c15 Setting from new table dialog are saved and restored from java prefs when the client is started. 2013-04-03 21:24:18 +02:00
LevelX2
fb539cd177 More sample decks. 2013-04-03 19:13:06 +02:00
LevelX2
de20fcb5cc [minor] formatting 2013-04-02 13:46:43 +02:00
magenoxx
97acebacdd Pumped version to 1.0.2.dev 2013-04-01 16:00:30 +04:00
magenoxx
df3739e5f4 Added packing sounds into release packages 2013-04-01 15:03:52 +04:00
magenoxx
143f0f76e7 Fixed #180 : Paying additional cost of Mana Leak or Spell Rupture isn't handled correct 2013-04-01 14:24:56 +04:00
LevelX2
7ef08656f6 [Minor] change of phase display. 2013-04-01 03:31:57 +02:00
LevelX2
c88093d699 The table list of current matches / tournaments shows now all names of players. 2013-03-31 20:13:04 +02:00
LevelX2
ca9b424f1a Made background of top area of the cardSelector brighter to make it better readable. 2013-03-31 19:17:00 +02:00
LevelX2
9bda45ae29 More sample decks. 2013-03-31 09:03:20 +02:00
magenoxx
29b84e0d92 Closed #169: Make it possible to untap lands 2013-03-29 20:35:16 +04:00
magenoxx
dd9aec6a49 Minor fix 2013-03-29 19:11:00 +04:00
magenoxx
fab1417421 Fixed #178: During watching a game you get Concede and Cancel as menu point with right mouse button 2013-03-29 17:36:03 +04:00
magenoxx
05191e8793 Closed #168 : Enhance priority hot keys 2013-03-29 17:18:12 +04:00
LevelX2
402f7fffd9 Tournaments status is updated now and if tournament finished, it's moved to the lower finished matches view. 2013-03-27 22:31:15 +01:00
LevelX2
095c3c5776 Improved message transformation. 2013-03-27 22:29:50 +01:00
LevelX2
7014b28797 Improved sceduled logic to remove bugged tables. Reactivated logic to show the list of the last finished 50 matches (no replay possible). 2013-03-27 16:58:34 +01:00
LevelX2
30b738b3ad Fixed a bug for loading selected view from java prefs. Minor formatting. 2013-03-27 14:52:03 +01:00
LevelX2
39d67eec8a Last settings for CardView concering view, piles and order are always saved and restored in Java Prefs now. 2013-03-27 08:26:04 +01:00
LevelX2
12a01788e6 Added a new column to the table list showing the number of wins for matches and number of used / total seats for tournaments. 2013-03-26 17:18:43 +01:00
LevelX2
d4e12b2fea Fixed a small bug that player list was not updated if size didn#t changed but values. 2013-03-26 15:33:47 +01:00
LevelX2
d8961a7a82 [minor] formatting 2013-03-26 13:43:24 +01:00
magenoxx
3a59ca9465 Not changing hand ui size in small mode 2013-03-22 08:39:35 +04:00
magenoxx
3afa5cc867 Fixed Issue #[166]: Allow table creator to remove table - added confirm dialog 2013-03-22 08:26:57 +04:00
magenoxx
67fcf4a911 Implemented Issue#166: Allow table creator to remove table - added remove action also for watch/replay state 2013-03-20 08:29:57 +04:00
magenoxx
4adb63cc7a Fixed Issue#165: Decksize over 99 cards not displayed correct 2013-03-20 08:27:55 +04:00
magenoxx
13c2b2d477 Implemented Issue#166: Allow table creator to remove table 2013-03-20 08:09:36 +04:00
LevelX2
579bc652a0 Some more sample decks. 2013-03-20 00:10:05 +01:00
LevelX2
52cb0be02c Two more sample decks. 2013-03-17 16:14:16 +01:00
LevelX2
e42f32b16a More modern sample decks. Renamed one. 2013-03-16 19:50:03 +01:00
LevelX2
09aba1bd87 Some more sample decks. 2013-03-15 15:55:01 +01:00
magenoxx
3191ad7e32 Fixed Issue#158: The select a pile window is shown over the tooltip window 2013-03-15 11:53:32 +04:00
LevelX2
4840bcf4b6 Added top 8 modern decks from GP Bilbao January 19th. 2013-03-11 17:35:07 +01:00
LevelX2
9298e2341d Sample decks: Standard - top 8 decks from GP Verona. 2013-03-11 15:48:08 +01:00
North
a7a565bb8f [minor] access modifer order 2013-03-10 14:53:02 +02:00
LevelX2
aa0290fd32 Set Version to 1.0.1 2013-03-10 11:40:56 +01:00
LevelX2
0565cd1289 Added top 4 modern decks from Pro Tour Dragon's Maze Qualifier Season New Mexico - Albuquerque. 2013-03-09 18:42:45 +01:00
LevelX2
dc131fa8dd Changes to show name and number of counter on a card. 2013-03-04 00:03:21 +01:00
LevelX2
cc96a55523 Some changes to logging. 2013-03-04 00:01:12 +01:00
North
2daae9fb47 [minor] code style 2013-03-03 10:41:31 +02:00
North
122e9c700d URL hash and equal methods do IO operations; replaced with URI 2013-03-02 20:06:57 +02:00
North
a327668660 fixed possible NPEs 2013-03-02 18:02:09 +02:00
North
c0f837c2e0 removed unused fields 2013-03-02 18:02:08 +02:00
North
cdd5c3f2d3 [minor] removed redundant modifiers 2013-03-02 18:02:05 +02:00
North
5f6f1c7528 [minor] removed unused imports 2013-03-02 18:02:02 +02:00
LevelX2
0687731913 Added two weird modern decks from http://www.wizards.com/Magic/Magazine/Article.aspx?x=mtg/daily/rc/236. 2013-02-28 08:29:55 +01:00