Commit graph

2058 commits

Author SHA1 Message Date
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
LevelX2
d2b7aea306 Merge pull request #1566 from rkfg/master
Fix building, fix NPE on sideboarding, fix one of the perl scripts.
2016-02-27 09:26:25 +01:00
LevelX2
aa015b52e6 GUI Size - Fixed that table header lines were not horizontally moved. 2016-02-27 09:15:17 +01:00
rkfg
9842199d6f Fix NPE after finishing a round. 2016-02-26 21:09:11 +03:00
rkfg
b9dc5036ef Assembly fix. 2016-02-26 21:05:21 +03:00
Goesta
ad62546807 Improved download speed of foreign language cards 2016-02-25 19:30:20 +01:00
LevelX2
df98b4e0af * Fixed a bug with time stamp order and change of basic land type (e.g. Blood Moon and Spreading Seas). 2016-02-25 17:08:17 +01:00
Quercitron
61cad91f9b Fix images download from magiccards.info 2016-02-24 02:17:02 +03:00
LevelX2
3cd9dc3bf6 Merge pull request #1555 from goesta/wizard-multilanguage-card-download
Added support for downloading multi-language cards form Wizards.com
2016-02-23 21:51:36 +01:00
Goesta
36e084990a Added Wizards.com multi-language cards download 2016-02-23 17:27:01 +01:00
tritoch
3b17587b80 Spelling
apllication -> application
2016-02-22 15:14:02 -06:00
LevelX2
b9d3e55f94 Fixed Secluded Steppe card number in the "Wade into Battle" commander 2015 deck sample-decks directory. 2016-02-21 23:50:30 +01:00
LevelX2
74b4e5941b Fixed a spelling error in GUI Size text. 2016-02-21 23:21:21 +01:00
LevelX2
e9638bcc4d Release 1.4.9v0 2016-02-21 12:58:58 +01:00
LevelX2
51a0d8a4b2 Some more changes to GUI to better support high screen resolutions. 2016-02-21 12:15:11 +01:00
LevelX2
e04c82a227 Some more changes to GUI to better support high screen resolutions. 2016-02-21 11:30:12 +01:00
LevelX2
249d709cc7 Sizable GUI - game dialog area elements resize now. 2016-02-20 02:31:47 +01:00
LevelX2
e15807b9ed * Some more changes to adjustment possibilities of GUI size. 2016-02-19 16:30:52 +01:00
LevelX2
35505b29bb Some more changes to GUI to better support high screen resolutions. 2016-02-19 01:56:15 +01:00
LevelX2
77eff0984a Some more changes to GUI to better support high screen resolutions. 2016-02-18 00:27:48 +01:00
LevelX2
28b129018f * Some more changes to adjustment possibilities of GUI size. 2016-02-17 18:08:21 +01:00
LevelX2
5ca4e3bc7a Some more changes to GUI to better support high screen resolutions. 2016-02-16 23:15:34 +01:00
LevelX2
f54c675c4b * Fixed a bug of colorless mana (e.g. caused Heartbeat of Spring not working with Urza's lands). 2016-02-16 17:15:47 +01:00
LevelX2
129c6ca6ff Merge origin/master 2016-02-16 11:33:14 +01:00
LevelX2
4f8c4fc019 * Fixed bug that request to show players hadn did not work. 2016-02-16 11:32:23 +01:00
fireshoes
bf3e90b8ee Added DDQ and SOI cards. Added Duel Deck sample decks. Corrected Mindwrack Demon translation. 2016-02-16 00:36:17 -06:00
LevelX2
f7a7b2e7a0 Some more changes to GUI to better support high screen resolutions. 2016-02-14 23:34:36 +01:00
LevelX2
1835671f3d Some more changes to GUI to better support high screen resolutions. 2016-02-14 13:41:43 +01:00
LevelX2
7ef0a0a7f0 Some more changes to GUI to better support high screen resolutions. 2016-02-13 02:30:05 +01:00
LevelX2
706d319f81 Some more changes to GUI to better support high screen resolutions. 2016-02-12 13:35:04 +01:00
LevelX2
7b79de8e40 Some more changes to GUI to better support high screen resolutions. 2016-02-10 23:34:16 +01:00
LevelX2
a0ff08b0b9 Some more changes to GUI to better support high screen resolutions. 2016-02-10 08:31:21 +01:00
fireshoes
2a92f5e77a Added SOI and EMN sets. Added some SOI cards. 2016-02-08 20:53:09 -06:00
LevelX2
a07db4cb8e Some more changes to support GUI size for high resolutions. 2016-02-09 03:06:32 +01:00
Quercitron
d139cd591c Fix images download from magiccards.info 2016-02-09 01:39:28 +03:00
LevelX2
77a8e3e7a9 * Some fixes to font size change of chat panels. 2016-02-08 16:16:19 +01:00
LevelX2
ac2570f982 Added a chat font size option to preferences. 2016-02-08 08:49:57 +01:00
LevelX2
687ab7ec6b Added some tooltips to user table headers. History is shown in tournament player table now. Changed ratio column to numberic format. 2016-02-06 21:22:51 +01:00
LevelX2
81af372bc1 Fixed some problems with possible ConcurrentModificationExceptions and some minor changes. 2016-01-31 23:23:09 +01:00
Me Car
284c36b756 Add allowed quit ratio option to match option and tourney option. 2016-02-01 02:25:44 +09:00
Me Car
574e3cfd36 Split History column into Matches and Tourneys column. 2016-01-30 16:01:04 +09:00
LevelX2
e31b12325e Added "info [username]" command to get history for offline players. Remove user info column. 2016-01-23 16:59:15 +01:00
LevelX2
151e678e84 Changed history handling for user a bit. Added history to table waiting dialog and user avatar tooltip. 2016-01-23 13:37:34 +01:00
LevelX2
4acadf051d Minor changes. 2016-01-23 01:27:08 +01:00
LevelX2
5981816a4b Switch to 1.4.8 for upcoming realease. 2016-01-22 22:33:58 +01:00
LevelX2
93ac094470 Fixed a problem that symbols were not redownloaded if a 0 size file was created because the target file to download was not available before. 2016-01-22 14:28:46 +01:00
LevelX2
b23ddd99a0 * Some adjustments for the colorless mana symbol. 2016-01-21 23:49:24 +01:00
fireshoes
f51be0b3ef Added OGW tokens to card-pictures-tok.txt 2016-01-20 09:15:03 -06:00
LevelX2
c6eff03339 Merge pull request #1482 from menocar/user-stats
Record game histories. Compute user stats and show them in the client.
2016-01-20 07:31:11 +01:00
Me Car
379e61f98a Adjust the index correctly. 2016-01-20 13:04:04 +09:00
Me Car
550648ccbe Record game histories. Compute user stats and show them in the user panel. 2016-01-20 12:47:58 +09:00
LevelX2
cdbda6a7e6 * Fixed ArrayIndexOutOfBoundsException by trying to do actions on tables removed meanwhile. 2016-01-15 21:03:39 +01:00
Me Car
ea480a6593 Create MagePreferences class for managing preferences. We should move preference related code from MageFrame and PreferencesDialog to the class. Push all raw string preference key manipulations for serverAddress, serverPort, userName, password and email into the class. 2016-01-15 03:08:52 +09:00
Me Car
b114c17135 Store usrName and password per server. Update input boxes with corresponding values when server is changed in ConnectDialog. Save prefs on successful requests in RegisterUserDialog and ResetPasswordDialog. 2016-01-14 18:00:04 +09:00
Me Car
f5765383c7 Use server and port specified in ConnectDialog rather than in the preference. 2016-01-14 10:01:30 +09:00
Me Car
cb050c3208 Send password on reconnect. 2016-01-14 09:53:23 +09:00
Me Car
199e278ed9 Add input boxes to password reset form for server address and port. 2016-01-14 07:12:03 +09:00
Me Car
8801b63744 Add tooltip messages to clarify the usage of user authentication. 2016-01-12 13:31:27 +09:00
Me Car
746d034461 Implement a password reset flow. 2016-01-11 21:49:02 +09:00
Me Car
f99660a451 Add some password validation. 2016-01-11 11:15:01 +09:00
LevelX2
121f40c019 Prepared 1.4.7. 2016-01-10 22:13:59 +01:00
LevelX2
7f4291ac07 Fixed a problem of image download for OGW. 2016-01-10 22:13:30 +01:00
Me Car
a0ddd4fff0 Send an email on successful user registration. Use Gmail API for that. Add password confirmation and email to RegisterUserDialog. 2016-01-10 18:18:38 +09:00
Me Car
835f08c18f Add a user registration dialog. 2016-01-09 06:43:10 +09:00
LevelX2
aadc253afa Merge pull request #1442 from menocar/password
Add a password user authentication when connecting to servers.
2016-01-06 23:31:25 +01:00
LevelX2
2526dbd1c7 * Fixed null pointer exception of deck editor. 2016-01-06 22:18:35 +01:00
Me Car
32b4675f13 Integrate Shiro. 2016-01-05 03:48:43 +09:00