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
22814 commits 2 branches 0 tags 782 MiB
Commit graph

2624 commits

Author SHA1 Message Date
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
spjspj
49cfaee144 spjspj - Add concept of 'Multiples' (work out in new edh decks which are not singleton). 2016-11-19 22:45:47 +11:00
LevelX2
807782efea Added the Basque flag. 2016-11-19 10:53:43 +01:00
spjspj
d7b1ae68ed spjspj - Sorcery count was double 2016-11-18 00:14:59 +11:00
spjspj
a2b3d8825e Add 'xmage.de', 'woogerworks', 'localhost' buttons to connection dialog to fill in appropriate password/username 2016-11-13 22:59:32 +11:00
fireshoes
c8bafff7e3 Added Mirror Mastery to Commander 2011 sample decks. 2016-11-09 08:25:41 -06:00
Fenhl
d5ee37fce8 Add Counterpunch deck from CMD and fix some other precon deck names 2016-11-08 09:46:43 +00:00
LevelX2
c9e1b415e2 Xmage 1.4.18V0 2016-11-06 18:11:19 +01:00
spjspj
cab2993b1b spjspj - The 5 Commander 2016 Decks 2016-11-07 00:55:03 +11:00
Neil Gentleman
843466b6ad AudioManager: a bit of cleanup 2016-11-01 21:28:44 -07:00
Neil Gentleman
366e8e281d MageClip: copy whole input file 
not just whatever the first read returns
 2016-11-01 21:28:44 -07:00
Neil Gentleman
5d55d299a2 don't just give up when LinePool can't be initialized 
maybe fixes #2525
 2016-11-01 21:28:44 -07:00
LevelX2
0f6c14bdb7 Fixed that a client reconnect tries to reconnect to the server the client was connected to and not the last server a client on this system has connected to. 2016-11-01 22:59:24 +01:00
fireshoes
ac3203b63c Set some token version types. [C16] Added token info. Implemented Migratory Route. 2016-10-31 23:09:42 -05:00
fireshoes
72c13b9102 [C16] Implemented Wave of Reckoning, Duelist's Heritage, Entrapment Maneuver, and Magus of the Will. 2016-10-31 00:10:53 -05:00
SceLPI
0dd1a37891 Update serverlist.txt 2016-10-29 14:56:24 -03:00
LevelX2
3f05e102a0 [C16] Added Boompile. 2016-10-29 11:11:37 +02:00
LevelX2
ec8ea8e053 Allow to dwonload C16 images. 2016-10-29 11:09:09 +02:00
LevelX2
e1ca3b5cc5 * Removed the LogServices (H2 DB file that logs actions). 2016-10-28 18:39:17 +02:00
spjspj
e2afd7b790 Merge pull request #2506 from spjspj/master 
spjspj - Add in promos from scg to grabbag.  Fixed some more issues w…
 2016-10-27 22:43:50 +11:00
spjspj
fa36157f69 spjspj - Add in promos from scg to grabbag. Fixed some more issues with names 2016-10-27 22:42:05 +11:00
spjspj
66c379ce6e Merge pull request #2505 from spjspj/master 
spjspj - Add in promos from scg to grabbag.  Fixed some badly numbere…
 2016-10-27 16:07:42 +11:00
spjspj
1dae8ca6b2 spjspj - Add in promos from scg to grabbag. Fixed some badly numbered lands (probably more are bad). 2016-10-27 16:02:00 +11:00
LevelX2
6b58c18520 * Fixed a game locking problem with the day/night button of transformable cards (fixes #2503). 2016-10-26 22:53:39 +02:00
Mat
134dcb6946 Remember Type 2 selection when changing source on images download dialog 2016-10-25 23:09:31 +02:00
LevelX2
8f317305fa Some minor changes. 2016-10-24 17:55:28 +02:00
LevelX2
070a0ca3fa * Fixed a problem that the enlarged card view could stay open after a game or draft were finished. 2016-10-23 23:13:02 +02:00
LevelX2
69340d9b06 * Added correct key text to chat info message. 2016-10-23 18:39:39 +02:00
LevelX2
8b62eece68 XMage 1.4.17V0 2016-10-23 10:03:01 +02:00
LevelX2
07a7afa285 Added test and fixed some possible null pointer exception. 2016-10-22 13:06:41 +02:00
Campbell Suter
0428f5bab3
Add reset keys to default button 2016-10-21 09:54:09 +13:00
Campbell Suter
4c292466c1
Make it impossible to have multiple actions bound to the same key. 2016-10-21 09:54:09 +13:00
LevelX2
89a739e902 * Removed debug messages. 2016-10-20 15:16:31 +02:00
Campbell Suter
cde9afa091
Make keybound buttons cache their text, in case the keys are changed midgame 2016-10-20 12:49:58 +13:00
Campbell Suter
b4dc47fbc9
Improve keybinding buttons, add information 2016-10-20 12:36:18 +13:00
Campbell Suter
5ea636126f
Make the text on the playing buttons update with the current keybinds 2016-10-20 12:36:18 +13:00
Campbell Suter
d9ebceec20
Make tooltips work properly 2016-10-20 12:36:18 +13:00
Campbell Suter
e910778e54
Add F2/F6, use bindings in game 2016-10-20 12:36:18 +13:00
Campbell Suter
d7a3904569
Add key options to prefs dialog 2016-10-20 12:36:18 +13:00
fireshoes
89dd981075 Merge 2016-10-17 23:45:47 -05:00
fireshoes
b733f911f7 Added the four finalists from You Make the Cube. 2016-10-17 23:44:14 -05:00
fireshoes
c045204622 Added the four finalists from You Make the Cube. 2016-10-17 23:43:25 -05:00
fireshoes
abfcd0ab10 Added the four finalists from You Make the Cube. 2016-10-17 23:41:22 -05:00
fireshoes
1f4c0eb1d9 Added the four finalists from You Make the Cube. 2016-10-17 23:10:01 -05:00
LevelX2
2e1f8c07cb Xmage 1.4.16v3 2016-10-09 15:54:12 +02:00
LevelX2
27acaa5c9a Fixed a image cache problem that prevented to show cards with different art correctly. 2016-10-09 15:28:54 +02:00
LevelX2
67cf1604c9 Fixed a problem with images of transformed cards. Workaround for images of basic lands. Does not work correctly yet, because card art od basic lands is switched between various versions continuously. 2016-10-09 03:07:23 +02:00
LevelX2
e46895420e Added card# to deck pool area. 2016-10-09 03:05:10 +02:00
LevelX2
4ec7d626fa * Fix to get land images shown again. 2016-10-08 19:03:32 +02:00
LevelX2
5d8ae4d411 * Workaround to fix problem with deck layout. 2016-10-08 19:03:09 +02:00
LevelX2
157827addc XMage 1.4.16v0 2016-10-08 11:14:13 +02:00
spjspj
be6e900dba spjspj - Add Media Inserts to Grabbag Image Source 2016-10-08 11:19:05 +11:00
spjspj
30bfeb497d spjspj - Add Kaladesh Inventions to Grabbag Image Source 2016-10-08 01:40:37 +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
72b0192bae spjspj - Fix cube from deck from being broken with layouts 2016-10-07 10:38:56 +11:00
spjspj
56e1a96d76 spjspj - Manifest/Morph image to mtg.onl 2016-10-06 18:45:52 +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
LevelX2
7c4b40073c Fixed some exception problems (deck layout, mana symbols). 2016-10-04 23:57:11 +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
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
9a00dd20ca Fixed some problems with constructed formats definition and custom sets. 2016-10-03 20:25:08 +02:00
LevelX2
bdaa78e144 Some minor changes. 2016-10-03 10:00:48 +02:00
LevelX2
f6839f9e1d Merge origin/master 2016-10-03 01:43:02 +02:00
LevelX2
fcba98f985 Some minor changes. 2016-10-03 01:42:35 +02:00
fireshoes
002da57ccd Fixed that Constructed - Freeform format did not appear in the games lobby. 2016-10-02 18:40:45 -05:00
LevelX2
c4b4804903 Fixed that no abilitues were shown for selecting the order of triggered abilities from a dies triggered ability of tokens. 2016-10-02 23:34:06 +02:00
LevelX2
e49c92e80c Added "E" to the to be replaced symbols with icon in rule text. 2016-09-29 16:20:13 +02:00
spjspj
6ad012fa87 Merge pull request #2405 from spjspj/master 
spjspj - Player Panel
 2016-09-29 23:05:47 +10:00
spjspj
1bbed6dc5f spjspj - Player Panel 2016-09-29 23:03:57 +10:00
Lymia Aluysia
09cc9646a0
Remove outdated comment. 2016-09-29 06:48:22 -05:00
spjspj
52f6d36063 Merge pull request #2403 from spjspj/master 
spjspj - Player Panel *fix offset of {W}*
 2016-09-29 17:39:51 +10:00
spjspj
fa627a3efb spjspj - Player Panel *fix offset of {W}* 2016-09-29 17:33:22 +10:00
Mark Langen
a018f2021b Fixed a bug with JFileChooser in the DeckEditorPanel 
* On specific platforms (it seems Windows 7-10, JRT 7+), under our specific configuration, in the case where the user selects the exact same file as they chose during a previous selection, JFileChooser reports that the user selected a file, but returns chosen file = null. This commit works around that by assuming they chose the same file as last time in that case.
 2016-09-28 23:27:46 -06:00
Mark Langen
615b93f8c3 Finished the new Drag & Drop deck view. It is currently implemented in main deck editor, and limited deck construction. 
Still to do:
* Integrate it into the draft view
 2016-09-28 20:57:23 -06:00
Mark Langen
56a3c6dc8c Mostly working Drag n Drop deck editor 
* Still trying to iron out how to signal back events from cards moving between different drag and drop targets to the DeckEditorPane
 2016-09-28 20:57:22 -06:00
Mark Langen
3c2c793f5d Drag n Drop Deck Editor WIP 
* Working standalone proof-of-concept application in DragCardGrid.

* Still needs listener functionality in order to integrate it into the existing DeckEditorPanel class.
 2016-09-28 20:57:22 -06:00
Mark Langen
2d55ccc73c Change "Ask for graveyard order" setting to not ask by default 
* The cases where graveyard order matters are so staggeringly few that that the setting should almost certainly default to false.
 2016-09-28 20:57:21 -06:00
spjspj
458cbfa71a spjspj - Further changes to height of Player Panel. 2016-09-28 23:27:15 +10:00
spjspj
5b941d4c5e spjspj - Make zero values less noticeable on player panel 2016-09-28 22:58:55 +10:00
spjspj
240c7950d0 Merge pull request #2386 from spjspj/master 
spjspj - Add in energy/experience counters
 2016-09-27 17:50:26 +10:00
spjspj
de3c3ae036 spjspj - Add in energy/experience counters 2016-09-27 17:49:34 +10:00
fireshoes
783a278fca Added Frontier format (M15 forward). Added Kaladesh block constructed. 2016-09-27 01:54:49 -05:00
spjspj
1a81f2151f spjspj - Add in energy/experience counters 2016-09-26 03:17:06 +10:00
spjspj
d259efc093 spjspj - Add in energy/experience counters 2016-09-26 03:01:35 +10:00
spjspj
5671ab8ff7 spjspj - Add in energy/experience counters 2016-09-26 02:58:59 +10:00
spjspj
db3074ceda spjspj - experience.png resource (candidate for a more gooderer one..) 2016-09-26 02:50:37 +10:00
spjspj
80b498f044 spjspj - Energy.png resource 2016-09-26 02:45:20 +10:00
spjspj
16bb17e5bb spjspj - Add option of 'Number of Seats'. This is for Tournaments so that you can draft say a 4 way draft and then have a 4 way game at the end of it. 2016-09-25 00:46:16 +10:00
LevelX2
b85dc8c0cd Some minor changes. 2016-09-24 14:55:09 +02:00
LevelX2
4c91440f5e Chnaged color frame for active player to green (that white was a no go). 2016-09-22 21:48:39 +02:00
LevelX2
b7f3a4b202 Merge pull request #2321 from getgrenade/master 
Player Panel UI redesign (new icons, new colors, new buttons)
 2016-09-22 19:55:20 +02:00
spjspj
e22184180d spjspj - Add 'Delayed Submit' button to the deck editor 2016-09-20 01:49:51 +10:00
Get
ed7378da66 Player Panel UI redesign (new icons, new colors, new buttons) 2016-09-18 17:10:54 +03:00
spjspj
88b557e1b2 Merge pull request #2317 from spjspj/master 
Some minor fixes for grabbag
 2016-09-18 20:22:00 +10:00
spjspj
8cf4acb68a Some minor fixes. 2016-09-18 20:20:04 +10:00
Fenhl
ab7e86cb27 Change AE to Ae 2016-09-17 16:59:24 +00:00
LevelX2
04ca15a3a9 Some minor fixes. 2016-09-17 16:45:53 +02:00
Mark Langen
7feb237c06 Fixed card stacking offset in Editor / Library / etc. 
* Rather than respecting the spacing setting from Preferences, the spacing is now calculated from the card size if characteristic based rendering is enabled, since from the renderer we know exactly what spacing is actually needed.
 2016-09-16 16:41:00 -06:00
Mark Langen
28c04e2009 Fix cards still not showing selectable highlight in some cases 
* Simply invalidating the image render is not enough, a repaint call is also needed in a few cases where a repaint hadn't already been scheduled by the same change that trigged the selectable/chosen status change.
 2016-09-16 16:41:00 -06:00
LevelX2
d7dd635bca Revert "introduced StringUtil class with .isEmpty(String input) and .isNotEmp…" 2016-09-16 23:55:54 +02:00
ingmargoudt
f1cf9e7adb introduced StringUtil class with .isEmpty(String input) and .isNotEmpty(String input), to replace str != null && str.length()>0 statements 2016-09-16 21:23:31 +02:00
ingmargoudt
71398d6d83 added some missing session references 2016-09-16 08:58:44 +02:00
Mark Langen
7e2f606d8a Fix issue #2249 - Black borders on non-rendered cards 
* Turns out that drawing black borders on non-rendered cards, while it fixes what was probably a bug, has unintentional and undesirable implications. Needs further work in the future, but revert it for now.
 2016-09-15 20:06:37 -06:00
Mark Langen
24beaa08f9 Vehicle P/T Rendering Enhancement 
* Non-animated vehicle permanents have their P/T dimmed to distinugish their status past the type line changes.
 2016-09-15 17:18:20 -06:00
LevelX2
ce004cc2b7 * Added some missing static SessionHandler usages. 2016-09-16 00:40:37 +02:00
Mark Langen
80e8603a3a Fixed mana-symbol-textbox being rendered on permanents other than lands 
* Basic lands have the mana symbol in their textbox rather than their actual text. That was erroneously being applied to other permanents like Elvish Mystics with only a single mana adding ability as text.
 2016-09-15 16:07:24 -06:00
Mark Langen
5a6a62ecbf Fix wrong order on ability rendering 
* Keyword abilities were being rendered *last* on cards instead of first as they should be.
 2016-09-15 16:07:24 -06:00
LevelX2
f6ef3db9b9 * Added some missing static SessionHandler usages. 2016-09-15 22:30:41 +02:00
ingmargoudt
3019991473 removed the Session out of local scope and introduced a static SessionHandler that acts as interface to remote.Session 2016-09-15 20:52:41 +02:00
spjspj
a0c09ecf6a spjspj - Add 'grab-bag' of images that seem harder to get. 2016-09-16 01:41:10 +10:00
Mark Langen
9927123cb3 Made deck area orientation dynamic. 
* Deck area orientation now changes depending on the context.
* In free building and sideboarding, the sideboard and maindeck are shown side by side.
* In limited deckbuilding, the sideboard (with your limited pool) is shown above the maindeck.
 2016-09-15 00:55:23 -06:00
Mark Langen
577bdaea84 Fixes and additions to card rendering 
* Vehicles are rendered with a vehicle background and changed P/T box color
* Kaladesh Inventions are rendered with the invention frame
* Kaladesh Inventions use the full-frame art if they detect that you have that full art downloaded instead of normal card images.
* Changed land text-box colors to be a bit more saturated to make it clearer what colors they produce
* Added mana symbol in the textbox of basic lands instead of rules text as long as they have no additional abilities.
* Fixed problem with triggered abilities on the stack showing up with a type of "??? Ability". Not sure what the real cause is but those abilities have abilityType = null, just worked around it.
 2016-09-14 19:37:12 -06:00
ingmargoudt
3128bd2b4b replace [list].size() == 0 and [string].length() == 0 to use .isEmpty() instead 2016-09-14 15:27:31 +02:00
spjspj
4a15228bf2 spjspj - Add alternative SCG tokens from alternative.mtg.onl 2016-09-14 02:13:01 +10:00
spjspj
08df195bc3 spjspj - Fix for mtg.onl 2016-09-14 00:38:24 +10:00
LevelX2
5e7a4d265e Merge pull request #2254 from royk/add-deck-support 
Add support for .dek files
 2016-09-13 11:56:46 +02:00
Mark Langen
610c4789e5 Fixed card rendering breaking when view is missing set code. Real issue is #2260, but that will take more work to fix. 2016-09-12 23:25:48 -06:00
fireshoes
6ea98ba19b [KLD] Updated mtg-cards-data.txt with spoilers through 9/12. Add Masterpiece Series set and 4 known reprints so far. 2016-09-12 14:02:48 -05:00
Roy Klein
1e39c99914 Add support for .dek files 2016-09-11 23:34:17 +02:00
spjspj
c5577dc09e d'oh 2016-09-12 01:13:16 +10:00
spjspj
3bbf5d1d56 spjspj - Add in last ditch token attempt (for momir vig mainly) 2016-09-12 01:00:43 +10:00
LevelX2
bb8326d46b XMage 1.4.15v0 2016-09-10 12:31:18 +02:00
Mark Langen
8d90f4558d Merge pull request #2234 from stravant/master 
Characteristic-Based rendering initial release completed unless further bugs come up before then.
 2016-09-07 23:16:10 -06:00
Mark Langen
26b98d1afb Added more card text sizes. And other small fixes. 
* Changed card rules text rendering to use 5 total possible text sizes to better support HD+ display resolutions.

* Made a P/T box be shown on vehicles.

* Small bugfixes, fixing crashes when characteristics like type line or name are missing for whatever reason.
 2016-09-07 22:35:14 -06:00
Mark Langen
a638625c77 Fixed full-arts seemingly not replicating properly 
* The problem was that they key for caching rendered cards did not take into account the full art / not full artness of the cards, so when someone has both full art and non-full art variants of a land from the same set it one would override the other.
 2016-09-07 17:35:05 -06:00
Mark Langen
f0a1938b3e Full art Land rendering 
* Added "frameStyle" tagging to relevant full art lands (ZEN, BFZ, UNG, UHG)

* Added support for rendering based off of frameStyle

* Outstanding bug that frameStyle doesn't seem to be replicated exactly properly
 2016-09-07 02:20:51 -06:00
emerald000
df2782fdb6 [KLD] Basic implementation of energy counters. Added Woodweaver's Puzzleknot. 
Better display of energy counters would be preferred.
 2016-09-07 01:07:21 -04:00
Mark Langen
0ea9d33211 Fixed card highlighting 
* Changed CardPanelRenderImpl to correctly invalidate its render when its panel has its isChoosable / isSelected override set. Before things like selecting cards in a draft view would not visibly have an effect as the render wasn't invalidated.
 2016-09-06 18:15:37 -06:00
Mark Langen
f9e088b51d Card Rendering name & type line fixes 
* Changed Name and Type line rendering to use Arial / Arial Narrow instead of Beleren. At small font sizes, those fonts are much more readable.

* The P/T box still uses the Beleren font, as the numbers in that font are quite readable even at small sizes.

* Changed the name / type lines to switch between Arial and Arial Narrow depending on whether there is space available using Arial or not.
 2016-09-06 17:03:28 -06:00
ingmargoudt
e2a479255a refactor : removed all instances of new Random() and replaced with RandomUtil for a ThreadLocal randomizer 2016-09-05 15:03:47 +02:00
fireshoes
f2cc8d4571 Removed Nissa vs Ob Nixilis from ignored images. 2016-09-04 23:06:13 -05:00
fireshoes
b9d29d3ebf Added upcoming sets. [KLD] Updated mtg-cards-data.txt. Added some simple cards. 2016-09-04 22:54:05 -05:00
fireshoes
16c40d0248 Merge origin/master 2016-09-04 09:13:47 -05:00
fireshoes
5e911ca63c Updated image sources for upcoming sets. 2016-09-04 09:08:46 -05:00
spjspj
fb5087683f spjspj - Implement new token source (mtg.onl) for downloading of tokens to tokenDescriptor format in TOK.zip 2016-09-04 22:34:43 +10:00
LevelX2
720a4457fd * Fixed hybrid mana symbol display for characteristic-based card rendering. Removed not used import statements. 2016-09-03 10:52:14 +02:00
Mark Langen
629da22dd9 Small fix to renderer. 2016-09-01 17:23:17 -06:00
Mark Langen
b2895ee9eb Tweaked layout for small card text. 2016-09-01 16:13:28 -06:00
Mark Langen
463576dbd0 Merged up to current 2016-09-01 15:44:14 -06:00
Mark Langen
818efb8535 * Textual set symbols no longer displayed if set symbol image doesn't exist. 
* Fixed a small graphical mispositioning in rendering of keyword abilities.
* Added an option to hide set symbols entirely when rendering.
* Fixed flip walkers like Arlin Kord showing a "0" loyalty on their back face (when they should have no loyalty there).
* Removed some log files I accidentally committed.
* Fixed a bug in tokens, where they are missing their expansion symbol of they are created by another token
* Fixed the the new Rendering based CardPanel not returning the correct Image through getImage (resulting in a poor quality image in the card preview window)
 2016-09-01 15:00:46 -06:00
spjspj
0f043d480d spjspj - Implement new method for image generation of tokens. 2016-09-01 17:11:12 +10:00
Mark Langen
d33f8a636e Most obvious bugs ironed out. Ready for PR. 2016-08-31 23:37:31 -06:00
Mark Langen
d5415d2d04 Working Card Rendering 2016-08-31 04:43:28 -06:00
spjspj
4bf78fd6d4 Update devs 2016-08-19 19:45:23 +10:00
LevelX2
873ecddb1d Fixed that token images were not loaded. 2016-08-15 11:13:06 +02:00
LevelX2
539b03bd1d Xmage 1.4.14v0 2016-08-13 10:14:38 +02:00
fwannmacher
9b5a02c09c - Fixed issue #2075 2016-08-04 09:52:56 -03:00
LevelX2
a0fbcddeb9 * Added preference option to set the size of the enlarged image popup window. 2016-08-02 12:00:36 +02:00
fireshoes
88e8894b29 Added Duel Decks: Nissa vs Ob Nixilis and From the Vault: Lore. 2016-08-01 15:05:25 -05:00
Quercitron
c04bd6d64a Replace Yes/No text with Mulligan/Keep text on mulligan answer buttons to make options more clear. 2016-07-31 15:57:45 +03:00
Derek M
86e7ace06e Merge pull request #2112 from fwannmacher/master 
Converted cardNumber from int to String. Now card number with "a" or "b" can be used.
 2016-07-25 16:24:01 -04:00
spjspj
883b63a01d spjspj - Update to push deck List across from Client to Server for Custom Cube 2016-07-25 22:44:21 +10:00
fwannmacher
10778cdd6b - Converted CardImpl.cardNumber from int to String 
- Fixed Issue #1953
- Fixed Issue #1914
- Fixed Issue #739
 2016-07-24 15:18:54 -03:00
fwannmacher
78f327e822 - Fixed more image url properties 2016-07-21 01:19:28 -03:00
fwannmacher
9861f762b7 - Added option to select number of threads for image download 2016-07-20 16:08:36 -03:00
fwannmacher
8c1e7ec42e - Fixed some image url properties 2016-07-20 14:23:22 -03:00
fireshoes
9630320ba9 Changed set codes in image sources and Mage Sets to match recent changes. Changed Portal Second Age set code back to PO2. Updated tokens with recent sets to product correct images. Fixed that there was no basic land slot in EMN packs. 2016-07-18 15:49:43 -05:00
Quercitron
91f74ced1f Add downloading of double-faced cards from the mythicspoiler.com 2016-07-12 03:31:08 +03:00
LevelX2
d0ecb473da Xmage 1.4.13v0 2016-07-11 22:54:43 +02:00
LevelX2
8e76430d07 Revert "Use a dedicated thread pool for audio" 2016-07-10 22:01:06 +02:00
fireshoes
4cf3f29c4c [EMN] Added complete spoiler to mtg-cards-data.txt. Added existing reprints. 2016-07-08 11:18:14 -05:00
spjspj
26d38f0773 spjspj - Add the option of having a .dck file as a cube 2016-07-04 00:20:31 +10:00
LevelX2
ce91f6aae7 Fixed a problem with transformed image cache. 2016-07-02 19:07:26 +02:00
LevelX2
1c2aa4c10a Fixed cleint exception problem with transformable cards. 2016-07-02 18:38:29 +02:00
LevelX2
7cfdd80c57 Chnaged permanent row handling so creatures are always shown towards the opponent side. 2016-07-02 13:45:34 +02:00
LevelX2
e9993f980a Added workaround to deck generator to handle missing basic lands. 2016-07-02 13:44:36 +02:00
LevelX2
2874996994 Merge pull request #2032 from draxdyn/hold_priority 
Hold priority on Ctrl+click
 2016-07-01 16:00:20 +02:00
LevelX2
3b0f7b074f * Some changes to distance calculation of enchantments on the battlefield. Added minimal permanet size preference setting (not working correctly yet). 2016-07-01 15:08:40 +02:00
fireshoes
33ac32f5c4 [EMN] Added additional 6/30 spoilers to mtg-cards-data.txt. Added some more cards. 2016-06-30 14:47:59 -05:00
draxdyn
a7409f3d08 Hold priority on Ctrl+click 
In most cases, it is not useful to hold priority after doing something,
since the spell or ability added to the stack can just be performed
beforehand.

Hence, automatically passing priority is the only comfortable setting.

However, in some cases it is useful (chiefly for Infernal Tutor +
Lion's Eye Diamond and similar interaction), and currently players
have to open Preferences, change the option and then change it back
whenever they need to hold priority, which is very annoying.

This change allows to temporarily hold priority by simply holding
Control while performing an action, which solves the issue in a
manner similar to other clients.

A "Hold" indicator next to the spells cast indicator is displayed so
that the user knows his Control key holding was registered.

The code works by adding a new HOLD_PRIORITY player action that causes
the automatic priority pass options to be ignored until the player is
given priority again.

The client sends the message whenever it's not already holding priority
and Ctrl+click/space/enter happens anywhere.

This is somewhat "loose" as it means that Ctrl+click on the background
also holds priority, but this might actually be desirable and it greatly
simplifies the code, since only a global AWT event listener is required,
and there is no need to change every place in the code that could add
something to the stack.

It is also possible to hold priority and stop holding priority using
the context menu.
 2016-06-29 19:57:45 +02:00
drmDev
9deb1bd0da Ignition Team implementation (requested card) 2016-06-29 03:21:40 -04:00
LevelX2
facd5ffa2c Merge pull request #2028 from draxdyn/cardpanel_threading 
Fix broken threading in CardPanel
 2016-06-28 13:28:37 +02:00
LevelX2
0733729382 Merge pull request #2029 from draxdyn/audio_threadpool 
Use a dedicated thread pool for audio
 2016-06-28 13:27:18 +02:00
LevelX2
d220c739a8 Merge pull request #2030 from draxdyn/performance 
Improve GUI performance
 2016-06-28 13:26:44 +02:00
LevelX2
f7cecdf050 Merge pull request #2033 from draxdyn/f6 
Add support for F6
 2016-06-28 09:16:09 +02:00
LevelX2
c505c2f44f Merge pull request #2027 from draxdyn/resize_editor 
Update image when cards in editor are resized
 2016-06-28 09:08:37 +02:00
draxdyn
62d5d45a45 Add support for F6 
Skips everything until next turn, except for declare attackers and blockers.

F11 and F9 are a better design, but F6 is provided for compatibility with
established conventions.

There is currently no GUI button for it.
 2016-06-24 21:34:30 +02:00
spjspj
157d94360c spjspj - Modifications to shrink size of players who have left. 2016-06-24 19:20:46 +10:00
draxdyn
053580c412 Add support for disabling animations 2016-06-23 16:21:34 +02:00
draxdyn
b8e5f5f942 Draw CardPanel to a buffered image and cache it across instances 
Speeds up GUI performance.
 2016-06-23 16:21:34 +02:00
draxdyn
892cfdce45 Draw MageRoundPane and its shadow to a buffered image and cache it across instances 
Speeds up GUI performance.
 2016-06-23 16:21:34 +02:00
draxdyn
ffb65d48fe Draw GlowText to a buffered image and cache it across instances 
Speeds up GUI performance.
 2016-06-23 16:21:34 +02:00
draxdyn
4b190eeaf4 Drastically simplify ScaledImagePanel by having it just use the resized image cache 
All the current behavior of ScaledImagePanel seems to be useless, since the source
images are static, so we can just use the highest quality scaling possible and
cache the result using TransformedImageCache.
 2016-06-23 16:21:34 +02:00
draxdyn
e3d84ca212 Cache resized and rotated images 
RotatedResizedImageCache and MultiRotatedResizedImageCache contain the caching
machinery.

A cache of rotated and resized images is added to ImageCache, and is used by
the resizing functions there.

All the resizing and rotation functions in ImageHelper are redirected to the
ones in ImageCache.

This is slightly inefficient because it will cache some calls that are never
repeated, but it prevents developers from mistakenly using uncached functions
when calls are repeated, seriously impacting performance.

Also resizing functions that only take a width or an height have been removed,
and their calls fixed to provide the other dimension. It's still possible to
specify -1 as width or height to ignore constraints in that dimension, though.

Greatly speeds up UI performance.
 2016-06-23 16:21:34 +02:00
draxdyn
1999dfe5c0 Add mechanism to register image caches and flush them all on GUI size change 
This should avoid the issue of having lots of unused entries in caches if the
GUI size is changed multiple times.
 2016-06-23 16:21:34 +02:00
draxdyn
415c8cce7e Don't call setText() on the popup text component until it is shown 
Performance improvement, impacts profiles.
 2016-06-23 16:21:34 +02:00
draxdyn
9513b5bf74 Don't call setText in MageTextArea if the text hasn't changed 
Minor UI speedup, shows up in profiles for simple games.
 2016-06-23 16:21:34 +02:00
draxdyn
8c2c1f4887 Don't call setEditable in ColorPane 
Shows up in profiles, and should be unnecessary.
 2016-06-23 16:21:34 +02:00
draxdyn
0b13660348 Use mouse point in event instead of calling getMousePosition() 
Improves performance and is also the correct way to do this.
 2016-06-23 16:21:34 +02:00
draxdyn
d8b791a506 Use a dedicated thread pool for audio 
Audio threads are busy while the sound plays, which could be several seconds,
potentially stalling other tasks competing for the thread pool.

So use a dedicated thread pool, which also allows to have it sized based
on the number of the audio lines.
 2016-06-23 16:16:48 +02:00
draxdyn
1dddda6599 Fix broken threading in CardPanel 
The current code is broken, can't touch the UI in a thread pool thread,
UI.invokeLater must be used to get back on the UI thread.

Also, it must check whether the card has been changed again before setting
the image and do nothing in that case.
 2016-06-23 16:12:15 +02:00
draxdyn
5c177dcdc8 Update image when cards in editor are resized 
Currently images are blurred when changing GUI size in the editor,
and this fixes the issue.
 2016-06-23 16:01:47 +02:00
Quercitron
207961ee5f Fix that isType2 flag was not set for second sides of transform cards and flipped cards in the pictures download. 2016-06-22 13:10:42 +03:00
LevelX2
f691017cda * Gryff's Boon - Fixed that the target was wrongly selected during resolution. 2016-06-19 16:13:50 +02:00
LevelX2
84989973ed Merge pull request #2001 from draxdyn/fix_oobe 
Fix ArrayIndexOutOfBoundsException in ButtonColumn.actionPerformed
 2016-06-17 13:45:03 +02:00
LevelX2
469febfafd Merge pull request #2000 from aastrand/aastrand/password 
Add TablesPanel filter for passworded games
 2016-06-17 13:44:23 +02:00
LevelX2
5d1b96e4c9 Merge pull request #1986 from draxdyn/clicks 
Recognize double clicks made in rapid succession
 2016-06-17 13:42:38 +02:00
spjspj
8c017fe3d2 Merge pull request #2002 from draxdyn/getwizardsimage_npe 
Fix NPE in getWizardsCard
 2016-06-16 12:16:02 +10:00
draxdyn
54a7be59d0 fix NPE in getWizardsCard 2016-06-15 13:11:40 +02:00
Kranken
c445270783 Make password filter behave nice with settings 2016-06-15 00:03:22 +02:00
Kranken
9fee893ed1 Add TablesPanel filter for passworded games 
This commit makes passworded a first class property of
TableView as well as adds filtering capabilities
of open and passworded games. Useful for hiding
passworded games when looking for open play and
useful for hiding open games when playing vs
a friend on a busy server.
 2016-06-14 23:19:17 +02:00
draxdyn
d671a22398 Fix ArrayIndexOutOfBoundsException in ButtonColumn.actionPerformed 
Don't call convertRowIndexToModel with a -1 row.
 2016-06-14 18:31:33 +02:00
draxdyn
0b8404f0a4 Recognize double clicks made in rapid succession 
Currently they are not recognized, because getClickCount() will be
higher than 2 since Java interprets them as quadruple, sextuple, etc. clicks.

So, instead of checking for getClickCount() == 2, check for getClickCount()
being an even number.

This allows to quickly remove or add many cards to a deck.
 2016-06-14 13:02:51 +02:00
Alex Marcotte
a7e29b3fd0 Adding way to import deck from clipboard 2016-06-05 15:06:02 -04:00
LevelX2
266a0870ca Xmage 1.4.12v0 2016-05-29 10:59:39 +02:00
LevelX2
98fadbd8ba Merge pull request #1946 from Simown/master 
Reverted changes to deck generation sliders
 2016-05-29 10:19:11 +02:00
LevelX2
9fa0bf7bd2 Swapped main menu position of Feedback and Preferences (so Preferences is always available if you switch to a too big font size). 2016-05-29 09:53:56 +02:00
fireshoes
20ec737a58 [EMA] Added 5/23 spoilers. 2016-05-23 18:38:04 -05:00
Simown
dc10a52caf Reverted changes to deck generation sliders 2016-05-23 12:31:56 +01:00
LevelX2
f44987aa37 * Fixed that Suspend was handled as activated ability for increase/decrease of mana activation costs. 2016-05-22 16:02:10 +02:00
Quercitron
c781728b97 Add rating to the client (#1498) 2016-05-17 17:27:43 +03:00
fireshoes
a2c56d821c Added a bunch of promo cards and the new sets that were announced today. 2016-05-16 23:05:31 -05:00
LevelX2
308c485a67 Merge pull request #1913 from Bitmaximus/master 
Add tracking for quantity of artifacts in card lists. Add tracking for quantity of card types in graveyard.
 2016-05-15 18:15:28 +02:00
spjspj
f9e363fb30 spjspj - Update Rich Man draft to allow Random packs 2016-05-15 23:52:13 +10:00
LevelX2
d9066db141 * Fixed that freeform tables were not shown in thelist of open games. 2016-04-30 12:01:42 +02:00
Liam Speirs
8675e47c88 Add Card-type counter for graveyard label hover and in graveyard Dialog window. (To mirror magic online and to make delirium easier to check) 2016-04-28 00:13:32 -04:00
jeff
043a3b50cc - Added 2 great decks from the Pro Tour SOI 2016 2016-04-27 16:13:23 -05:00
Liam Speirs
8758c2de36 Add tracking for number of artifacts in card lists. 2016-04-27 14:43:40 -04:00
LevelX2
e2a8ddef0f Merge pull request #1905 from KWottrich/clean-up-java-imports 
Clean up java imports
 2016-04-26 11:37:35 +02:00
LevelX2
1fcd26fc60 xmage 1.4.11v0 2016-04-26 00:59:03 +02:00
Kenny Wottrich
f3c83d54f5 Remove Unused Imports 
Delete unused java imports that cause compiler warnings
 2016-04-24 19:50:29 -05:00
drmDev
5ab54142de W16 fix. Eldrazi Obligator fix and test 2016-04-15 12:24:04 -04:00
drmDev
e136e409fd [W16] cards added. Still does not show as Standard legal. HELP 2016-04-15 09:15:26 -04:00
Fenhl
430ae503c7 Change all line endings to LF 2016-04-14 16:18:01 +00:00
Jared Hall
3f2611de76 Fixes #1836 2016-04-12 08:16:15 -04:00
spjspj
bfc66ff3f3 spjspj - Further fixes for useFirstManaAbility 2016-04-07 15:29:18 +10:00
spjspj
dacef8db5e spjspj - Further fix for User First Mana ability. It should be false unless the user explicitly turns it on through ALT+1 or the menu options. 2016-04-07 10:46:29 +10:00
LevelX2
bcdde0a945 XMage version 1.4.10v0 2016-04-06 22:56:02 +02:00
spjspj
822917322c spjspj - Use first Mana ability fixes 2016-04-05 21:37:04 +10:00
spjspj
e5ca1bd6d2 spjspj - Implement a 'Use the first available mana ability for a land mode'. 
This allows people to float mana more easily and to not have to get the popup forcing them to select which mana ability they would like to activate.
There's a new option in the menu system under the Mana Payment section which is set via pressing 'Alt' and the number '1' key (aka Alt+1) (and is unset by releasing Alt+1).
Or they can set it from the right click menu as well.
 2016-04-04 20:30:28 +10:00
Jared Hall
44388719a6 Fixes #1755 2016-04-03 20:35:59 -04:00
spjspj
85a22ea9d9 spjspj - Add in message for F11 button 2016-04-02 10:13:54 +11:00
spjspj
3dfe9de05f spjspj - Add the 'Skip to End Step of Previous Player' button to the GamePanel and associated changes 2016-03-27 00:07:23 +11:00
fireshoes
185447c424 [SOI] Added some additional token types. Updated mtg-cards-data.txt with 3/22 spoilers. 2016-03-22 10:18:10 -05:00
fireshoes
b58a0374c6 Added missing Blessed vs Cursed image information. [SOI] Added basic lands, some additional token types and emblems. 2016-03-22 00:05:55 -05:00
rkfg
059b56e11a Add transparency to highlighted player panel. 2016-03-21 21:49:25 +03:00
rkfg
66a9e5140a Highlight current player's panel. 2016-03-20 18:42:58 +03:00
rkfg
ae66db20ad Adjust sliders on reset. 2016-03-17 15:13:29 +03:00
rkfg
981665bcd0 Remove adjust parameter. 2016-03-17 15:13:28 +03:00
rkfg
74f925b579 Fix deck generator sliders. 2016-03-17 06:30:21 +03:00
rkfg
eec3e779bd Simplify controlling of advanced deck generator sliders. 2016-03-17 03:19:20 +03:00
fireshoes
0a38430d49 [SOI] Added 3/14-15 spoilers to mtg-cards-data.txt Added Angel of Deliverance, Anguished Unmaking, Descend upon the Sinful, Drogskol Cavalry, Nephalia Moondrakes, and Sinister Concoction. 2016-03-15 17:47:21 -05:00
Simown
9dc71d2996 Added advanced deck generator functions and tidied up the layout. 2016-03-13 11:33:45 +00:00
rkfg
fec2ed464f Fix default value for "Store images in zip files". 
It's set to true as the default checkbox state but to false as the
default cached value. Because of that if preferences are never saved
images are stored to directories though the checkbox will be set in
preferences.
 2016-03-11 20:41:19 +03:00
rkfg
909a99ceec Fix transformable cards state desync. 2016-03-09 16:27:00 +03:00
rkfg
8be72c404e Add debug logging to LinePool. 2016-03-09 14:37:59 +03:00
rkfg
b513f3c7b6 Properly close, free and stop lines. 2016-03-09 14:37:58 +03:00
rkfg
d7cdfa016e Minor change, add comments. 2016-03-09 14:37:57 +03:00
LevelX2
7ac679048c Fixed a problem that a chang of the card offset value in preferences was not immediately applied to the card selector in deck editor. 2016-03-09 12:26:35 +01:00
LevelX2
4f8a3e5ae8 Fixed a bug that quitting a tournament by using the "Quit Tournament" button on the tournament panel did not work (fixes #1601). 2016-03-09 12:25:01 +01:00
rkfg
d8ff28c7f7 Refactor audio manager, add line pool. 2016-03-08 02:09:57 +03:00
Quercitron
6e4a4285b8 Fix images download from magiccards.info 2016-03-08 01:21:34 +03:00
rkfg
f95921cc73 Enable hyperlinks handling only in the game log window. 2016-03-07 03:33:04 +03:00
LevelX2
0c242bce5f * Some more support for GUI resizing. 2016-03-06 02:59:47 +01:00
LevelX2
c6f8d09229 Merge origin/master 2016-03-06 02:06:37 +01:00
LevelX2
e29c4c3516 * Fixed that the storm counter was no shown on the game panel. 2016-03-06 02:06:10 +01:00
rkfg
5fe67bda4c Remove unneded import. 2016-03-06 02:55:30 +03:00
rkfg
768b004d3e Fix race condition on tooltip resize in EDT. 
CardInfoPane.setCard() performs the tooltip resize, initially it's of
zero width and height. The resize happens in the EDT but location is
calculated in the thread pool's thread, i.e. before the first resize.
Because of that the first time the tooltip appears it may be partially
off-screen, nothing fatal but looks ugly. Now all calculations are moved
to EDT as well and they're guaranteed to happen after the resize.
 2016-03-06 02:53:32 +03:00
rkfg
98c291be7b Protect tooltip counter from going negative forever. 2016-03-06 02:53:31 +03:00
LevelX2
dd9431c8ea * Added scrolling to the game dialog area. Some more GUI resizing. Removed some unwanted borders of viewports. 2016-03-05 21:00:55 +01:00
rkfg
1ff8e42222 Prevent tooltip counter going up on hyperlink click. 2016-03-05 01:03:39 +03:00
rkfg
63ca80fc86 Recreate card thumbnails wrongly encoded as CMYK JPEG from PNG. Fixes 
#1589.
 2016-03-05 00:06:57 +03:00
rkfg
79568c82f2 Fix that when you quickly move cursor from one hyperlink to another, 
tooltip disappears.
 2016-03-04 21:39:48 +03:00
rkfg
75324f778e Fix tooltip for cards with apostrophes. If there are cards with quotes 
or lt/gt in the name, this will need more generic approach.
 2016-03-04 21:39:47 +03:00
rkfg
a612eb4585 Fix CRLF mess again. 2016-03-04 10:29:40 +03:00
LevelX2
3f57012c85 Merge origin/master 
Conflicts:
	Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
 2016-03-03 23:22:06 +01:00
rkfg
e8091daea5 Reverted crlf's back. 2016-03-04 01:13:27 +03:00
rkfg
b9bbf9ccec Store symbols as .gif instead of .jpg, rename already downloaded ones on 
start, fixes #98.
 2016-03-04 01:06:53 +03:00
rkfg
47b2a64cee Store symbols as .gif instead of .jpg, rename already downloaded ones on 
start, fixes #98.
 2016-03-04 00:59:12 +03:00
rkfg
9cf972ced4 Faster symbols load. 2016-03-03 23:04:35 +03:00
rkfg
89bce030d0 Add colorless mana filter to deck generator. 2016-03-03 00:39:58 +03:00
rkfg
6cfe43e9b7 Make DeckGeneratorDialog fields non-static for more OOP-style. 2016-03-03 00:39:57 +03:00
rkfg
5b9a38bf22 Fix first card tooltip show. 2016-03-02 14:48:57 +03:00
rkfg
ba0cd24b55 Show card tooltips in system logs. 2016-03-01 01:12:57 +03:00
rkfg
abff5c1958 Filter HTML in ability picker. 2016-02-29 20:53:03 +03:00
rkfg
f7314307a6 Reload symbols after closing the symbols download window (better UX). 2016-02-29 20:08:52 +03:00
rkfg
f00a588e24 Add Generate button to Deck Editor. 2016-02-29 19:40:00 +03:00
rkfg
3658a8c7bc Prevent NPE if client never connected to any server and doesn't have 
sets downloaded.
 2016-02-29 19:39:59 +03:00
LevelX2
6d4a3bac28 Fixed that wathcing games did not work correctly. 2016-02-28 10:52:55 +01:00
LevelX2
f87c5bbbec Fixed that the flag on avatar image could be to big. 2016-02-27 12:33:08 +01:00
LevelX2
ad4b68dcb5 Fixed card grid dimension initialisation. 2016-02-27 09:30:21 +01:00
LevelX2
56294eac50 Merge origin/master 2016-02-27 09:28:01 +01:00
LevelX2
ac757b6a88 Fixed card grid dimension initialisation. 2016-02-27 09:27:43 +01:00