github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-26 03:00:09 +00:00
Code Issues Projects Releases Packages Wiki Activity
23924 commits 2 branches 0 tags 782 MiB
Commit graph

2711 commits

Author SHA1 Message Date
Oleg Agafonov
c64da6abd9 World Magic Cup Qualifier: removed wrong cards, fixed card numbers, fixed download from scryfall 2017-12-20 19:51:19 +04:00
Zzooouhh
7d86fe2d76
Fixed Nemesis image downloads from MythicSpoiler (fixes #4260) 2017-12-16 19:32:34 +01:00
spjspj
2a810e898f
Merge pull request #4251 from spjspj/master 
Add UST cards
 2017-12-16 09:22:38 +10:00
Oleg Agafonov
7a42ea416b Fixed #4252 (errors on paths with $ symbol) 2017-12-16 03:19:32 +04:00
spjspj
f4cc88bf2a Storm Crow 2017-12-15 22:04:42 +11:00
Oleg Agafonov
f39e4fd4ee - added card download for unstable set from scryfall; 
- changed client version from 9 to 10b;
 2017-12-10 17:43:37 +04:00
Oleg Agafonov
5fc0393bc7 Deck editor: 
+ added warning messages dialog after load/import decks with errors (instead throw exception);
 + added loading cursors on import-load decks;
 - fixed null exception error on empty/error deck loading;
 2017-12-08 00:20:18 +04:00
Oleg Agafonov
1efc062f66 Decks importer: 
+ added support for new decklist text format from deckstats.net (see #4228);
  + added new checks to text format (too many empty lines, too big card number: more then 100);
  + fixed double window popup on cancel/close import from clipboard window;
 2017-12-07 23:14:22 +04:00
Oleg Agafonov
5b7ab0de7a typo 2017-12-07 08:41:59 +04:00
Oleg Agafonov
66a70dd116 - Fixed #4220 - card viewer raise error with alternative card numbers; 
- Fixed potential error on getCardsByRarity;
- Added inner checks for wrong booster max card numbers settings;
 2017-12-07 08:01:54 +04:00
spjspj
35aa92ac72 Fix face images. 2017-12-06 00:03:12 +11:00
Oleg Agafonov
89fae4f33e Add svg symbols download from scryfall 2017-12-03 20:33:32 +04:00
LevelX2
b3a3e17aa2 [RIX] Activated Mythicspoiler as RIX image download source 2017-12-03 09:45:02 +01:00
Oleg Agafonov
77d31b37f0 Fix wrong images path in zips (compatible with old versions). 2017-11-30 01:56:41 +04:00
Oleg Agafonov
e3a1051499 UI changed: 
+ added default sorting for completed table (last ended on the top);
 + added "duration" column for completed table;
 - fix sorting for start, end and duration columns on completed table;
 + added new password and rated text for columns (more convenient for search);
 2017-11-28 01:44:05 +04:00
Oleg Agafonov
f706f9351d UI changed: 
+ added default sorting for tables on open (last created on the top);
 + added "time ago" format for created date column;
 2017-11-27 21:19:53 +04:00
Oleg Agafonov
6b4000bfe2 - small render fix 2017-11-27 09:27:40 +04:00
Oleg Agafonov
ab7d386689 - fixes 2017-11-27 08:35:21 +04:00
Oleg Agafonov
c29bac08d8 Refactor and fixed and images downloading and paths loading: 
- Added new images and symbols downloading;
 - Fixed user defined images path (now work for all images: cards, symbols, temp downloading);
 - Fixed not working cancel button at download window (it close window, but tasks is working, download and didn't save);
 - Fixed temp files trash all around images folder (on cancel button);
 - Fixed not saving new downloaded cards on cancel button (zip file didn't close on cancel);
 2017-11-27 08:09:52 +04:00
Oleg Agafonov
efee0b5328 Merge branch 'master' into svg-mana-icons-support 2017-11-26 18:44:48 +04:00
Oleg Agafonov
37dc9bf73c Added svg support: generate HQ png files for HTML texts 2017-11-26 18:37:29 +04:00
Oleg Agafonov
a5df082720 Added svg support: render empty mana symbols (by text) 2017-11-26 16:54:05 +04:00
Oleg Agafonov
7a1def128b Added svg support: new render for mana icons in tables (deck editor, draft) 2017-11-26 16:51:57 +04:00
Oleg Agafonov
f400cd5231 Refactor resource paths and constants: 
- delete duplicate consts;
 - correct paths and it uses;
 - fix loading icons from user defined dir;
 2017-11-26 16:50:42 +04:00
Oleg Agafonov
5cda60270c Added svg support: new render for mana icons in tables (deck editor, draft) 2017-11-26 00:50:25 +04:00
Oleg Agafonov
471f49c9c8 Added svg support: new lib, new icons for cards 2017-11-26 00:48:28 +04:00
spjspj
830874bc50 Fix exception 2017-11-26 01:15:24 +11:00
spjspj
00eb481004 spjspj - Add a version of Freeform Commander (any creature or legendary permanent can be commander, no ban list) 2017-11-25 22:14:20 +11:00
spjspj
8ab422f55c
Merge pull request #4191 from JayDi85/viewer-more-info 
Add more card's info to viewer (mage book)
 2017-11-24 21:02:47 +10:00
spjspj
763b8d30fd Add highlights to rendered card title and card type round boxes 2017-11-24 21:59:11 +11:00
spjspj
37fc07a256 Add highlights to rendered card title and card type round boxes 2017-11-23 23:44:51 +11:00
Oleg Agafonov
ca90f2dc45 Add more card's info to viewer (mage book) - full set name, card numbers and total stats 2017-11-23 06:30:49 +04:00
spjspj
184847b23d
Merge pull request #4182 from spjspj/master 
Slightly better rendering.
 2017-11-20 00:38:50 +11:00
spjspj
ea650dcab1 Slightly better rendering. 2017-11-20 00:36:54 +11:00
Oleg Agafonov
b78dab27a1 Little fix to always show icons and names for cards without images. 2017-11-18 16:44:34 +04:00
Oleg Agafonov
e2e4646863 Merge remote-tracking branch 'remotes/origin/master' into new-card-render 2017-11-18 15:04:02 +04:00
Oleg Agafonov
0a0475bd38 Battlefield text position fix 2017-11-18 06:40:01 +04:00
Oleg Agafonov
0689bfca40 comment type 2017-11-18 05:49:31 +04:00
Oleg Agafonov
a19e879021 "Can attack" draw fix 2017-11-18 05:40:24 +04:00
Oleg Agafonov
f81489c377 Add fallback card render (origin card render), see #4168 2017-11-18 05:13:38 +04:00
spjspj
7292683604
Merge pull request #4171 from spjspj/master 
spjspj - Add in a new way to allow just the Face Art for cards to be shown
 2017-11-18 10:30:44 +11:00
spjspj
4247954318 spjspj - Add in a new way to allow just the Face Art for cards into the viewer. 2017-11-18 01:37:10 +11:00
Oleg Agafonov
b53d57bce9 Fix error on download some symbols 2017-11-16 02:08:25 +04:00
Oleg Agafonov
feb53492e6 Add new checks for symbol download settings 
Fix error on download some symbols
 2017-11-16 02:08:25 +04:00
Oleg Agafonov
45aad8b6bc add new checks for symbol download 2017-11-15 02:57:05 +04:00
Oleg Agafonov
080b4fc1a2 Add new logs and checks in symbols download (for easy setup and fix settings) 2017-11-15 01:44:10 +04:00
Oleg Agafonov
12b420d68b Add new logs and checks in symbols download (for easy setup and fix settings) 2017-11-15 00:09:31 +04:00
Oleg Agafonov
b97edec5b9 Fix error on download backside.jpg symbol 2017-11-12 07:34:45 +04:00
Oleg Agafonov
9b95e20d83 Fix error on download images of Ixalan set from Wizards site 2017-11-12 06:16:29 +04:00
Oleg Agafonov
badaed63cb fix #4148 error on downloading double faces cards from scryfall 2017-11-12 02:06:24 +04:00
Oleg Agafonov
62aed011a3
fix issue #4148 on download image cards with quotation mark in names 2017-11-10 02:25:32 +04:00
LevelX2
8cf6a97616 * Fixed a problem with index out of bound for card renderer. 2017-11-04 18:20:17 +01:00
igoudt
9cbc2b7ea2 change client messages to enum rather than string 2017-10-03 15:18:31 +02:00
igoudt
6bde35f275 fixes #4079 2017-10-02 18:38:09 +02:00
spjspj
042e64aeb8 Add a 'your game can start' sound 2017-10-01 01:51:05 +10:00
spjspj
ed429b0c37 Add option to preferences to display full path to image of cards missing images. 2017-09-27 16:04:13 +10:00
spjspj
026e7d3e5d Add option to preferences to display full path to image of cards missing images. 2017-09-27 09:44:31 +10:00
LevelX2
0b3c24949f Added Ixalan set to the supported sets for image download by wizard source. 2017-09-22 10:00:29 +02:00
spjspj
b8b0170662 Add Tokens to card-pictures-tok for viewer. 2017-09-18 00:38:02 +10:00
LevelX2
3622206cf1 * Image download - added Ixalan & Iconic Masters to Scryfall and mythicspoilers.com. 2017-09-17 11:34:50 +02:00
LevelX2
ae0d87b7ec * Image download - added Ixalan & Iconic Masters to Scryfall and mythicspoilers.com. 2017-09-17 11:33:16 +02:00
LevelX2
9ae4e7d4ef Added logic to add manual links to MythicSpoilers image source. 2017-09-16 10:33:08 +02:00
LevelX2
b6212a943a Some minor changes. 2017-09-16 02:01:25 +02:00
LevelX2
75874df33f Fixed a problem of image download. 2017-09-16 00:11:19 +02:00
LevelX2
2117bfc17c Merge ReworkImageDownload 2017-09-15 23:23:49 +02:00
LevelX2
ac352537bf Merge origin/ReworkImageDownload into ReworkImageDownload 
Conflicts:
	Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
 2017-09-15 23:21:43 +02:00
LevelX2
eebc412ad9 Some updates to image download. 2017-09-15 23:19:11 +02:00
LevelX2
3fc3d96fe0 Some updates to image download. 2017-09-15 23:18:40 +02:00
LevelX2
d95a3e470c Updated some logic. 2017-09-12 17:25:18 +02:00
LevelX2
a280605591 Some updates. 2017-09-10 10:19:14 +02:00
Evan Kranzler
252c941b4f Refactored more subtypes usages to enum 2017-09-08 09:57:51 -04:00
LevelX2
96034c4c2b Updated some logic. 2017-09-08 15:22:09 +02:00
LevelX2
c9327b718d Updated some logic. 2017-09-06 17:49:55 +02:00
LevelX2
7329dc6c3f Some more changes to image download. 2017-09-05 00:12:09 +02:00
LevelX2
5a1544050c Updated image download handling. 2017-09-04 18:25:31 +02:00
LevelX2
d003cd898f Image download by set with source restriction to supported sets. 2017-09-04 07:57:10 +02:00
LevelX2
452c05543d Added Ixalan image download from mythic spoilers source. 2017-09-03 10:10:09 +02:00
LevelX2
a46538fc06 Removed some unused code. 2017-09-01 16:03:43 +02:00
spjspj
4fe4279239 Add in the C17 decks (Vampire and Cat one have 1 card not implemented each) 2017-08-31 02:11:05 +10:00
LevelX2
9ac7fe27f0 * Vindictive Lich (mode target handling not fixed yet). 2017-08-21 18:49:37 +02:00
spjspj
4687943176 Update penny dreadful list (http://pdmtgo.com/legal_cards.txt) 2017-08-20 22:01:19 +10:00
spjspj
fc31753695 PD implement.. 2017-08-19 16:08:19 +10:00
LevelX2
cb8b4d8cbf Fixed some problems that table dialogs were not closed if the table controller closed the table. 2017-08-18 00:12:12 +02:00
LevelX2
1fb24116ae xmage 1.4.26V0 2017-08-15 01:27:06 +02:00
LevelX2
bae7f154df Changed user disconnect handling. The user in the server is no longer deleted directly after connection problem, disconnect or quit. The user object remains now for 8 minutes so the rejoin not possible after disconnect problem should be solved (I hope so). We will see. Also fixed the problem, that the table panel was not shown, if a player disconected and reconected. 2017-08-13 16:22:18 +02:00
LevelX2
9a1ce3f449 Merge pull request #3769 from Eleros/feature/HASCON2017Promos 
Feature/hascon2017 promos
 2017-08-04 22:39:20 +02:00
spjspj
6435b9950a Add in Penny Dreadful EDH format (plus filter options for deck editor). 2017-08-04 17:13:25 +10:00
Saga\Robert
2e1a820040 - added gold color 
- added gold Dragon Token
- edited new set data (H17) for Sword of Dungeons and Dragons
 2017-08-01 14:55:17 +02:00
LevelX2
7b168a9d5e * Minds Aglow - Fixed that payed mana can be undone if X was set to a too high value. 2017-07-30 18:50:36 +02:00
LevelX2
fe2ee5dfec Xmage 1.4.25V0 2017-07-29 20:35:16 +02:00
LevelX2
7ba051871d * Fixed minor bug that the tables list was not cleared if no active table did exist. 2017-07-29 20:22:07 +02:00
LevelX2
a35abd7f8c * Deactivated macro button, becuase it's not working correctly (#2147). 2017-07-29 19:13:13 +02:00
LevelX2
5cca05dd23 * Fixed bug in download images logic (fixes #3756). 2017-07-29 17:53:28 +02:00
LevelX2
052fbb3ab6 Merge origin/master 2017-07-29 17:39:36 +02:00
LevelX2
400bbba8e1 * Deactivated macro button, becuase it's not working correctly (#2147). 2017-07-29 17:39:13 +02:00
spjspj
e8147a4860 Merge pull request #3755 from spjspj/master 
Mana Circles for deck analysis
 2017-07-30 00:00:12 +10:00
spjspj
b6a7998eab Mana Circles for deck analysis 2017-07-29 23:55:58 +10:00
LevelX2
18cab46b05 * Improved editor search function, fixed some problems with search for split card rules. 2017-07-29 11:43:05 +02:00
LevelX2
cd6c7623ed * Added missing imports, imports reorg. 2017-07-23 16:29:29 +02:00
spacemoses
19d1c7e987 Removing hardcoded User-Agent header causing error for card image retrieval 2017-07-22 13:23:49 -05:00
ingmargoudt
09f0c9ad97 huge rework on subtypes (#3668) 
* huge rework on subtypes

* update for coat of arms

* fix test
 2017-07-16 16:57:39 -05:00
LevelX2
60951f645b * Removed magiccards.info as download source. 2017-07-16 19:10:10 +02:00
LevelX2
1fe841e6d9 Merge branch 'master' into master 2017-07-10 13:18:58 +02:00
fireshoes
48413a956a Added MTGO 1v1 Commander and Amonkhet Block Constructed formats. Fixed a typo in the Duel Commander banlist. 2017-07-09 16:51:57 -05:00
LevelX2
2b94ed232a Fixed minor spelling error in preferences. 2017-07-09 15:31:32 +02:00
Benjamin Maitland
8e16cf0bd6 Added the Old School 93/94 Format. Uses original rules. 2017-07-08 23:40:27 -04:00
LevelX2
7d911ae803 XMage 1.4.24V0 2017-07-08 16:33:09 +02:00
fireshoes
a1c574bfda Added Planechase Anthology, updated Media Inserts and Judge Promos 2017-07-07 14:27:29 -05:00
spjspj
495a84f1f1 Implement 2 cards (HOU) Fix for Bontu's Last Reckoning 2017-07-04 19:07:17 +10:00
spjspj
5a7a9049d9 Merge pull request #3549 from spjspj/master 
Implement The Locust God (HOU)
 2017-06-27 21:33:21 +10:00
spjspj
6d35de829f Implement The Locust God (HOU) 2017-06-27 21:32:14 +10:00
LevelX2
9b31a5a7e3 Merge pull request #3516 from ruler501/summerproject 
Shortcut/Macro System
 2017-06-26 17:53:49 +02:00
spjspj
e683a579b3 Merge pull request #3512 from spacemoses/master 
Enhancement #3222 - Adding scroll to clipboard import in deck builder
 2017-06-25 23:16:21 +10:00
Devon Richards
fee630a0ac Small cleanup 2017-06-24 11:23:58 -05:00
LevelX2
442d8ebc78 * Added HOU spoilers 2017-06-24. 2017-06-24 11:00:21 +02:00
Ben Homer
b68091683a Added keybinding to preferences and improved UI appearance with new image file. 2017-06-22 01:42:01 -05:00
Devon Richards
0d98514550 Added better UI and made it work with most categories of combos 2017-06-21 01:09:54 -05:00
Devon Richards
028d7ed1f8 Initial working product. Doesn't handle skipping stack. 2017-06-20 19:54:16 -05:00
spacemoses
882060bf3e Enhancement #3222 - Adding scroll to clipboard import in deck builder 2017-06-18 18:44:59 -05:00
Quercitron
0c9c7c0a56 Add scryfall.com as a source for card images (closes #3496). 2017-06-17 17:55:35 +03:00
fireshoes
52b4633340 Added Commander Anthology. Added Archenemy: Nicol Bolas to mtg-cards-data.txt (missing most collector numbers until it goes up on Gatherer). Updated tokens for CMA and E01. 2017-06-05 16:00:13 -05:00
LevelX2
b62a15f68e Merge pull request #3454 from drmDev/add/welcomedeck2017 
adding welcome deck 2017 (see #3453)
 2017-06-03 10:31:49 +02:00
Anders Åstrand
4d0e8cb443 Review fixes 2017-05-30 18:55:40 +02:00
Derek Monturo
1d662a0a58 adding welcome deck 2017 - closes #3453 2017-05-30 07:31:14 -04:00
Anders Åstrand
ad0507e739 Ban ignored users from watching 
This commit bans ignored users from watching
games where the creator has them on their ignore list.
 2017-05-29 21:36:42 +02:00
LevelX2
bd9b11fc49 Fixed some problems with popup window not been hidden if another frame is shown. 2017-05-27 14:35:50 +02:00
spjspj
e752ee3156 EDH Power level fix 2017-05-20 15:45:40 +10:00
spjspj
3cb7424dfd EDH Power updates 2017-05-16 23:14:33 +10:00
spjspj
f85c7e07ba Emblems refactor to show emblems in Card/Token Viewer 2017-05-14 13:43:18 +10:00
spjspj
5514787871 Merge pull request #3350 from spjspj/master 
Allow sort by EDH Power level in Deck Editor
 2017-05-11 17:54:23 +10:00
spjspj
347d08298f Allow sort by EDH Power level in Deck Editor 2017-05-11 17:52:43 +10:00
LevelX2
ea439505ce Some minor changes. 2017-05-09 17:02:30 +02:00
spjspj
0942db541f Token refactor 2017-05-08 23:26:33 +10:00
spjspj
f909005bb1 Token refactor 2017-05-08 23:20:33 +10:00
spjspj
bec0964726 Token refactor 2017-05-08 21:53:01 +10:00
spjspj
a897b374a0 Token refactor 2017-05-07 20:57:57 +10:00
spjspj
ba6e8409d1 Token refactor 2017-05-07 11:46:52 +10:00
spjspj
e73e7d8600 Token refactor 2017-05-06 23:35:14 +10:00
bugfi5h
72ec960c95 Merge branch 'develop' into feature/CopperAngel 2017-05-01 15:10:56 +02:00
spjspj
3f125db074 Merge pull request #3271 from spjspj/master 
spjspj - Remove Tokens from Card Viewer - need to reorg the tokens fi…
 2017-04-30 11:15:54 +10:00
spjspj
0d0fccc105 spjspj - Remove Tokens from Card Viewer - need to reorg the tokens first. 2017-04-30 11:14:24 +10:00
LevelX2
3cc157bc2c * Fixed null pointer exception problems in client. 2017-04-30 00:07:37 +02:00
spjspj
04f298923c spjspj - Add in Tokens to the Card Viewer (fix) 2017-04-29 17:42:08 +10:00
spjspj
241691b153 spjspj - Add in Tokens to the Card Viewer (first version) 2017-04-29 17:25:54 +10:00
bugfi5h
217e294470 Added Card: Copper-Leaf Angel 2017-04-27 21:25:30 +02:00
igoudt
05785f71b9 Make the implementations of CardImageSource an enum 2017-04-27 10:57:48 +02:00
igoudt
3f47d5a253 put inputstream in try body so it can be autoclosed 2017-04-27 10:57:48 +02:00
igoudt
0528555075 make DefaulActionCallback an enum and remove unused parameter 2017-04-27 10:57:48 +02:00
igoudt
ce26e5c8dd make the combatmanager an enum 2017-04-27 10:57:48 +02:00
igoudt
5b21f34941 rewrote gettypetext, added removeIf to TableModel 2017-04-27 10:57:48 +02:00
igoudt
27aea04820 move methods from cardutil to magepermanent, cardview:getColorText now uses ObjectColor.getDescription 2017-04-27 10:57:48 +02:00
Derek M
c4330415c1 Merge pull request #3241 from drmDev/master 
Unit test confirming issue #3195 with Combat Celebrant
 2017-04-25 22:09:14 -04:00
drmDev
04746c5f4f Unit test confirming issue #3195 allowing Celebrant to attack while exerted 2017-04-25 22:07:51 -04:00
igoudt
c1ce821340 fix on playertype enum comparison 2017-04-26 00:37:06 +02:00
spjspj
4c85d89b64 Fix for the audio trigger of 'Player joined the table' not being fired. 2017-04-25 20:12:21 +10:00
spjspj
a4e7c2b407 Fix for the audio trigger of 'Player joined the table' not being fired. 2017-04-25 18:17:28 +10:00
spjspj
4ed9419cbf Fill in missing str 2017-04-23 23:47:43 +10:00
spjspj
6ab4a94bd7 spjspj - Add in 'View Current Deck' option. 2017-04-23 13:06:09 +10:00
spjspj
8845d77628 spjspj - Remove View Limited Deck option 2017-04-22 19:35:08 +10:00
spjspj
0cd4e06e22 spjspj - Add a View Limited Deck option to allow you to see your deck during matches. 2017-04-22 19:16:12 +10:00
fireshoes
a86a1ebf5f Added Iconic Masters to known-sets/mtg-sets-data.txt 2017-04-20 10:37:16 -05:00
fireshoes
ad3e5749f5 Added Planeswalker Decks to Sample Decks. 2017-04-19 11:46:20 -05:00
spjspj
7ca5adff89 Merge pull request #3169 from spjspj/master 
Undo double tap of ok button (Leading to duplicate tournaments - Fixe…
 2017-04-19 10:31:18 +10:00
spjspj
5373997b30 Undo double tap of ok button (Leading to duplicate tournaments - Fixes #3154) 2017-04-19 10:30:40 +10:00
fireshoes
2c9c4888cc Added Commander 2017 to known sets. 2017-04-18 11:39:47 -05:00
spjspj
cdd010ffa2 spjspj - Add in saved configurations for New Match and New Tournament dialogs. 2017-04-18 01:52:04 +10:00
spjspj
1fcb7d2963 Revert 2017-04-17 20:00:56 +10:00
LevelX2
ef4cf90a0f Release 1.4.23V0 2017-04-17 10:53:59 +02:00
LevelX2
35791ac6b7 Set SocketWriteTimeout to 10 seconds. 2017-04-17 00:01:39 +02:00
LevelX2
ed341528d9 [AKH] Fixed that Aftermath card images were shown wrongly rotated. 2017-04-16 22:57:08 +02:00
Styxo
ee9613fa49 [AKH] Fixed wrong card names from MythicSpoiler download 2017-04-16 16:26:10 +02:00
LevelX2
e93218946c [AKH] Fixed dwonload of Aftermath images from Mythicspoilers. 2017-04-16 14:07:21 +02:00
spjspj
7937bcda9e Revert 2017-04-16 20:06:27 +10:00
LevelX2
bebb2a4de7 Fixed a problem that it was not possible to create tournaments with "Human" players ( related to #3083 ?). 2017-04-15 18:51:54 +02:00
Mark Langen
77586eec7e Add 30 AKH card implementations 
* Some of the cards still need testing. Will fix and problems and update tomorrow, but pushing them for now to make it clear what's been implemented so far.
 2017-04-15 04:24:14 -06:00
Mark Langen
b1ed5c3632 Fixed deck editor Drag & Drop 
* Deck editor drag and drop was broken by the window borders change. Still not entirley sure what the root cause is (for some reason SwingUtilities.getDeepestComponentAt won't work correctly with the new setup), but this will fix it by expliticly specifying a deeper root component to start the search from (The MagePane that is active to be specific).
 2017-04-14 17:07:52 -06:00
fireshoes
0c9ad1e8b2 [AKH] Added 4/13 spoilers to mtg.cards.data.txt. Added tokens to card-pictures-tok.txt. Minor text fix on Rhonas. 2017-04-13 10:10:59 -05:00
ingmargoudt
fea477dd04 fixed two lines to allow playing human-human tables 2017-04-11 07:54:54 +02:00
Mark Langen
c22a8f717e Fix for problem introduced in 321f5597b7 
* Fixes a problem introduced in the JInternalFrame -> JLayeredPane change where the AbilityPicker wouldn't show up.
 2017-04-10 16:13:42 -06:00
Mark Langen
321f5597b7 Change main client window MagePanes from JInternalFrames to JLayeredPanes 
* This change's purpose is to get rid of the extra borders shown around the window border. These arise from using JInternalFrames in a JDestopPane and are impossible to remove in a forwards compatible way when using JInternalFrames. The solution it to move to have MagePane inherit from a plain old JLayeredPane instead of JInternalFrame. All of the MagePanes are always maximized anyways, so this doesn't lose any functionality.
 2017-04-07 22:08:13 -06:00
ingmargoudt
1649530e7b remove helper functions from cardUtil 2017-04-07 16:40:38 +02:00
ingmargoudt
314316f42f moved inputstream for font to try clause 2017-04-07 15:19:11 +02:00
ingmargoudt
f519b12d0e introduced isCreature/isLand/isArtifact/... etc for CardView 2017-04-07 15:08:28 +02:00
ingmargoudt
08197f192c remove CardHelper class 2017-04-07 10:00:16 +02:00
ingmargoudt
d60e01d497 move CardHelper::getColor to CardView::getColorText 2017-04-06 22:11:57 +02:00
ingmargoudt
63df7f65a7 remove isCreature from CardHelper, move to Cardview 2017-04-06 22:07:59 +02:00
Mark Langen
047449f14e * Correct type line rendering for split cards with different types on each half. 
* Correct art rendering for Aftermath, Split, and Fuse cards on the stack. Fused cards show as a single card with all the abilities / characteristics of both halves while on the stack.
 2017-04-04 21:58:52 -06:00
Mark Langen
a2e8cedd02 Merge branch 'master' into akh-card-frame 2017-04-04 18:36:37 -06:00
Mark Langen
fd73fd39af Addressed Feedback and added cards 
* Addressed feedback on Pull Request #3053
* Fixed a copy-paste bug in Destined // Lead
* Added two new Aftermath Split cards that were revealed today
 2017-04-04 17:07:59 -06:00
ingmargoudt
ff6d1541c3 clientcallbacks to enums 2017-04-04 21:52:15 +02:00
Mark Langen
18663f0a7a Amonket Aftermath ability and card frame changes Completed 
* Aftermath Ability implementation complete (At least until we see comprehensive rules that contradict the way I assumed it will work)
* Aftermath Card Frame rendering complete
* Normal Split and Fuse Split card frame rendering complete
* Amonket Split card CMC changes NOT made, but left for a separate commit
 2017-04-04 00:29:54 -06:00
Mark Langen
a96a7f89f5 Work in progress changes for Amonket Aftermath ability. 
* Card Rendering has support for Aftermath Split card frames
* Card Rendering has support for Split cards
* Aftermath ability work in progress
 2017-04-03 04:15:25 -06:00
ingmargoudt
211d433ea9 playertype, enum singleton 2017-04-02 22:09:20 +02:00
LevelX2
2446abcc98 * Some minor changes to sleep command. 2017-04-02 11:48:05 +02:00
LevelX2
5a072ea760 * Some minor changes to sleep command (fixes #2992). 2017-04-02 11:32:25 +02:00
ingmargoudt
6f8f10fcc3 move static function to CardImpl, and other api fixes 2017-03-30 20:09:47 +02:00
fireshoes
1bf2d1782c [MPS-AKH] Added Amonkhet Masterpiece reprints. [MM3] Token updates 2017-03-29 10:42:43 -05:00
fireshoes
55b433ae36 [AKH] Added 3/27 spoilers to mtg-cards-data.txt. Implemented several of the new cards. 2017-03-28 22:25:29 -05:00
ingmargoudt
5cd1b5880f fix supertype on the client 2017-03-27 22:20:19 +02:00
ingmargoudt
0879298e92 refactor cards to use supertype enum 2017-03-27 21:56:33 +02:00
Achilles
b4a60555fc Revert "Change for id str" 
This reverts commit 1e8216c5c5.
 2017-03-24 17:06:33 -05:00
spjspj
1e8216c5c5 Change for id str 2017-03-24 08:14:17 +11:00
vraskulin
d3214c65e4 Merge remote-tracking branch 'fork/master' 2017-03-22 14:51:31 +03:00
vraskulin
d93061c0bc Equals should be compared with == but not equals() 2017-03-22 14:50:50 +03:00
vraskulin
c783614cba NotifyAll 2017-03-20 15:17:30 +03:00
vraskulin
f37c823aa8 String + string concatenation can be replaced by string + char concetenation 2017-03-20 14:00:18 +03:00
vraskulin
1fa9d4a4f6 Typo 2017-03-20 11:34:44 +03:00
ingmargoudt
ff6c6405aa rewrites to optionals 2017-03-19 19:48:32 +01:00
LevelX2
ee5675a0fc Fixed wrong client preferences tab reference. 2017-03-19 10:28:12 +01:00
spjspj
bce87e41aa Merge pull request #2976 from spjspj/master 
Add information to inform which images are missing.
 2017-03-17 22:40:52 +11:00
spjspj
678b7b5a60 Add information to inform which images are missing. 2017-03-17 22:40:33 +11:00
spjspj
a29963cd80 Add information to inform which images are missing. 2017-03-17 22:37:42 +11:00
ingmargoudt
2b91b88551 fixing some additional singleton classes 2017-03-16 09:48:02 +01:00
ingmargoudt
234cfe9519 rewrote singleton to enum where applicable 2017-03-14 16:32:47 +01:00
spjspj
ce3ada66c8 Merge pull request #2967 from spjspj/master 
Slight fix for C16 WUBR deck
 2017-03-14 22:23:02 +11:00
spjspj
e72e879959 Slight fix for C16 WUBR deck 2017-03-14 22:18:06 +11:00
LevelX2
ae4125209b Fixed a problem that hybrid mana symbols were not shown (fixes #2962). 2017-03-12 16:59:54 +01:00
ingmargoudt
1f215cdbe3 removed autoboxing : 
Boolean -> boolean
Integer -> int
Float -> float
 2017-03-11 15:17:14 +01:00
LevelX2
9d8a8a33f1 Xmage 1.4.22V0 2017-03-11 13:38:55 +01:00
LevelX2
d89dfd4ac3 Added some missing MM3 cards and fixed wrong collector numbers. Allow image download for MM3. 2017-03-11 12:33:59 +01:00
Nathaniel Brandes
ce1f4a3bf8 Phyrexian mana now correctly a payment choice. 
Per rule 601.2b, it is not determined at the pay costs step,
but at the "choice" step, long before costs are determined.

This fixes trinisphere interactions and should be consistent with the
rules.
 2017-03-08 20:03:28 -08:00
ingmargoudt
4aaf73e0d2 changed the type used in ImagePanel from an int to an enum 2017-03-07 22:28:10 +01:00
ingmargoudt
daed944eb6 refactored the SortBy.getByString 2017-03-07 22:06:44 +01:00
JOAC69
c854fc3d1a Remove trailing space on CardHelper.getType() 2017-03-05 19:10:20 -06:00
ingmargoudt
6b20d352ca added unit test 2017-03-03 22:28:34 +01:00
ingmargoudt
a0930e3379 missed 2 hashsets to enumsets 2017-03-03 22:14:00 +01:00
ingmargoudt
372584f7ad changed cardtype from list to enumset 2017-03-03 17:04:32 +01:00
ingmargoudt
d966c82019 change enum equals to == for client 2017-03-01 17:03:11 +01:00
vraskulin
0bc9cf91a8 Minor improvements - StringBuilder now have initial value 2017-02-28 15:26:07 +03:00
vraskulin
11dc1e10f1 Few lambda's and removed explicit type from creating lists and hashmaps 2017-02-28 13:46:57 +03:00
vraskulin
0a3c95dde5 Inner classes should be static. It reduces memory usage and gives perfomance boost + DeckImporter rollback 2017-02-28 12:40:12 +03:00
vraskulin
04973ea5aa Checking String for emptiness with .lenght() is preferable since 1.6 2017-02-28 11:46:51 +03:00
vraskulin
498c8cf60c Made utility classes final to explicitly forbid it's inheritance 2017-02-27 17:03:38 +03:00
vraskulin
f309717616 Merge remote-tracking branch 'fork/master' 2017-02-27 16:33:47 +03:00
vraskulin
af3986df46 All final strings became static - it will give a little perfomance boost, due to not instantiating same string every time 2017-02-27 16:33:32 +03:00
doncarton
a46848791c Variable name more readeable 2017-02-26 14:36:34 +03:00
Anders Åstrand
f68460603a Add client-side user ignore list 
This commit adds a client-side per-server ignore list.
* Whispers and talk from an ignored user is hidden
* Ignored users cannot join your tables
* Ignored users tables are hidden
 2017-02-22 22:16:09 +01:00
ingmargoudt
a1bc43d33e Merge pull request #2868 from kubikrubikvkube/master 
Functional interfaces annotation and bugfixes
 2017-02-15 20:27:21 +01:00
vraskulin
a15220d51e Bugfixes with != instead of equals and default toString calls 2017-02-15 19:52:20 +03:00
vraskulin
752392fc46 Functional interfaces should be annotated as functional interfaces 2017-02-15 19:23:12 +03:00
ingmargoudt
c2191227cd Merge pull request #2861 from kubikrubikvkube/master 
Bugfix - after 12820b54d4 refactoring
 2017-02-15 16:10:45 +01:00
vraskulin
f1ef3bf68b Narrowed variables scope. 2017-02-15 16:05:18 +03:00
Plopman
10284642bc Use spinner instead of combobox for AI skill. Fix #1111 and #118 2017-02-14 21:06:07 +01:00
vraskulin
09da478b38 Bugfix - after 12820b54d4 refactoring arrow does not disappear from the screen. Rollback. 2017-02-13 18:56:26 +03:00
vraskulin
5e410df39e We should not create additional Strings in loop. It have perfomance impact. Using StringBuilder instead. 2017-02-13 15:03:23 +03:00
ingmargoudt
20b24e3360 Merge pull request #2846 from kubikrubikvkube/master 
Singleton object should not have map with values that can't be GCed
 2017-02-11 20:43:32 +01:00
vraskulin
f99cd21275 Mostly code format fixes. 2017-02-09 18:30:31 +03:00
spjspj
e18695489f Merge pull request #2849 from spjspj/master 
Modify userId string
 2017-02-09 19:42:29 +11:00
spjspj
0edd01c293 Modify userId string 2017-02-09 19:41:24 +11:00
vraskulin
12820b54d4 Singleton object should not have map with values that can't be GCed 2017-02-08 19:50:57 +03:00
vraskulin
0557b5e89c list.size > 0 changed to !list.isEmpty 
We care about if it's empty or not, not about it's size
 2017-02-06 14:32:51 +03:00
vraskulin
f60ebfbb1f All 1-character strings converted to primitives 
"b" + "r" now changed to 'b' + 'w'.  It's more straight-forward, and may cause perfomance improvements - character primitives allocation is faster and less expensive than string creation.
 2017-02-06 14:32:51 +03:00
vraskulin
31589778ca Try/finally refactored to try with resources 2017-02-06 14:32:11 +03:00
spjspj
fa97e4647e Add field for server console 2017-02-05 14:11:05 +11:00
LevelX2
a5299e3a30 * Fixed a bug that card art of cards with multiple arts (e.g. FEM) were not displayed during game play. 2017-02-03 20:45:47 +01:00
spjspj
64ff81af75 Merge pull request #2825 from spjspj/master 
Add Canadian Highlander format
 2017-01-30 23:58:47 +11:00
spjspj
de6fae8c00 Add Canadian Highlander format 2017-01-30 23:57:59 +11:00
spjspj
f5a28ae7c8 Merge pull request #2821 from spjspj/master 
Modify the profanity filter to push it back to client side only.
 2017-01-28 13:03:51 +11:00
spjspj
8ebed087a5 Modify the profanity filter to push it back to client side only. 2017-01-28 12:28:11 +11:00
spjspj
676d2a54dc Merge pull request #2820 from spjspj/master 
Modify the profanity filter to push it back to client side only.
 2017-01-27 18:21:04 +11:00
spjspj
70453f1ac3 Modify the profanity filter to push it back to client side only. 2017-01-27 18:19:45 +11:00
spjspj
c2e41640e8 Merge pull request #2819 from spjspj/master 
Modify the profanity filter to push it back to client side only.
 2017-01-27 12:39:37 +11:00
spjspj
f41d81f8e4 Modify the profanity filter to push it back to client side only. 2017-01-27 12:38:31 +11:00
LevelX2
cdf05069d2 Fixed another problem of symbold downloading. 2017-01-21 01:27:35 +01:00
LevelX2
5fe25b0af7 * Fixed some problems with set icon download and displaying. 2017-01-21 00:51:31 +01:00
LevelX2
05940aa481 * Fixed that the render frame of copies of normal cards got the normal card rule box size. 2017-01-19 23:50:20 +01:00
LevelX2
6625bf86be Xmage 1.4.21V0 2017-01-15 17:44:02 +01:00
spjspj
72e4df539b spjspj - Send generated password in an email to new users. 2017-01-15 02:57:25 +11:00
LevelX2
0708525cfa * Fixed a bug that players could not join password protected limited games (fixes #2784). 2017-01-13 22:05:53 +01:00
LevelX2
450eba06e8 Merge pull request #2772 from ingmargoudt/master 
replaced enum comparison from equals to ==
 2017-01-13 17:26:50 +01:00
igoudt
ac8962cb29 replaced enum comparison from equals to == 2017-01-11 09:53:16 +01:00
vraskulin
cb1b507076 Hotfix (client don't compile) after pr 2762 merged to master 
There is no ActionListener in import block, so mage-client in current state can't be compiled. Changed ActionListener  to lambda
 2017-01-11 11:49:19 +03:00
sotovdev
fe7aaedf1c Merge branch 'master' into bigRefactoring 2017-01-10 15:37:43 +03:00
spjspj
a4275ab658 Deck editor - Add a 'Bling my deck' button. 2017-01-10 22:26:59 +11:00
vraskulin
076840df53 Big refactoring 
I used Intellij IDEA to automatically refactor code to achive 3 goals.
1) get rid of anonymouse classes, and replace the with lamba to get more readeable and clean code (like in TableWaitingDialog).
2) make effectively final  variables actually final to avoid inadvertent changes on it in further releases and keep objects as immutable, as possible.
3)  Get rid of unused imports (most of the changes) in whole project classes.
 2017-01-09 19:16:53 +03:00
vraskulin
51e5640c8e We can't invoke equals method on object, that can be null, due it's lead to NPE 2017-01-09 15:17:59 +03:00
LevelX2
ee203cf981 Xmage Release 1.4.20V0 2017-01-08 01:36:05 +01:00
LevelX2
9353c5aa9c [AER] Some more minor fixes. 2017-01-07 22:22:17 +01:00
spjspj
7a8055172d spjspj - Allow appending from the clipboard in deck editor 2017-01-08 01:02:01 +11:00
LevelX2
c2852ca233 [AER] Added Battke at the Bridge. 2016-12-31 17:00:00 +01:00
vraskulin
6577e641e6 Deprected methods changed with more up-to-date ones 2016-12-29 14:46:34 +03:00
LevelX2
8075ea2e50 * Fixed a problem that Emblems created by permanents where its owner left the game caused errors in clients. Some handling cganges of emblems. 2016-12-27 16:00:22 +01:00
vraskulin
4f81babdfa Concurrency perfomance boost 
Parallel execution. Speed increased from 50% (avg in all methods) to 500% (checkForNewCards method)
 2016-12-22 18:36:40 +03:00
vraskulin
95242e8cf9 Concurrency perfomance boost 
Checking if image exist or not now parallel. It took 35-39 seconds to perform, now it takes 13-16 seconds. Planning to make all class method concurrent and reduce client loading time even more.
 2016-12-19 15:58:08 +03:00
LevelX2
9400f192b7 Added some more tooltip texts to client menu bar. 2016-12-13 20:30:32 +01:00
LevelX2
712565562e Fixed start date of some constructed formats (e.g. Frontier missing M15) for deck editor. 2016-12-12 21:23:20 +01:00
spjspj
49d9630c05 Merge pull request #2673 from spjspj/master 
spjspj - Add new invert selection option
 2016-12-13 00:43:50 +11:00
spjspj
946e0c54fc spjspj - Add invert selection to deck editor 2016-12-13 00:42:57 +11:00
spjspj
24b4bc8e30 spjspj - Add invert selection to deck editor 2016-12-13 00:41:21 +11:00
LevelX2
3d95849c10 Some fixes to the Monarch designation. 2016-12-07 17:14:08 +01:00
Fenhl
96b4a446a9 Fix typo in the Breed Lethality deck 2016-12-05 05:01:26 +00:00
Fenhl
85f9812d72 Fix basic land artwork of C16 precons 2016-12-05 01:59:42 +00:00
ludwig.hirth
d051cb7b42 * Some client menu changes. 2016-12-02 16:06:34 +01:00
spjspj
b7695f7fea spjspj - 7pt Aus Highlander 2016-12-01 19:01:00 +11:00
LevelX2
b62ca1ed1f Xmage 1.4.19 2016-11-27 19:59:42 +01:00
LevelX2
68d0e6b9fa Added the monarch concept to xmage and all related cards. 2016-11-27 01:14:32 +01:00
spjspj
5fe4dcdd29 Merge pull request #2610 from spjspj/master 
Add 'EDH power level' rating to Commander tables
 2016-11-21 19:45:28 +11:00
Pete Rossi
b974a78b1b Add magidex.com as additional image source 
Images on magidex are referenced by url-escaped card name, so the
implementation was straightforward.  Flipped and Two-faced cards didn’t
require any additional work to support.

I downloaded all the images, and the only missing cards I could see
were tokens.  Seems to work pretty well.

Fixes issue #2153
 2016-11-20 22:33:08 -08:00
spjspj
7fd2eeedcf Add 'EDH power level' rating to Commander tables 2016-11-20 23:13:16 +11:00
spjspj
b29e25cb87 Merge pull request #2609 from spjspj/master 
spjspj - Add concept of 'Multiples' (work out in new edh decks which …
 2016-11-19 22:54:01 +11:00