Commit graph

1875 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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