Commit graph

16464 commits

Author SHA1 Message Date
spjspj
363255bcec spjspj - Deduplicate collector numbers 2016-10-08 13:08:00 +11:00
spjspj
d547a0b0c9 spjspj - Update gen_list_duplicate_collector_ids.pl 2016-10-08 12:53:04 +11:00
spjspj
ea58016c1c Merge pull request #2440 from spjspj/master
spjspj - Add MBP (Media Inserts) to Grabbag image source
2016-10-08 11:20:35 +11:00
spjspj
be6e900dba spjspj - Add Media Inserts to Grabbag Image Source 2016-10-08 11:19:05 +11:00
LevelX2
4d7e744187 [SWS] Fixed some problems. 2016-10-07 17:56:16 +02:00
spjspj
30bfeb497d spjspj - Add Kaladesh Inventions to Grabbag Image Source 2016-10-08 01:40:37 +11:00
Styxo
966e2f686d Merge pull request #2438 from Styxo/master
Added Tribal Forcemage
2016-10-07 15:22:50 +02:00
Styxo
783824ba5c Added Tribal Forcemage 2016-10-07 15:19:03 +02:00
LevelX2
984d94e64d Added test. 2016-10-07 14:49:27 +02:00
spjspj
fc1de0adf0 Merge pull request #2435 from spjspj/master
spjspj - Show import from clipboard dialog
2016-10-07 20:29:31 +11:00
spjspj
624bb8da76 spjspj - Show dialog box for import from clipboard 2016-10-07 20:27:26 +11:00
spjspj
250873263c spjspj - Show dialog box for import from clipboard 2016-10-07 20:15:36 +11:00
spjspj
7e71b22fbe Merge pull request #2434 from spjspj/master
spjspj - Fix cube from deck from being broken with layouts
2016-10-07 10:40:24 +11:00
spjspj
72b0192bae spjspj - Fix cube from deck from being broken with layouts 2016-10-07 10:38:56 +11:00
emerald000
0a55626251 Fixed subtype of Visionary Augmenter 2016-10-06 16:03:18 -04:00
fireshoes
8559913a71 Fixed Verdant Crescendo revealing the library instead of Nissa. Fixed tooltip on Restoration Gearsmith. Added Seton's Desire and FNM promo Call the Bloodline. 2016-10-06 14:38:39 -05:00
spjspj
9809ca0fe0 Merge pull request #2433 from spjspj/master
spjspj - Manifest/Morph image to mtg.onl
2016-10-06 18:46:38 +11:00
spjspj
56e1a96d76 spjspj - Manifest/Morph image to mtg.onl 2016-10-06 18:45:52 +11:00
LevelX2
c2e849053a Merge pull request #2431 from Galatolol/master
Fixed Aurioks Siege Sled's effect text.
2016-10-06 07:24:48 +02:00
LevelX2
fae1cb8cce Added chat mute and user (de)activation actions to the Mage server console. 2016-10-06 01:09:53 +02:00
spjspj
f51d4f4e0f Merge pull request #2432 from spjspj/master
spjspj - Opaque w mana button
2016-10-06 00:02:54 +11:00
spjspj
b63874b62d Opaque PlayerPanelExt 2016-10-06 00:02:11 +11:00
spjspj
84e26e6677 Opaque PlayerPanelExt 2016-10-06 00:00:20 +11:00
komp
2c657bb379 Fixed effect's text of Aurioks Siege Sled 2016-10-05 14:39:20 +02:00
LevelX2
39eaaf7274 Merge pull request #2428 from JOAC69/card-reorg
Card reorg
2016-10-05 07:34:32 +02:00
JOAC69
1f0a5292a0 Modify latest cards from master merge to use CardInfo and put in ExpansionSet 2016-10-04 21:02:59 -05:00
JOAC69
c8bdd3a60c Move latest cards from master merge to proper area 2016-10-04 20:37:17 -05:00
JOAC69
59f88047e4 Modify cards 2016-10-04 20:06:28 -05:00
JOAC69
4b8d31e5f4 Move cards 2016-10-04 19:58:48 -05:00
JOAC69
e8230946af Remove use of card classes for duplicate cards. Remove set related information from being tied to card classes. 2016-10-04 19:58:48 -05:00
LevelX2
3c2189e7a1 Merge pull request #2426 from Galatolol/master
Added 5 cards
2016-10-05 01:08:34 +02:00
LevelX2
53a5ab501e Merge pull request #2427 from Eirkei/AlphaStatusImplemented
Alpha Status Implemented
2016-10-05 01:04:19 +02:00
LevelX2
c46f75ac28 Added chat mute and user (de)activation actions to the Mage server console. 2016-10-05 00:59:51 +02:00
LevelX2
7c4b40073c Fixed some exception problems (deck layout, mana symbols). 2016-10-04 23:57:11 +02:00
Eirkei
e9239d5219 Alpha Status Implemented 2016-10-04 23:56:21 +02:00
komp
f6af45f984 Added 5 cards: Auriok Siege Sled, Phyrexian Reaper, Phyrexian Slayer, Conclave's Blessing, and Screeching Griffin 2016-10-04 23:40:57 +02:00
LevelX2
db31264538 Some changes to the server console. 2016-10-04 17:40:37 +02:00
LevelX2
a1123b3c0b * Myriad some cleanup (#2420). 2016-10-04 15:29:52 +02:00
Styxo
3c7c584bab Merge origin/master 2016-10-04 15:13:38 +02:00
Styxo
9bee036fe8 Fixed that Noxious Gearhulk could target itself 2016-10-04 15:08:25 +02:00
Mark Langen
d604b18f6b Separate setting for split position in sideboarding vs deck construction
* Depending on the orientation of the sideboard / maindeck the split should be a separate setting, not one single one.
2016-10-04 01:18:50 -06:00
Mark Langen
5af417ed0b More Drag & Drop editor fixes
* Fixed cards being blurry. The problem isn't completely fixed, but the fix will suffice in most cases. Card Images are only loaded in once, and the cards were loaded in initially at a small size instead of their eventual size after layout. Really they should reload images when resized, but I will tackle that later, and it's only noticable when significantly resizing cards within one usage of the editor anyways.
* Removed some of the unneeded UI on the sideboard half of the DeckView so that componently are less likely to overlap at a small size. Not sure how to ideally handle this, as Swing doesn't really provide an elegant way to hide components at small sizes, and I'm sure the user would rather the components overlap than be unable to resize the window as small as they want due to a minimum size requirement.
2016-10-04 00:23:13 -06:00
Mark Langen
f6d50ce04f Various new Drag & Drop deck editor improvements
* Shift-Click / Shift-Drag now work as expected as far as multi-selection
* Deck editor saves split pane split positions
* Card layout and sort settings are now saved along side the a deck when saving to the .dck format, so that you have back the exact same deck layout when you re-load the deck.
* Fixed the symbol image downloader to work around some of the large-size symbol images being missing on gatherer. Falls back to the medium sized images currently for those symbols.
2016-10-04 00:09:51 -06:00
LevelX2
38cbf1a687 Merge pull request #2422 from spjspj/master
spjspj - one more token
2016-10-04 07:32:52 +02:00
fireshoes
ae41a5fbbf Changed Duel Commander starting life total to 20. 2016-10-04 00:24:45 -05:00
spjspj
4d3f28ed6d spjspj - one more token 2016-10-04 10:01:41 +11:00
fireshoes
7cbb3df889 Fixed that Eternal format matches did not show in the matchmaking lobby. 2016-10-03 16:39:11 -05:00
LevelX2
e8ab8558d1 Fixed some possible null pointer exceptions. 2016-10-03 22:07:10 +02:00
LevelX2
01ca3689b3 Some minor changes. 2016-10-03 20:25:17 +02:00
LevelX2
9a00dd20ca Fixed some problems with constructed formats definition and custom sets. 2016-10-03 20:25:08 +02:00