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
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
LevelX2
9ac7fe27f0
* Vindictive Lich (mode target handling not fixed yet).
2017-08-21 18:49:37 +02: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
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
spjspj
6435b9950a
Add in Penny Dreadful EDH format (plus filter options for deck editor).
2017-08-04 17:13:25 +10: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
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
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
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
bec0964726
Token refactor
2017-05-08 21:53:01 +10:00
spjspj
e73e7d8600
Token refactor
2017-05-06 23:35:14 +10: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
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
spjspj
5373997b30
Undo double tap of ok button (Leading to duplicate tournaments - Fixes #3154 )
2017-04-19 10:30:40 +10: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
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
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
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
