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
Me Car
33330e9345
change the type to password
2016-01-05 02:16:32 +09:00
Me Car
ea5abfe578
Add password input box
2016-01-05 02:16:32 +09:00
LevelX2
7c00e4b16d
* Graveyard window - Fixed that the displayed card order was sometimes mismatched.
2015-12-25 17:43:10 +01:00
fireshoes
3008b5ed14
[OGW] Added 18 cards. Cards with <> in their activation costs are untested.
2015-12-14 23:02:35 -06:00
fireshoes
a0f80b785c
Added 12/13 spoilers for OGW, EXP, and DDQ to mtg-cards-data.txt. Added Duel Decks: Blessed vs. Cursed set. Added reprints from the 12/13 spoilers.
2015-12-14 14:36:12 -06:00
LevelX2
207f486afc
* Xmage 1.4.6v0
2015-12-13 19:47:04 +01:00
LevelX2
ea0ba76736
* Deck editor - Fixed a bug that prevented users to add cards to deck or sideboard (was caused by creatures with negative toughness and it was sorted by p/t - fixes #1414 ).
2015-12-13 10:34:35 +01:00
LevelX2
d9b20298b7
* Bloodlord of Vaasgoth - Fixed that Vampires entering the battlefield did never bloodthirst from the Bloodlord.
2015-12-13 10:05:54 +01:00
LevelX2
81e67927a5
Minor change to download of card images.
2015-12-12 17:39:14 +01:00
LevelX2
af793c30fe
* Added a slider to the preferences to adjust the delay for the card tooltip window appearance.
2015-12-08 18:39:47 +01:00
fireshoes
7a102b2c35
Merge origin/master
2015-12-07 15:14:50 -06:00
fireshoes
f8ba0da7e5
[OGW] Added Mina and Denn, Wildborn. [EXP] Added filterlands. [CUBE] Renamed Holiday Cubes to Vintage Cubes. Add Vintage Cube 2016.
2015-12-07 15:13:31 -06:00
LevelX2
f7b8ab626d
* Added scroll ability for system messages panel.
2015-12-05 00:48:36 +01:00
LevelX2
af23795a7b
* Fixed wrong formated definition error of card-picture-tok.txt.
2015-12-03 16:53:06 +01:00
fireshoes
d0d9731da2
Added promo sets Arena League, Super Series, APAC Lands, Euro Lands, Commander's Arsenal, Champs, and Ugin's Fate. Added some Media Insert, Judge Promo, and FNM promos.Fixed a few collector numbers to match magiccards.info.
2015-12-01 20:19:28 -06:00
LevelX2
044c30b638
* Main lobby - Separated user talk from system messages by using two tabs in chat area to switch.
2015-11-29 20:01:40 +01:00
LevelX2
3a7983a0d0
* Main lobby - Separated user talk from system messages by using two tabs in chat area to switch.
2015-11-29 20:01:31 +01:00
Neil Gentleman
bfb428b13a
always use log4j
...
removed all references to mage.util.Logging, java.util.logging
transient static doesn't mean anything, since static fields are never
included in serialization
2015-11-28 21:11:25 -08:00
LevelX2
0a39b0568d
* Fixed that the selected avatar was not shown as avatar in the game ( fixes #1365 ).
2015-11-28 09:38:28 +01:00
fireshoes
ce3a443a65
Updated the card-pictures-tok.txt file with some additional tokens.
2015-11-25 11:22:27 -06:00
LevelX2
8957128b13
* Renamed "Historical Standard" format to "Historical Type 2" and "Super Standard" to "Super Type 2". Added Chronicles to the set lists.
2015-11-25 17:29:23 +01:00
Neil Gentleman
a90d0e5597
reuse shared code for picking basic land sets
2015-11-22 18:00:10 -08:00
LevelX2
05dd1daee6
* Added some information to the player tooltip in game (expericence counters, deck hash code, # of wins).
2015-11-22 11:07:48 +01:00
Neil Gentleman
702be67453
correct some dodgy sample deck names
2015-11-21 22:36:07 -08:00
LevelX2
b84a315780
[C15] Fixed not correct working Commander 2015 decklists.
2015-11-21 22:56:14 +01:00
LevelX2
0d86e8e063
Xmage 1.4.5v0
2015-11-21 10:33:43 +01:00
LevelX2
cd17436c4e
[C15] Added the C15 deck lists.
2015-11-19 17:25:38 +01:00
Neil Gentleman
68e850b8b8
remove old bundled mage-theme-plugin.jar
...
which causes plugin loading to consistently fail, so switch back to
directly instantiating ThemePluginImpl()
this is a little unfortunate, because these plugins don't get the same
lifecycle handling as external ones
re: c25e45095e
2015-11-15 15:28:03 -08:00
LevelX2
576a9ea74f
Updated mtg-cards-data.txt. Added a land deck for Mormir Basic format.
2015-11-15 10:25:02 +01:00
LevelX2
79c04eef47
* Added Momir Basic format to table filtering so Momir Basic games are shown.
2015-11-14 19:07:48 +01:00
Quercitron
a092f965fa
Add tokens.mtg.onl token images source
2015-11-13 02:54:22 +03:00
Neil Gentleman
02a6780766
add Momir Basic game type
...
- re-using Emblems as Vanguard cards; should probably give them their own
CommandObject class
- setting the timing on the Momir ability to TimingRule.SORCERY causes the
ability not to activate (?), so I've left it at INSTANT for now
- need to add a new card image source for vanguard cards
2015-11-11 12:31:30 -08:00
Neil Gentleman
c25e45095e
remove Mage.Theme.Plugin module
...
it has been a included in Mage.Client since 8ac58cfc
2015-11-11 00:31:31 -08:00
Neil Gentleman
deb4608c00
Don't try to play null audio
...
a message is already logged when loadClip fails; this avoids showing an error
dialog over and over afterwards.
2015-11-08 22:32:43 -08:00
Quercitron
e23fc13db0
Fix pictures for some tokens from recent sets
2015-11-08 20:16:47 +03:00
fireshoes
59cf816f32
[C15] Added 11/5 spoilers and Angel of Serenity reprint, corrected Meteor Blast's translated name, and updated tokens.
2015-11-05 10:26:40 -06:00
LevelX2
c71e89c441
Merge pull request #1346 from nigelzor/misc-fixes
...
Misc fixes
2015-10-29 09:19:23 +01:00
Winston Huang
0af814f3d0
Fix MageFrame title
2015-10-28 22:04:25 -07:00
Neil Gentleman
ff1b424caf
options passed to JOptionPane were backwards
...
they're both -1, so this doesn't change anything
2015-10-28 21:48:58 -07:00
fireshoes
bf2992fc42
Added Commander 2015 set; added Eternal Witness and Kalemne, Disciple of Iroas cards to C15.
2015-10-20 14:52:39 -05:00
Neil Gentleman
6c43858046
Deck Editor: Fix redraw after missing image
2015-10-19 00:27:59 -07:00
LevelX2
b3cadac4ea
* Image download - Fixed a bug of mythicspoiler source, that preveneted download of EXP images.
2015-10-04 22:58:09 +02:00
LevelX2
e2453abbb5
* Fixed a bug that some options in preferences were handled with the wrong state as long as never set manually.
2015-09-29 17:26:29 +02:00
LevelX2
b95d7ca705
* Fixed some problems with new avatar handling.
2015-09-27 14:50:44 +02:00
LevelX2
23cd772fea
* Fixed that using a previous internal avatar ID did create an exception while playing/watching a game.
2015-09-27 14:11:56 +02:00
LevelX2
9d3619b68c
* Some rework of preferences avatar panel.
2015-09-26 01:10:05 +02:00
LevelX2
2023686ee8
* Some minor changes.
2015-09-25 23:22:54 +02:00
LevelX2
044e8b70f0
Some minor changes for BFZ token image handling.
2015-09-23 19:53:25 +02:00
LevelX2
5bed5aeff7
* Fixed null pointer exception for download with mythicspoiler.
2015-09-21 19:21:23 +02:00
LevelX2
9ab323a89c
Deck editor - renamed sort type "Color Detailed" to "Color Identity" and compare for the sort also with mana symbols in casting cost and rules.
2015-09-21 08:11:58 +02:00
LevelX2
322eae2ec6
Deck editor - renamed sort type "Color Detailed" to "Color Identity" and compare for the sort also with mana symbols in casting cost and rules.
2015-09-21 00:31:42 +02:00
LevelX2
ed15f0b86b
Fixed that not BFZ images were downloaded from mysticspoliers source. Fixed that Zendikar Expeditions images were not downloaded from mysticspoliers source.
2015-09-20 20:23:36 +02:00
fireshoes
f2b7771d59
[BFZ] Implemented Prism Array, Sanctum of Ugin, Spawning Bed, Makindi Sliderunner , Snapping Gnarlid, Molten Nursery, Pilgrim's Eye
2015-09-17 20:35:14 -05:00
LevelX2
9a37bd28ad
Xmage 1.4.4v0
2015-09-05 12:51:07 +02:00
LevelX2
fe80d292ab
Some changes for token download.
2015-09-05 01:53:48 +02:00
LevelX2
707c1acf6b
* Added an option to auto order triggers with the same text. Added options to pass priority automatically after spell cast and ability activation. Fixed a problem of the tests with the new Scry mulligan.
2015-09-04 00:25:23 +02:00
Simown
1bdc54556a
Fixed a bug in random deck generation where generating a deck from a set
...
with too few cards caused an exception. Minor formatting fixes.
2015-09-03 21:30:15 +01:00