2929 commits

Author	SHA1	Message	Date
LevelX2	eebc412ad9	Some updates to image download.	2017-09-15 23:19:11 +02:00
LevelX2	3fc3d96fe0	Some updates to image download.	2017-09-15 23:18:40 +02:00
LevelX2	d95a3e470c	Updated some logic.	2017-09-12 17:25:18 +02:00
LevelX2	a280605591	Some updates.	2017-09-10 10:19:14 +02:00
Evan Kranzler	252c941b4f	Refactored more subtypes usages to enum	2017-09-08 09:57:51 -04:00
LevelX2	96034c4c2b	Updated some logic.	2017-09-08 15:22:09 +02:00
LevelX2	c9327b718d	Updated some logic.	2017-09-06 17:49:55 +02:00
LevelX2	7329dc6c3f	Some more changes to image download.	2017-09-05 00:12:09 +02:00
LevelX2	5a1544050c	Updated image download handling.	2017-09-04 18:25:31 +02:00
LevelX2	d003cd898f	Image download by set with source restriction to supported sets.	2017-09-04 07:57:10 +02:00
LevelX2	452c05543d	Added Ixalan image download from mythic spoilers source.	2017-09-03 10:10:09 +02:00
LevelX2	a46538fc06	Removed some unused code.	2017-09-01 16:03:43 +02:00
LevelX2	9ac7fe27f0	* Vindictive Lich (mode target handling not fixed yet).	2017-08-21 18:49:37 +02:00
spjspj	4687943176	Update penny dreadful list (http://pdmtgo.com/legal_cards.txt)	2017-08-20 22:01:19 +10:00
spjspj	fc31753695	PD implement..	2017-08-19 16:08:19 +10:00
LevelX2	cb8b4d8cbf	Fixed some problems that table dialogs were not closed if the table controller closed the table.	2017-08-18 00:12:12 +02:00
LevelX2	bae7f154df	Changed user disconnect handling. The user in the server is no longer deleted directly after connection problem, disconnect or quit. The user object remains now for 8 minutes so the rejoin not possible after disconnect problem should be solved (I hope so). We will see. Also fixed the problem, that the table panel was not shown, if a player disconected and reconected.	2017-08-13 16:22:18 +02:00
LevelX2	9a1ce3f449	Merge pull request #3769 from Eleros/feature/HASCON2017Promos ... Feature/hascon2017 promos	2017-08-04 22:39:20 +02:00
spjspj	6435b9950a	Add in Penny Dreadful EDH format (plus filter options for deck editor).	2017-08-04 17:13:25 +10:00
Saga\Robert	2e1a820040	- added gold color ... - added gold Dragon Token - edited new set data (H17) for Sword of Dungeons and Dragons	2017-08-01 14:55:17 +02:00
LevelX2	7b168a9d5e	* Minds Aglow - Fixed that payed mana can be undone if X was set to a too high value.	2017-07-30 18:50:36 +02:00
LevelX2	7ba051871d	* Fixed minor bug that the tables list was not cleared if no active table did exist.	2017-07-29 20:22:07 +02:00
LevelX2	a35abd7f8c	* Deactivated macro button, becuase it's not working correctly (#2147).	2017-07-29 19:13:13 +02:00
LevelX2	5cca05dd23	* Fixed bug in download images logic (fixes #3756).	2017-07-29 17:53:28 +02:00
LevelX2	052fbb3ab6	Merge origin/master	2017-07-29 17:39:36 +02:00
LevelX2	400bbba8e1	* Deactivated macro button, becuase it's not working correctly (#2147).	2017-07-29 17:39:13 +02:00
spjspj	e8147a4860	Merge pull request #3755 from spjspj/master ... Mana Circles for deck analysis	2017-07-30 00:00:12 +10:00
spjspj	b6a7998eab	Mana Circles for deck analysis	2017-07-29 23:55:58 +10:00
LevelX2	18cab46b05	* Improved editor search function, fixed some problems with search for split card rules.	2017-07-29 11:43:05 +02:00
LevelX2	cd6c7623ed	* Added missing imports, imports reorg.	2017-07-23 16:29:29 +02:00
spacemoses	19d1c7e987	Removing hardcoded User-Agent header causing error for card image retrieval	2017-07-22 13:23:49 -05:00
ingmargoudt	09f0c9ad97	huge rework on subtypes (#3668) ... * huge rework on subtypes * update for coat of arms * fix test	2017-07-16 16:57:39 -05:00
LevelX2	60951f645b	* Removed magiccards.info as download source.	2017-07-16 19:10:10 +02:00
LevelX2	1fe841e6d9	Merge branch 'master' into master	2017-07-10 13:18:58 +02:00
fireshoes	48413a956a	Added MTGO 1v1 Commander and Amonkhet Block Constructed formats. Fixed a typo in the Duel Commander banlist.	2017-07-09 16:51:57 -05:00
LevelX2	2b94ed232a	Fixed minor spelling error in preferences.	2017-07-09 15:31:32 +02:00
Benjamin Maitland	8e16cf0bd6	Added the Old School 93/94 Format. Uses original rules.	2017-07-08 23:40:27 -04:00
fireshoes	a1c574bfda	Added Planechase Anthology, updated Media Inserts and Judge Promos	2017-07-07 14:27:29 -05:00
spjspj	495a84f1f1	Implement 2 cards (HOU) Fix for Bontu's Last Reckoning	2017-07-04 19:07:17 +10:00
spjspj	5a7a9049d9	Merge pull request #3549 from spjspj/master ... Implement The Locust God (HOU)	2017-06-27 21:33:21 +10:00
spjspj	6d35de829f	Implement The Locust God (HOU)	2017-06-27 21:32:14 +10:00
LevelX2	9b31a5a7e3	Merge pull request #3516 from ruler501/summerproject ... Shortcut/Macro System	2017-06-26 17:53:49 +02:00
spjspj	e683a579b3	Merge pull request #3512 from spacemoses/master ... Enhancement #3222 - Adding scroll to clipboard import in deck builder	2017-06-25 23:16:21 +10:00
Devon Richards	fee630a0ac	Small cleanup	2017-06-24 11:23:58 -05:00
LevelX2	442d8ebc78	* Added HOU spoilers 2017-06-24.	2017-06-24 11:00:21 +02:00
Ben Homer	b68091683a	Added keybinding to preferences and improved UI appearance with new image file.	2017-06-22 01:42:01 -05:00
Devon Richards	0d98514550	Added better UI and made it work with most categories of combos	2017-06-21 01:09:54 -05:00
Devon Richards	028d7ed1f8	Initial working product. Doesn't handle skipping stack.	2017-06-20 19:54:16 -05:00
spacemoses	882060bf3e	Enhancement #3222 - Adding scroll to clipboard import in deck builder	2017-06-18 18:44:59 -05:00
Quercitron	0c9c7c0a56	Add scryfall.com as a source for card images (closes #3496).	2017-06-17 17:55:35 +03:00
fireshoes	52b4633340	Added Commander Anthology. Added Archenemy: Nicol Bolas to mtg-cards-data.txt (missing most collector numbers until it goes up on Gatherer). Updated tokens for CMA and E01.	2017-06-05 16:00:13 -05:00
LevelX2	b62a15f68e	Merge pull request #3454 from drmDev/add/welcomedeck2017 ... adding welcome deck 2017 (see #3453)	2017-06-03 10:31:49 +02:00
Anders Åstrand	4d0e8cb443	Review fixes	2017-05-30 18:55:40 +02:00
Derek Monturo	1d662a0a58	adding welcome deck 2017 - closes #3453	2017-05-30 07:31:14 -04:00
Anders Åstrand	ad0507e739	Ban ignored users from watching ... This commit bans ignored users from watching games where the creator has them on their ignore list.	2017-05-29 21:36:42 +02:00
LevelX2	bd9b11fc49	Fixed some problems with popup window not been hidden if another frame is shown.	2017-05-27 14:35:50 +02:00
spjspj	e752ee3156	EDH Power level fix	2017-05-20 15:45:40 +10:00
spjspj	3cb7424dfd	EDH Power updates	2017-05-16 23:14:33 +10:00
spjspj	f85c7e07ba	Emblems refactor to show emblems in Card/Token Viewer	2017-05-14 13:43:18 +10:00
spjspj	5514787871	Merge pull request #3350 from spjspj/master ... Allow sort by EDH Power level in Deck Editor	2017-05-11 17:54:23 +10:00
spjspj	347d08298f	Allow sort by EDH Power level in Deck Editor	2017-05-11 17:52:43 +10:00
LevelX2	ea439505ce	Some minor changes.	2017-05-09 17:02:30 +02:00
spjspj	0942db541f	Token refactor	2017-05-08 23:26:33 +10:00
spjspj	f909005bb1	Token refactor	2017-05-08 23:20:33 +10:00
spjspj	bec0964726	Token refactor	2017-05-08 21:53:01 +10:00
spjspj	a897b374a0	Token refactor	2017-05-07 20:57:57 +10:00
spjspj	ba6e8409d1	Token refactor	2017-05-07 11:46:52 +10:00
spjspj	e73e7d8600	Token refactor	2017-05-06 23:35:14 +10:00
spjspj	3f125db074	Merge pull request #3271 from spjspj/master ... spjspj - Remove Tokens from Card Viewer - need to reorg the tokens fi…	2017-04-30 11:15:54 +10:00
spjspj	0d0fccc105	spjspj - Remove Tokens from Card Viewer - need to reorg the tokens first.	2017-04-30 11:14:24 +10:00
LevelX2	3cc157bc2c	* Fixed null pointer exception problems in client.	2017-04-30 00:07:37 +02:00
spjspj	04f298923c	spjspj - Add in Tokens to the Card Viewer (fix)	2017-04-29 17:42:08 +10:00
spjspj	241691b153	spjspj - Add in Tokens to the Card Viewer (first version)	2017-04-29 17:25:54 +10:00
igoudt	05785f71b9	Make the implementations of CardImageSource an enum	2017-04-27 10:57:48 +02:00
igoudt	3f47d5a253	put inputstream in try body so it can be autoclosed	2017-04-27 10:57:48 +02:00
igoudt	0528555075	make DefaulActionCallback an enum and remove unused parameter	2017-04-27 10:57:48 +02:00
igoudt	ce26e5c8dd	make the combatmanager an enum	2017-04-27 10:57:48 +02:00
igoudt	5b21f34941	rewrote gettypetext, added removeIf to TableModel	2017-04-27 10:57:48 +02:00
igoudt	27aea04820	move methods from cardutil to magepermanent, cardview:getColorText now uses ObjectColor.getDescription	2017-04-27 10:57:48 +02:00
Derek M	c4330415c1	Merge pull request #3241 from drmDev/master ... Unit test confirming issue #3195 with Combat Celebrant	2017-04-25 22:09:14 -04:00
drmDev	04746c5f4f	Unit test confirming issue #3195 allowing Celebrant to attack while exerted	2017-04-25 22:07:51 -04:00
igoudt	c1ce821340	fix on playertype enum comparison	2017-04-26 00:37:06 +02:00
spjspj	4c85d89b64	Fix for the audio trigger of 'Player joined the table' not being fired.	2017-04-25 20:12:21 +10:00
spjspj	a4e7c2b407	Fix for the audio trigger of 'Player joined the table' not being fired.	2017-04-25 18:17:28 +10:00
spjspj	4ed9419cbf	Fill in missing str	2017-04-23 23:47:43 +10:00
spjspj	6ab4a94bd7	spjspj - Add in 'View Current Deck' option.	2017-04-23 13:06:09 +10:00
spjspj	8845d77628	spjspj - Remove View Limited Deck option	2017-04-22 19:35:08 +10:00
spjspj	0cd4e06e22	spjspj - Add a View Limited Deck option to allow you to see your deck during matches.	2017-04-22 19:16:12 +10:00
fireshoes	a86a1ebf5f	Added Iconic Masters to known-sets/mtg-sets-data.txt	2017-04-20 10:37:16 -05:00
spjspj	7ca5adff89	Merge pull request #3169 from spjspj/master ... Undo double tap of ok button (Leading to duplicate tournaments - Fixe…	2017-04-19 10:31:18 +10:00
spjspj	5373997b30	Undo double tap of ok button (Leading to duplicate tournaments - Fixes #3154)	2017-04-19 10:30:40 +10:00
fireshoes	2c9c4888cc	Added Commander 2017 to known sets.	2017-04-18 11:39:47 -05:00
spjspj	cdd010ffa2	spjspj - Add in saved configurations for New Match and New Tournament dialogs.	2017-04-18 01:52:04 +10:00
spjspj	1fcb7d2963	Revert	2017-04-17 20:00:56 +10:00
LevelX2	35791ac6b7	Set SocketWriteTimeout to 10 seconds.	2017-04-17 00:01:39 +02:00
LevelX2	ed341528d9	[AKH] Fixed that Aftermath card images were shown wrongly rotated.	2017-04-16 22:57:08 +02:00
Styxo	ee9613fa49	[AKH] Fixed wrong card names from MythicSpoiler download	2017-04-16 16:26:10 +02:00
LevelX2	e93218946c	[AKH] Fixed dwonload of Aftermath images from Mythicspoilers.	2017-04-16 14:07:21 +02:00
spjspj	7937bcda9e	Revert	2017-04-16 20:06:27 +10:00
LevelX2	bebb2a4de7	Fixed a problem that it was not possible to create tournaments with "Human" players ( related to #3083 ?).	2017-04-15 18:51:54 +02:00
Mark Langen	b1ed5c3632	Fixed deck editor Drag & Drop ... * Deck editor drag and drop was broken by the window borders change. Still not entirley sure what the root cause is (for some reason SwingUtilities.getDeepestComponentAt won't work correctly with the new setup), but this will fix it by expliticly specifying a deeper root component to start the search from (The MagePane that is active to be specific).	2017-04-14 17:07:52 -06:00
fireshoes	0c9ad1e8b2	[AKH] Added 4/13 spoilers to mtg.cards.data.txt. Added tokens to card-pictures-tok.txt. Minor text fix on Rhonas.	2017-04-13 10:10:59 -05:00
ingmargoudt	fea477dd04	fixed two lines to allow playing human-human tables	2017-04-11 07:54:54 +02:00
Mark Langen	c22a8f717e	Fix for problem introduced in 321f5597b7 ... * Fixes a problem introduced in the JInternalFrame -> JLayeredPane change where the AbilityPicker wouldn't show up.	2017-04-10 16:13:42 -06:00
Mark Langen	321f5597b7	Change main client window MagePanes from JInternalFrames to JLayeredPanes ... * This change's purpose is to get rid of the extra borders shown around the window border. These arise from using JInternalFrames in a JDestopPane and are impossible to remove in a forwards compatible way when using JInternalFrames. The solution it to move to have MagePane inherit from a plain old JLayeredPane instead of JInternalFrame. All of the MagePanes are always maximized anyways, so this doesn't lose any functionality.	2017-04-07 22:08:13 -06:00
ingmargoudt	1649530e7b	remove helper functions from cardUtil	2017-04-07 16:40:38 +02:00
ingmargoudt	314316f42f	moved inputstream for font to try clause	2017-04-07 15:19:11 +02:00
ingmargoudt	f519b12d0e	introduced isCreature/isLand/isArtifact/... etc for CardView	2017-04-07 15:08:28 +02:00
ingmargoudt	08197f192c	remove CardHelper class	2017-04-07 10:00:16 +02:00
ingmargoudt	d60e01d497	move CardHelper::getColor to CardView::getColorText	2017-04-06 22:11:57 +02:00
ingmargoudt	63df7f65a7	remove isCreature from CardHelper, move to Cardview	2017-04-06 22:07:59 +02:00
Mark Langen	047449f14e	* Correct type line rendering for split cards with different types on each half. ... * Correct art rendering for Aftermath, Split, and Fuse cards on the stack. Fused cards show as a single card with all the abilities / characteristics of both halves while on the stack.	2017-04-04 21:58:52 -06:00
Mark Langen	a2e8cedd02	Merge branch 'master' into akh-card-frame	2017-04-04 18:36:37 -06:00
Mark Langen	fd73fd39af	Addressed Feedback and added cards ... * Addressed feedback on Pull Request #3053 * Fixed a copy-paste bug in Destined // Lead * Added two new Aftermath Split cards that were revealed today	2017-04-04 17:07:59 -06:00
ingmargoudt	ff6d1541c3	clientcallbacks to enums	2017-04-04 21:52:15 +02:00
Mark Langen	18663f0a7a	Amonket Aftermath ability and card frame changes Completed ... * Aftermath Ability implementation complete (At least until we see comprehensive rules that contradict the way I assumed it will work) * Aftermath Card Frame rendering complete * Normal Split and Fuse Split card frame rendering complete * Amonket Split card CMC changes NOT made, but left for a separate commit	2017-04-04 00:29:54 -06:00
Mark Langen	a96a7f89f5	Work in progress changes for Amonket Aftermath ability. ... * Card Rendering has support for Aftermath Split card frames * Card Rendering has support for Split cards * Aftermath ability work in progress	2017-04-03 04:15:25 -06:00
ingmargoudt	211d433ea9	playertype, enum singleton	2017-04-02 22:09:20 +02:00
LevelX2	2446abcc98	* Some minor changes to sleep command.	2017-04-02 11:48:05 +02:00
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
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	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
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
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
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	8cf4acb68a	Some minor fixes.	2016-09-18 20:20:04 +10: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
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
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	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	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	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
Simown	dc10a52caf	Reverted changes to deck generation sliders	2016-05-23 12:31:56 +01: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
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
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	74b4e5941b	Fixed a spelling error in GUI Size text.	2016-02-21 23:21:21 +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	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	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	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	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	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	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
Simown	14148b25db	Fixed a bug in random generation where selecting a set which had no basic lands caused an error. Partially fixes #1242	2015-09-03 19:40:12 +01:00
fireshoes	cb01b0ee05	Implemented [BFZ] Omnath, Locus of Rage, [MRD] Dross Scorpion, and[SCG] Vengeful Dead. Changed some cards from using DiesCreatureTriggedAbility to DiesThisOrAnotherCreatureAbility.	2015-08-30 14:47:21 -05:00
fireshoes	9e1f67fa1a	[BFZ] Implemented Felidar Cub, Incubator Drone, Barrage Tyrant, Mist Intruder, Gideon's Reproach, Kozilek's Channeler, and Eldrazi Scion Token. [ONS] Implemented Airdrop Condor.	2015-08-30 02:52:11 -05:00
LevelX2	e32e7a4638	Added a fix for the serverlist URL setting to automatically switch xmage.info to xmage.de.	2015-08-29 09:42:17 +02:00
LevelX2	dfe1e2ef5a	Some minor changes.	2015-08-28 16:52:33 +02:00
LevelX2	b6c3355329	[BFZ] Added Devoid and Ingest keywords.	2015-08-28 16:51:37 +02:00
LevelX2	423e1fd368	* Triggered abilities order selection is applied immediately now.	2015-08-28 15:16:24 +02:00
LevelX2	39e62095e4	Fixed some dialogs for human players that were not shown after a reconnect to a game (e.g choose mulligan, any use Yes/No choice, amount choice, Pile choice).	2015-08-28 14:29:54 +02:00
LevelX2	758f56792e	* Added button popup menu to be able to automatically answer ability related "Yes" / "No" requests (related to #328).	2015-08-28 11:44:14 +02:00
LevelX2	b63cc121ef	Some minor changes.	2015-08-27 14:51:21 +02:00
LevelX2	97a8b351b4	Fixed a problem that show cards window was not closed (e.g. for libraray card selection).	2015-08-26 16:30:32 +02:00
LevelX2	0ee22d90ca	Allow hand card ordering by drag'n'drop only with left mouse button.	2015-08-26 16:29:57 +02:00
LevelX2	532d4e0af0	* Added automatic handling for order of triggered abilities going to stack (fixes #701 / related to #328).	2015-08-22 19:29:57 +02:00
LevelX2	386204c085	* Draft log - Fixed a bug that the last pick was logged twice.	2015-08-19 11:46:57 +02:00
LevelX2	e2625fd60e	* Show card pick dialog - Fixed a bug that the select window was hidden if you clicked and released the mouse button on the edges of the window.	2015-08-18 12:29:57 +02:00
fireshoes	1d86561dd3	Updated mtg-cards-data with 4 new BFZ cards and all DDP cards. Added DDP set and reprints. Implemented Retreat to Kazandu and Veteran Warleader for BFZ/DDP. Implemented Battle Squadron and Lithophage. Fixed Phage the Untouchable creature type.	2015-08-17 14:20:01 -05:00
Gerhardt Schulle	54c1e4f66c	Add option to log draft picks into a file for post review after the game.	2015-08-09 21:35:49 +02:00
LevelX2	7a90db7995	* Fixed sluggishness of player selection. Reworked flag display in avatar image.	2015-08-06 00:31:50 +02:00
LevelX2	cbbc70d26b	* Made table filter more accurate and moved Historical and Super Standard format to Other filter.	2015-08-05 00:07:53 +02:00
LevelX2	8dca887fad	* Added tooltip to the flag in the player avatar.	2015-08-02 12:41:29 +02:00
LevelX2	768fd17d93	* Some spelling changes.	2015-07-26 09:19:46 +02:00
fireshoes	5897f1595a	Implemented Glissa Sunseeker, Phyrexian Furnace, Flickering Ward, Cho-Manno's Blessing, Meng Huo Barbarian King, Sword of the Chosen, Pentarch Ward, Order of the Stars, Ancestral Mask, Jedit Ojanen of Efrava, Krosan Restorer, & Nature's Kiss. Added set Battle for Zendikar and spoiled Evolving Wilds.	2015-07-24 00:21:32 -05:00
Simown	a6bab84c85	Generated deck name/path is now a timestamp. ... Changed deck generator to use a timestamp of the current time to the millisecond as the generated deck name. This gets rid of the random UUID filling up the deck path and generated deck name.	2015-07-19 13:39:38 +01:00
Simown	cedf16806e	Fix to #1128 Deck generation throws IndexOutOfBoundsException. ... Reserve cards now counted correctly. Fixed reserve card adding algorithm to stop trying to add cards out of range.	2015-07-19 12:12:10 +01:00
LevelX2	635c33fa87	Merge pull request #1117 from brodee/master ... random draft bug fix and random draft ui improvements	2015-07-15 08:30:22 +02:00
brodee	c7a349f65f	random draft bug fix: ... packs are forced to be 15 cards; weirdness occurs if the packs are uneven sizes including the draft ending early. Random draft ui improvements: only the sets that will be used are displayed in the lobby, and the number of characters is large but still greatly reduced. the pack selector ui will prevent you from chosing fewer than 2 packs.	2015-07-14 22:34:58 -07:00
LevelX2	6cf0a59644	* Fixed possible null pointer exception in client.	2015-07-12 09:19:43 +02:00
LevelX2	b38885b7bf	* Fixed a bug that prevented that the width of connection column in user list was restored.	2015-07-09 09:59:20 +02:00
Simown	6a5eb8ff83	Small fixes to constants, added header and standardised spelling	2015-07-09 01:58:45 +01:00
LevelX2	b80e27f3b3	* Fixed handling of Phyrexian mana.	2015-07-09 01:43:26 +02:00
Simown	a1fd4e91f0	Overhaul and fix of random deck generation.	2015-07-08 23:13:21 +01:00
Nidhoegger	9be613beb9	Fixed Issue #1054. Buttons in Feedback panel will only get focused, if the MageFrame has the focus thus preventing focus theft from other programs.	2015-07-06 10:51:06 +02:00
LevelX2	d33f85d04a	Fixed wrong name for download of Kothophed, Soul Hoarder image.	2015-07-04 19:26:48 +02:00
LevelX2	1c157a20ae	* Fixed a bug caused by now possible column order setting in tournament panel.	2015-07-03 22:44:08 +02:00
LevelX2	0f5f8493c7	Improved fix for #584 by Nidhoegger.	2015-07-03 12:34:13 +02:00
LevelX2	589b63c5b1	Fix for the "Modal Window bug under Linux (e.g. X value announcement) by Nidhoegger.	2015-07-02 20:48:32 +02:00
LevelX2	3eb1fd4047	Added a button to attack with all available cratures.	2015-07-02 17:03:14 +02:00
LevelX2	0cbe590cac	* Fixed that mana auto-payment settings were not correctly set from previous settings on game start.	2015-07-02 13:18:12 +02:00
LevelX2	0a0cb40783	* Fixed that creatures that have to pay costs to block were wrongly forced to block causing UI locks.	2015-07-01 23:00:22 +02:00
LoneFox	ca0793a5c1	Fix systematic misspelling of "hover"	2015-06-30 21:28:32 +03:00
LevelX2	df3e6db569	Please test! Some changes to the display of user choices, showing also a longer text in tooltip window.	2015-06-28 21:55:48 +02:00
LevelX2	d24777cd15	Merge pull request #1062 from brodee/master ... random booster draft UI improvement	2015-06-28 18:37:27 +02:00
brodee	cd1352eb01	Switch to a separate window to chose the packs for random booster drafts.	2015-06-27 23:16:59 -07:00
LevelX2	87f3978589	Some changes to userData handling. Added country flag to some dialogs. Saved and restored some more table columns width and order information.	2015-06-28 00:10:38 +02:00
LevelX2	81934e32e3	* Revealing the top card of the library is now also shown by an extra window (no longer hiding life). Now Iconyfying and deiconifying does not change the postion of the reveal window. Iconifyed window width was a bit raised to be able to read more of the title in that state.	2015-06-25 01:07:34 +02:00
LoneFox	e139e4524f	Don't use a proprietary class. Fixes build on OpenJDK.	2015-06-24 19:31:15 +03:00
LevelX2	72408a7f52	Added card frame downloader.	2015-06-24 13:41:14 +02:00
LevelX2	ca9e52f99b	Merge pull request #1052 from brodee/master ... code review comments for chaos/random booster draft:	2015-06-24 06:56:45 +02:00
brodee	38235d9023	Update NewTournamentDialog.java ... removing commented code	2015-06-23 21:08:39 -07:00
brodee	4113976b7e	code review comments for chaos/random booster draft: ... 1. rename chaos booster draft to random booster draft 2. save packs selected in the user preferences 3. print "Random Boosters" in the player draft viewer during the draft	2015-06-23 21:04:59 -07:00
Brodee	ac0aa65aab	code review comments for chaos/random booster draft: ... 1. rename chaos booster draft to random booster draft 2. save packs selected in the user preferences 3. print "Random Boosters" in the player draft viewer during the draft	2015-06-23 20:59:05 -07:00
fireshoes	35d47229ea	Merge origin/master	2015-06-23 20:39:07 -05:00
fireshoes	0568f16788	Added 3 Premium Deck Series sets and all From the Vault sets, and added all existing cards for them.	2015-06-23 20:37:26 -05:00
LevelX2	0a3c081ded	Merge pull request #1048 from brodee/master ... Chaos booster draft implementation	2015-06-23 21:59:46 +02:00
LevelX2	2547753dcb	Added Sen Triplets (Alara Reborn = 100%).	2015-06-23 16:15:14 +02:00
LevelX2	5b02b5b32c	Exile, Reveal, Looked At windows of a game are hidden now as you switch to another pane (e.g. other game, tables, deck editor) and shown again as you switch back.	2015-06-23 16:14:11 +02:00
LevelX2	6b2bfc5e19	Merge origin/master	2015-06-23 08:36:28 +02:00
LevelX2	ba9d616a27	Fixed two old URLs.	2015-06-23 08:35:23 +02:00
brodee	e3b84eaab5	chaos booster draft implementation first check-in	2015-06-22 21:55:43 -07:00
fireshoes	cda11b280c	Merge origin/master	2015-06-22 18:47:51 -05:00
fireshoes	00569c4047	Added 12 Clash Pack promos, 5 judge promos, 2 upcoming FNM promos, renamed MerfolkToken to MerfolkWizardToken, added collector's number that were missing for ORI in mtg-cards-data.txt, added other various cards.	2015-06-22 18:46:01 -05:00
LevelX2	67e9ee1fa9	* Changed graveyard window handling to a window that can stay open.	2015-06-23 00:46:27 +02:00
LevelX2	87f919ecac	* Reworked handling of revealed and look at windows. Windows can stay open now and moved to a position and stay there.	2015-06-21 23:49:16 +02:00
LevelX2	cd0f273122	Fixed a bug that if a human player had to discard more cards than he had on hand, the game UI was blocked.	2015-06-15 17:35:48 +02:00
LevelX2	0b2e61081a	Fixed a problem with the country flag resource name causing null pointer exceptions and graphical problems on the client side.	2015-06-14 14:53:23 +02:00
LevelX2	060a468d4b	Update to release 1.4.1.	2015-06-14 02:43:16 +02:00
LevelX2	6420666668	Some fixes to player handling.	2015-06-14 02:42:56 +02:00
LevelX2	526a93df7e	Some fixes to user table.	2015-06-14 02:42:32 +02:00
LevelX2	adefaf890a	[ORI] Added 47 cards.	2015-06-13 21:52:54 +02:00
LevelX2	ce26bc8ed0	Added option to deactivate to ask th eplayer in which order cards go to gaveyard.	2015-06-13 12:27:50 +02:00
LevelX2	0f37d0fcd0	Added country name to tooltip of country icon in user list.	2015-06-13 11:30:25 +02:00
LevelX2	d28a956754	Merge origin/master	2015-06-13 00:33:58 +02:00
LevelX2	4f6d3f3a1a	* Password join value is now distinct from password you set of for a new table.	2015-06-12 08:12:38 +02:00
LoneFox	90486afdbb	If saving a thumbnail image fails, delete the resulting file. ... OpenJDK throws "javax.imageio.IIOException: Invalid argument to native writeImage", because it does not support transparency, and that results in zero-sized thumbnail files being created.	2015-06-11 09:17:05 +03:00
LoneFox	658daa65e3	Fix typo	2015-06-11 08:43:12 +03:00
LevelX2	132ded19f6	Show country flag icon in user table. Save and restore column width and order.	2015-06-11 00:11:40 +02:00
LevelX2	8ae9293c98	* Added user country flag. View of image in user list is still missing.	2015-06-10 17:52:18 +02:00
LevelX2	21e2066bba	* Akron Legionnaire - Fixed not correct working restrict ability.	2015-06-08 22:51:48 +02:00
LevelX2	9da44a547d	Added an option that player has to confirm if he passes priority with empty stack and has mana in his pool. Implements #707.	2015-06-07 22:37:12 +02:00
LevelX2	907ec7abb0	Added new option for mana payment handling of mana already in the mana pool. Reworked the battlefield context menu a bit.	2015-06-07 17:14:43 +02:00
LevelX2	8acf28eed1	* Added optional rollback current turn and up to 3 previous turns to the battlefield menu. All other players have to agree to the rollback to let it happen.	2015-06-07 00:53:08 +02:00
LevelX2	a50447c84d	* Setting of mana automatic payment option is saved and restored now so persistent between games (fixes #1002).	2015-06-05 00:05:40 +02:00
LevelX2	3b9cb1dc6e	Add land dialog is now also shown during free deck building. Added a set selection drop down box to select the set the lands are used from.	2015-06-04 19:37:54 +02:00
LevelX2	bafd27f5b3	Identifier are shown for Looked at and revealed cards view	2015-06-03 17:05:59 +02:00
LevelX2	022d8790fc	Saved skill filter setting of active tables list.	2015-06-03 00:11:15 +02:00
LevelX2	eb96b08dfa	Release 1.4.0v2	2015-05-25 23:33:41 +02:00
LevelX2	51397a93df	Added some checking for valid deck and game type combinations on match creation dialog.	2015-05-22 22:37:54 +02:00
LevelX2	ae89cef011	* Fixed a bug in table sort that could produce a cast error if tables are sorted by skill level.	2015-05-22 21:25:59 +02:00
LevelX2	ab79a6a308	* Changed some references from xmage.info to xmage.de.	2015-05-22 00:42:02 +02:00
LevelX2	bc61ef6fb8	* Update to version 1.4.0v0.	2015-05-13 01:05:12 +02:00
LevelX2	ed501cad21	* Some minor adjustements/changes.	2015-05-12 23:00:34 +02:00
LevelX2	28d46e2a95	* Added a simple identifier to tooltip and game log to be able to identify the exact target if multiple objects with the same name exist.	2015-05-12 17:30:14 +02:00
LevelX2	69b381779b	* Added a simple skill level to set and filter for tables.	2015-05-12 15:10:24 +02:00
LevelX2	15efe14fd5	* Fixed human players controlling other human players turn (e.g. by Mindsliver).	2015-05-12 01:10:56 +02:00
LevelX2	be11d287dc	[MM2] Added new download source mythicspoiler.com.	2015-05-11 22:06:38 +02:00
LevelX2	5c018b15af	Changed Modern Masters 2015 short designation to MM2.	2015-05-10 11:26:35 +02:00
LevelX2	7e9340dee7	Fixed that action column was not handled correctly after client restart if user changed their position in column order.	2015-05-10 10:54:54 +02:00
LevelX2	9c97953b6b	Added some font color to object and player names output to game logging and feedback area.	2015-05-09 21:18:00 +02:00
LevelX2	951198a578	Added some more handling for missing images.	2015-05-07 23:54:28 +02:00
LevelX2	4cf21739c4	* Saved position and size of choice window during a game session.	2015-05-06 16:58:14 +02:00
Nathaniel Brandes	2f476b7c53	Cleanup sets. ... This is an extensive renaming of sets to their correct names. "Duel Decks" and "Not Standard Legal" have been merged into a "Supplemental" set type. MTGO-only sets have been put into their own set type, just like magiccards.info. Supplemental sets now have a "block" which is the block that they have under magiccards.info, for easier organization. The deck builder on the client now relies on an autogenerated list instead of a hardcoded one.	2015-05-03 20:07:13 -07:00
LevelX2	9e8157827a	* Fixed that face down exiled cards were revealed in player specific exile view window.	2015-05-02 12:19:09 +02:00
LevelX2	efb02f633c	Fixed handling of default columns width.	2015-04-27 23:13:00 +02:00
emerald000	ffaffa39f8	Fixed NPE in the Tables panel.	2015-04-27 16:52:10 -04:00
LevelX2	0adeb0770f	Added limited as format to the active table filter.	2015-04-26 21:45:24 +02:00
LevelX2	e662111ddd	Added save/restore of active table columns order.	2015-04-26 21:31:27 +02:00
Nathaniel Brandes	e53079c36c	Fix some gatherer image loading.	2015-04-26 04:13:20 -07:00
LevelX2	987a62448e	Added save/restore of column width of active tables.	2015-04-26 10:31:24 +02:00
LevelX2	b846d0c411	Some minor changes to active table handling.	2015-04-25 16:37:08 +02:00
LevelX2	8add25f74f	Finished table selection updates.	2015-04-25 13:06:50 +02:00
LevelX2	a3dba9b1d0	Added some error handling client startup.	2015-04-25 11:07:01 +02:00
LevelX2	b096379881	Update to table filtering.	2015-04-25 02:20:54 +02:00
LevelX2	26b88d3b48	Update table selection.	2015-04-24 16:34:50 +02:00
LevelX2	c285fc6c4d	Started adding a simple filter to list of open tables.	2015-04-23 17:51:05 +02:00
LevelX2	2157c63160	State if table with completed games is shown is saved in java prefs now.	2015-04-23 16:19:24 +02:00
LevelX2	55322b4015	Added Masters Edition Sets I - IV.	2015-04-23 15:44:01 +02:00
LevelX2	49e89a9a19	Fixed a problem with downloading cards with AE in name from Gatherer.	2015-04-23 15:42:34 +02:00
LevelX2	d245ce1ad2	* Fixed that card name text was covered by next card beneath if cards are displayed close together (library search).	2015-04-16 16:29:54 +02:00
LevelX2	e556dcea51	* Trail of Mystery - Made basic land selection optional.	2015-04-15 17:18:14 +02:00
LevelX2	809bf663df	* Fixed land image downloading from gatherer and handling of Anthology Duel Decks.	2015-04-12 10:37:16 +02:00
LevelX2	bfa82a9c3f	Added the handling of paged visual lists for image download from Gatherer.	2015-04-10 15:13:25 +02:00
LevelX2	c65adebc57	Fixed that to allow watchers of a game to see the hand cards of players did not work correctly.	2015-04-10 12:36:22 +02:00
LevelX2	8f65053edb	Merge origin/master	2015-04-10 00:40:04 +02:00
LevelX2	d3dba58358	* Fixed that continuous effects of copied cards with limited duration stop to work as the copied card stops to exist.	2015-04-10 00:39:06 +02:00
fireshoes	adfc4711d2	[TPR] Removed from the image url ignore list.	2015-04-09 17:21:29 -05:00
LevelX2	7292a1625c	[TPR] Added Dracoplasm.	2015-04-09 18:09:05 +02:00
LevelX2	5c2189fdd7	Added Exception to read of server list that shows local buffered list.	2015-04-05 09:43:45 +02:00
LevelX2	2723bf6cb7	* Fixed some problems with order selection of triggered abilities not showing the card images.	2015-04-04 14:11:49 +02:00
fireshoes	2b2db2df6c	Added set Tempest Remastered and reprints. Added Pit Trap. Updated latest Game Day, FNM, Buy-a-box, WMCQ, and Release promos.	2015-03-30 22:17:43 -05:00
LevelX2	45aa5f675c	* Update Gatherer Downloader.	2015-03-29 03:48:55 +02:00
fireshoes	4f63793578	Submitted Skeleton Shard (Planechase) and Wall of Deceit (Jace vs Chandra)	2015-03-28 09:30:28 -05:00
LevelX2	740611119b	* Mikaeus, the Unhallowed - Fixed that the given undying ability did not trigger.	2015-03-22 19:47:46 +01:00
fireshoes	227052f108	Removed DTK from the ignore list in image.url.properties. [Homelands] Added Cemetery Gate	2015-03-18 11:33:11 -05:00
LevelX2	2198a01781	Changed font for feedback area from "times" to logical java font "Dialog".	2015-03-18 10:07:03 +01:00
betasteward	9ad8530dee	moved faceDown property from Card to CardState	2015-03-12 22:09:12 -04:00
fireshoes	8256344871	[DTK] Updated mtg-cards-data.txt for basic lands. Updated DTK tokens.	2015-03-12 11:22:55 -05:00
LevelX2	8afc1e24bb	* Added missing Centaur token reference, get cantaur token by random.	2015-03-12 16:55:12 +01:00
LevelX2	e29eea791c	* Fixed null pointer exception for tooltip and triggered abilities (made a kind of workaround and it's still unclear to me what caused this problems).	2015-03-12 16:54:30 +01:00
LevelX2	68255ac316	Removed http://mtgimage.com/ from image download sources.	2015-03-11 17:11:30 +01:00
fireshoes	977645f88f	Fixed minor spelling errors	2015-03-06 17:25:17 -06:00
fireshoes	392631953d	[DTK] Updated mtg-cards-data.txt. Added Epic Confrontation. [ORI] Added set Magic Origins. [MMB] Added set Modern Masters 2015 and Karn/Emrakul/Goyf reprints.	2015-03-06 17:18:39 -06:00
LevelX2	68efd82ee8	* Storm counter - Moved the counter to hot key area to prevent area movement for small screen resolutions. Added an option in preferences to switch counter on/off.	2015-03-05 18:03:43 +01:00
fireshoes	db379f6ff5	Added set Prerelease Events foralready implemented pre-release promos. Added latest Game Day and Launch promos.	2015-03-04 21:44:58 -06:00
fireshoes	2eb372909d	Updated mtg-cards-data.txt with 3/2 DTK spoilers, added DTK Djinn Monk token to card-pictures-tok.txt	2015-03-02 13:29:56 -06:00
fireshoes	97a1c2228f	Added Dragons of Tarkir set	2015-03-01 20:29:34 -06:00
LevelX2	6bd17716cd	Some minor changes.	2015-02-27 18:09:49 +01:00
LevelX2	fa59699769	Made the storm counter more visible.	2015-02-27 01:08:08 +01:00
LevelX2	79e9312893	* Fixed the annoying SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" on client start. Updated a lot of POM references. Fixed warnings of Test Project. Some changes to logging.	2015-02-20 13:58:13 +01:00
LevelX2	d8e1a843c6	* Tidehollow Sculler - Fixed that the exiled card did not return opponents hand.	2015-02-16 20:46:23 +01:00
LevelX2	0cda1f7731	* Fixed spelling error for Fire // Ice card of Holiday Cube 2014.	2015-02-08 09:54:23 +01:00
LevelX2	ea8446d097	* Added some error handling for connect to server action.	2015-02-07 18:15:11 +01:00
LevelX2	4e56e584b6	* Fixed that PriorityTimer was not canceled. Added gaeId to Timer name.	2015-02-05 22:43:51 +01:00
LevelX2	0f61f5269d	* Fixed storm counter (removed +99 amount and showing only figues > 0).	2015-02-04 17:31:21 +01:00
LevelX2	41c6c47092	* Added promotional, Duel Deck and Non-standard-legal sets to SetType. Changed sets and set selection accordingly.	2015-02-04 00:34:18 +01:00
LevelX2	91fe62b396	Added a little spell cast during current turn counter (Storm) below the phase panel.	2015-02-03 17:31:40 +01:00
fireshoes	e97dd1299f	Added WPN Gateway set and reprints, Sol Grail, Spike Rogue, Quirion Elves, Krosan Wayfarer, Crookclaw Transmuter, and Centaur Glade	2015-02-03 00:46:33 -06:00
Kranken	f8dd3a1491	Fixed a bug when showing and hiding drafted cards ... This commit fixes the following bug: 1) Draft a couple of cards in draft mode 2) Hide a card 3) Show all cards 4) Hide another card Here both cards got hidden, this commit makes sure only the card in 4) gets hidden	2015-02-01 16:45:05 +01:00
LevelX2	8d6c25b3e8	* Fixed handling of morphed cards in exile zone.	2015-01-31 12:45:54 +01:00
LevelX2	6ef8b4f976	* Reworked DB comparison between client and server.	2015-01-25 19:21:50 +01:00
LevelX2	3d55659568	* Fixed that permanets attached to non permanents (Enchant player and no curse / enchant card in graveyard) are shown wrongly attached to the first other permanent on the battlefield (fixes #632).	2015-01-24 23:21:00 +01:00
LevelX2	001e17a73e	* Fixed handling of enlarged view for manifested and morphed cards.	2015-01-24 19:43:53 +01:00
LevelX2	fbf049ea2e	Allow FRF image download.	2015-01-16 00:57:03 +01:00
fireshoes	89a991156d	Updated some Media Inserts set information and added some reprints	2015-01-13 02:28:56 -06:00
LevelX2	f2a9a75e8f	* Client cards db will be compressed nos as you close XMage client.	2014-12-31 15:57:18 +01:00
LevelX2	64176c1fa6	* Fixed possible null pointer exception for add land dialog.	2014-12-29 15:06:56 +01:00
LevelX2	dda73f304e	* Fixed possible null pointer exception for add land dialog.	2014-12-29 15:05:01 +01:00
LevelX2	d4ad6cf6a6	* Added some more set aliases.	2014-12-27 17:35:46 +01:00
LevelX2	c4ad51c4af	* Tournament password - Fixed that the dialog to enter the password was not opened.	2014-12-27 03:52:07 +01:00
LevelX2	7d30d288be	* Chnages to text of priority prompt.	2014-12-26 23:00:02 +01:00
LevelX2	071a611f91	* Added phase step name to the priority prompt text.	2014-12-25 02:08:24 +01:00
LevelX2	9ff1f60903	* Added card name and set abbr. to error message if download failed.	2014-12-25 02:00:58 +01:00
fireshoes	f3707e1f53	Added Grand Prix, Launch Party, and WMCQ promos	2014-12-24 02:41:45 -06:00
fireshoes	8d0e277dbb	Added Judge Promos	2014-12-23 22:08:13 -06:00
fireshoes	c93c5c3011	Added Game Day promos	2014-12-23 14:52:09 -06:00
fireshoes	a8b20f23d5	Added Friday Night Magic promos	2014-12-23 06:49:01 -06:00
fireshoes	086f860396	Added Fate Reforged set, Valorous Stance FRF card, KTK Block Constructed option, added missing card to Holiday 2014 Cube	2014-12-21 19:57:23 -06:00
fireshoes	9ea54b38c2	Merge origin/master	2014-12-20 04:47:33 -06:00
fireshoes	bf29352ba6	Added Fate Reforged set and Pride of the Clouds card	2014-12-16 14:07:59 -06:00
LevelX2	424448b38f	* Handling of resource images fixed.	2014-12-14 22:54:58 +01:00
LevelX2	213275de5a	Some changes to play of audio clips.	2014-12-12 18:16:23 +01:00
LevelX2	1ed1bc2e0d	* Added a color indication in the tooltip window.	2014-12-12 11:34:34 +01:00
LevelX2	44c797f88e	Added 4 missing duel sets and the already implemented cards. Some changes to logging of download. Some fixes to token download configuration.	2014-12-11 12:46:06 +01:00
LevelX2	30869beca0	* Some changes to game start logic (better handling for disconnected users). Changes to server logging.	2014-12-08 01:30:18 +01:00
LevelX2	cee5d0d487	* Added sound for starting game.	2014-12-05 20:13:48 +01:00
LevelX2	07b509684a	* Fixed some handling problems with face down creatures (Ixidron).	2014-11-28 17:38:53 +01:00
LevelX2	4262850553	Modified logic that decides when the popup window will be enlarged.	2014-11-28 09:13:28 +01:00
LevelX2	4ae5ac129d	Some tweaking to the size of the card popup window.	2014-11-27 15:20:45 +01:00
LevelX2	eca6042257	[C14] Added some colorless cards. + Ruhan of the Fomori.	2014-11-27 15:20:08 +01:00
LevelX2	1cdf2ab4b0	[C14] Added two planeswalker and 10 black cards.	2014-11-27 00:56:35 +01:00
LevelX2	67479bb5a4	* Fixed wrong timer handling while other player controlled a player's turn. Attackers now marked with blue frame. Playable cards have a violet frame. If a player has to select cards from hand, the possible cards are marked yellow now. Discard of multiple cards now marks already selected cards and happens in one selection.	2014-11-26 01:48:00 +01:00
LevelX2	7e145d2cfd	* Added possibility to allow other players to see hand cards of player.	2014-11-24 23:03:21 +01:00
LevelX2	c22b54d262	*Draft - Non hidden picked cards go to the deck. Hidden cards to sideboard.	2014-11-23 18:43:31 +01:00
LevelX2	fb2d367992	* Phasing- Fixed that permanets with phasing did not phase out at controllers untap step and phased out permanents where count as on the battlefield.	2014-11-23 13:00:58 +01:00
LevelX2	bf3fa37e5d	* Draft - Added possibility to hide (and show again) cards from the picked cards area.	2014-11-22 18:19:59 +01:00
LevelX2	6d23ab616d	* Server list - Added pref configuration for server list URL. Server list will now be saved to client dir and used if configured URL is not reachable.	2014-11-21 15:42:13 +01:00
LevelX2	2e68f6c692	* Draft - Fixed that first draft direction is shown as left, second as right and third again to left.	2014-11-19 15:12:17 +01:00
LevelX2	2b5c95b6a7	Added some Odyssey cards, added Archenemy Set, added some Squirel cards.	2014-11-16 11:07:31 +01:00
LevelX2	a2484cc6d9	Added F10 to skip priority while the stack resolves.	2014-11-16 08:59:59 +01:00
LevelX2	108faf4c8c	* Commander 2014 - Added set and already implemented cards.	2014-11-09 11:07:53 +01:00
LevelX2	ef75597fa2	* Fixed includes.	2014-11-08 02:13:23 +01:00
LevelX2	a835c19533	Changed handling of tooltip size calculation.	2014-11-06 23:13:34 +01:00
LevelX2	220331dcd9	* Animate Dead (finished). Only Battlefield layout can't handle a attached card in graveyard yet.	2014-11-06 15:34:18 +01:00
LevelX2	e747326028	Added logger message to card DB exception.	2014-11-03 17:21:57 +01:00
LevelX2	999528e633	Added audio waning 1 minute before timeout for constructing or sideboarding deck.	2014-11-03 07:59:58 +01:00
LevelX2	532345e28a	* Darft - Play countdown sound during drafting only if no card from curretn booster was draft.	2014-11-02 12:12:39 +01:00
LevelX2	8426816b09	* Some changes to table and match view.	2014-11-01 14:24:23 +01:00
LevelX2	18d71a9377	* Added display of player order to the draft panel. Added tray info for next card to pick if the XMage window is not active.	2014-11-01 01:59:33 +01:00
LevelX2	2a2c593dd8	* Fixed a bug that changing player type started unwanted cascading change loop that needed longer time to resolve.	2014-11-01 01:57:26 +01:00
LevelX2	1396760d5e	* Fixed a problem that prevented cards from beeing marked as choosable in select card panel after the changes made for displaying resized counters.	2014-10-31 18:34:41 +01:00
LevelX2	e6c7fa5f96	* Draft - Added possibility to mark a card to draft on timeout. Added sounds to draft. Changed compression of some sound files.	2014-10-31 16:22:10 +01:00
LevelX2	c3adb1337b	* Game layout fix to prevent unneccessary area movement.	2014-10-31 10:36:41 +01:00
LevelX2	2ac1340af7	* Some changes to version handling. Added display of server version (incl. minor server version) in client window titel.	2014-10-31 10:35:53 +01:00
LevelX2	b158ef4f3c	* Added acustic an optical signals for use of skip buttons.	2014-10-30 23:43:32 +01:00
LevelX2	df71237f46	* Added logic to auto select replacement effects. Some changes to counter size and font size handling.	2014-10-30 20:40:23 +01:00
LevelX2	ab9c0ae893	* Create tournament dialog - Set min number of swiss rounds in relation to number of players.	2014-10-29 17:20:10 +01:00
LevelX2	791cc828c4	Fixed tournament panel color setting.	2014-10-25 16:01:44 +02:00
LevelX2	2cc129daa6	Changed ChatPanel transparency setting.	2014-10-25 16:00:56 +02:00
LevelX2	ac4c7048c0	[BOK] Added 3 cards.	2014-10-22 19:57:48 +02:00
LevelX2	c3c0d047b1	* Some minor changes to pom files.	2014-10-22 11:55:19 +02:00
LevelX2	2fae1df8c7	* Reverted chat focus handling change.	2014-10-20 00:50:52 +02:00
LevelX2	58bbe60c72	Merge origin/master	2014-10-18 23:04:15 +02:00
LevelX2	b9285c0118	* Fixed wrong imports.	2014-10-18 23:03:36 +02:00
betasteward	55d2233f2e	Merge branch 'master' of https://github.com/magefree/mage	2014-10-18 14:11:13 -04:00
LevelX2	0ecb04d8d2	* Minor change to user info.	2014-10-18 18:23:05 +02:00
LevelX2	2bd14269d6	* Finished button handling above stack.	2014-10-18 12:15:40 +02:00
LevelX2	26e1e5daa5	Moved button panel from third split panel above stack area (functional but not finished yet).	2014-10-17 17:23:43 +02:00
betasteward	9e28fa9b0c	fix to allow Launcher to start client - also slightly improves performance	2014-10-14 13:58:52 -04:00
LevelX2	fd3b8f4c29	* F4/F5/F7 can also be used now without having priority.	2014-10-14 15:29:21 +02:00
LevelX2	bdd163080d	* Draft - Show draft time and draft progress. Show game threads and ma games. Fixed a problem with AI player and password.	2014-10-12 22:37:39 +02:00
LevelX2	499b548a14	* Some changes to chat handling to fix unintended empty line.	2014-10-12 18:56:37 +02:00
LevelX2	b206983e75	* Fixed that deck elements visible state of JoinTablePanel was set wrongly.	2014-10-12 12:34:29 +02:00
LevelX2	5ccc1c91ae	* Tournaments - Added handling for constructed formats and password protection.	2014-10-12 04:19:28 +02:00
LevelX2	8f690f7e02	* Added option to start matches with password protection.	2014-10-11 16:29:37 +02:00
LevelX2	e424635d20	* Fixed typo in info message.	2014-10-11 10:19:26 +02:00
LevelX2	05ba67a9c9	Added player life to tooltip of small player name label (if no avatar images is shown). So life can be shown (at least with tooltip) if the top card of library is turned face up.	2014-10-06 14:34:26 +02:00
LevelX2	7f46323f67	* Added F7 to skip until next main phase. Added some preference options to skip handling. Clicking on phase bar opens now phase bar preferences.	2014-10-05 14:33:47 +02:00
LevelX2	af4fa9d542	* Fixed that watching tournament could not be started.	2014-10-05 00:39:52 +02:00
LevelX2	140ffb256a	* Fixed Standard Format selection. Client used fixed date. Check on deck validator used wrong month (1.11 insted of 1.10).	2014-10-02 16:59:25 +02:00
magenoxx	922e35ff1c	Fixed NPE in tooltips for Emblem choose-trigger	2014-10-02 12:17:25 +04:00
LevelX2	8ac8d36c03	* Some connection handling changes.	2014-10-02 01:14:32 +02:00
LevelX2	e0ffef40cc	Added possibility to set some more JBoss Remoting parameters with config.xml on server start.	2014-10-01 16:04:26 +02:00
LevelX2	e765e3a0b9	* Fixed show card name preferences handling that prevented to switch off card names.	2014-09-29 20:00:40 +02:00
LevelX2	2835a4e152	Some fixes to reconnect handling.	2014-09-28 15:45:15 +02:00
LevelX2	d2f7063e25	Fixed that tooltip popup window was not shown if additional card name was deactivated.	2014-09-27 19:59:16 +02:00
LevelX2	4f5c8fc45d	Removed some debug messages.	2014-09-27 19:58:22 +02:00
LevelX2	0a068e2258	* Fixed chat command handling (\list), the user chat input is now escaped to prevent using html tags.	2014-09-26 19:42:58 +02:00
LevelX2	54ec3b658e	* Added preferences setting to switch on/off to write card names in bigger font on card panels.	2014-09-26 19:40:57 +02:00
LevelX2	02ca83324c	* Client - Don't load games again if not neccessary if "Games" menu item is clicked.	2014-09-26 13:44:57 +02:00
LevelX2	2c63d3bff8	* Client connect - Fixed that reconnect request was also shown if no successful connection was set up before.	2014-09-25 23:13:05 +02:00
LevelX2	341db7b01f	* Morph Ability - Some fixes for displaying / handling morph cards/permanents.	2014-09-25 16:51:41 +02:00
LevelX2	f3ea64e27c	* Changed handling of phases to stop to server based handling.	2014-09-25 00:33:58 +02:00
LevelX2	aa842efacc	Added F5 button to skip priority until end step of opponent. Added PlayerAction handling.	2014-09-24 16:55:51 +02:00
LevelX2	ebd21eab1d	Fixed a problem that manual mana payment was sometimes hard because the mana labels covered the mana buttons.	2014-09-24 16:54:33 +02:00
LevelX2	cc713808cf	* Download definition for M15 + CNS token and emblem images.	2014-09-22 23:31:26 +02:00
LevelX2	da0100d3fd	Increased window size of pick choice dialog.	2014-09-20 17:45:23 +02:00
LevelX2	a57ebc5314	* Table handling - Fixed a bug that if table owner tried to create a table with invalid deck, the table was added to the finished tables with no players.	2014-09-19 13:37:59 +02:00
LevelX2	ffa959d536	Removed KTK image download stop.	2014-09-18 23:39:48 +02:00
LevelX2	c3fba626a2	Some changes to Morph card image display.	2014-09-16 07:53:00 +02:00
LevelX2	bc5dc80f95	* Chat panel - Fixed that the text of the chat panel was changable by the user.	2014-09-13 21:06:28 +02:00
LevelX2	5578e4c158	Added names to AboutDialog.	2014-09-13 11:21:54 +02:00
LevelX2	b2fc6923b9	Some changes to format of messages.	2014-09-10 22:37:35 +02:00
LevelX2	19124de0bd	Some changes to format of messages.	2014-09-10 22:37:13 +02:00
LevelX2	27f658f250	Changed format of some messages to html.	2014-09-10 17:51:46 +02:00
LevelX2	e8f9c0822f	* Chat / game log - Switched to html output. So mana symbols and html tags are correctly shown. Colors have to be adjusted still a bit.	2014-09-10 17:13:26 +02:00
LevelX2	382223bb90	* Deck Editor - Show images for amna symbols.	2014-09-10 17:11:06 +02:00
LevelX2	9c1f69983b	Fixed a problem with NPE and match start. Chanes to handling of logging.	2014-09-09 07:45:53 +02:00
LevelX2	da44199b3d	Fixed possible npe in debug info generation.	2014-09-07 15:44:21 +02:00
LevelX2	c3c77e3974	* Server - Some changes to user / match / table handling.	2014-09-07 02:28:47 +02:00
LevelX2	d051aef63f	Fixed a bug of handling of tournament sub tables if a user left. Some changes to match view.	2014-09-04 19:03:48 +02:00
LevelX2	8b331eefce	* Fixed a bug in table expired check. Changed expired check. Some fixed for table / tournament state handling.	2014-09-03 15:38:45 +02:00
LevelX2	fec0744315	Fixed a bug that while a match or tournament was just starting a player could still leave the table, setting the table / tournament / match to an undefined state. Now the player can only leave the Match / Tournament if it has started properly.	2014-09-03 01:02:10 +02:00
LevelX2	cb835f4f9b	[KTK] Added Kahns of Tarkir set.	2014-09-01 19:25:32 +02:00
LevelX2	b98c16f061	Added connection speed information per user (milliseconds the ping needs). Some minor changes to server console.	2014-08-31 17:46:14 +02:00
magenoxx	92479c0ba0	[UI] sorting layout if counters on a permanent were changed	2014-08-29 13:33:23 +04:00
LevelX2	ee5831bdc9	* Moved workaround for #451 to first possible position main of client.	2014-08-28 01:30:04 +02:00
magenoxx	d516137a5b	[UI] Putting lands with counters separately (without using land stack)	2014-08-27 13:49:10 +04:00
LevelX2	a2fe968582	Adjusting font position and size of counter amount.	2014-08-27 08:45:03 +02:00
LevelX2	dce2b027ee	Updated HelperPanel button handling, try to fix #451.	2014-08-24 18:43:43 +02:00
LevelX2	aad1a2da89	* Client - Added number of active games to the header of the games column of the user list.	2014-08-24 07:03:01 +02:00
LevelX2	19de064710	Merge truevfs branch ... Conflicts: Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java	2014-08-22 12:23:43 +02:00
LevelX2	3757a4a6c9	Merge truevfs branch ... Conflicts: Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java	2014-08-22 12:23:24 +02:00
LevelX2	4990bdc9c9	Counter display - don't display counters if 0 amount.	2014-08-22 08:22:52 +02:00
LevelX2	d9a1cc1334	Added display of counters on card panel (needs probably some more fine adjusting and testing).	2014-08-22 02:38:10 +02:00
LevelX2	05f1a88157	Added image for displaying counter.	2014-08-21 17:06:38 +02:00
North	15d10f5797	upgraded truezip to truevfs	2014-08-21 16:05:55 +03:00
magenoxx	3454b2db8a	For Issue#524: added connect task timeout, reduced number of auto connection retries to one	2014-08-20 08:25:30 +04:00
LevelX2	175280b381	Setting java.util.Arrays.useLegacyMergeSort=true in client main to avoid Comparison method violates its general contract of swing class. (Fixes #451).	2014-08-14 11:49:46 +02:00
LevelX2	357e80c7c2	Prevent NPE after disconnect for open tournament panel.	2014-08-13 22:01:06 +02:00
LevelX2	9020a287d6	Some NPE fixing for server and client.	2014-08-12 08:51:06 +02:00
magenoxx	97ca70318b	minor change	2014-08-11 15:29:04 +04:00
magenoxx	26d763611a	[UI] Fixes #481 : removed gap and moved cards up so scrollbar doesn't hide part of the hand cards	2014-08-11 15:24:03 +04:00
magenoxx	5f040b218a	Fixed #467 : changing attacker color to red	2014-08-11 14:55:32 +04:00
magenoxx	eb6dc10faa	[UI] Param for starting in fullscreen mode (osx only)	2014-08-11 14:39:58 +04:00
magenoxx	0e2255f71f	Fixes Issue#467 : marking possible attackers with blue instead of yellow	2014-08-11 14:18:32 +04:00
magenoxx	13d80e72f1	Fixes #492 : Tarmogoyf p/t stats now also displayed in grave&exile zones	2014-08-11 13:55:07 +04:00
magenoxx	58e4c66af6	Fixes #492 : Tarmogoyf p/t stats are not displayed in hand	2014-08-11 11:10:27 +04:00
magenoxx	d1a8678086	[UI] Capitalize first leffer of abilities in ability (mode) picker	2014-08-09 10:41:17 +04:00
magenoxx	7adf282ff5	[UI] Fixed question dialogs always appearing on root virtual table instead of current one (linux&macos)	2014-08-07 15:38:05 +04:00
magenoxx	53453243dc	[UI] Exile dialog	2014-08-07 15:30:44 +04:00
magenoxx	14d899ea79	[UI] Fixed only lands with two enchant lands were put aside	2014-08-07 09:07:08 +04:00
magenoxx	15dc313ffb	[UI] Made land cards in stack close to each other	2014-08-07 08:46:07 +04:00
magenoxx	fbf3554051	[UI] Removing black borders for cards with images as it gives more space	2014-08-06 10:27:36 +04:00
magenoxx	9f76582bff	Issue#479: increased attachments offset	2014-08-06 10:26:59 +04:00
LevelX2	3aab091492	Some changes to client and server logging messages.	2014-08-04 17:21:14 +02:00
LevelX2	9f6555240a	* Changes to logging.	2014-08-03 15:01:33 +02:00
magenoxx	95843f6fa3	[UI] Fixed Issue#470: equipped wasn't positioned correctly if equipped creature was returned to owner's hand	2014-08-01 14:04:33 +04:00
magenoxx	bd56decfd3	Fixed Issue#470: curses not displayed correctly on the battlefield	2014-08-01 13:45:41 +04:00
LevelX2	69ce53e6e8	* New Tournament dialog - Changed look of player 1 name field.	2014-07-30 20:38:15 +02:00
LevelX2	865665767b	* Client - After reconnect still active game or deck editor of build step gets topmost panel again (because tablesPanel is loaded automatically now after connect to server).	2014-07-30 17:30:02 +02:00
LevelX2	ecc6295638	Added sound if player leaves table. Changed some sounds.	2014-07-26 14:59:42 +02:00
LevelX2	e25a60b312	* Changed table maneger to remove chat sessions that were never removed. Minor formattings.	2014-07-25 15:54:51 +02:00
magenoxx	b52e526c0f	Fixed Issue#454: offset for enchanted permanents	2014-07-24 12:18:20 +04:00
LevelX2	3a62115c3a	Added icon for triggered and activated abilities on the stack to better distinct it from casting a card.	2014-07-23 17:23:49 +02:00
LevelX2	4a3a5ff7d1	* TablesPanel - Fixed that restoring of divider positions did not work properly (update).	2014-07-23 17:21:51 +02:00
LevelX2	84f67f1fcd	* TablesPanel - Fixed that restoring of divider positions did not work properly.	2014-07-23 12:07:42 +02:00
LevelX2	59142feb41	* Client - The table panel is loaded automatically as getting connected to a server.	2014-07-22 17:28:27 +02:00
magenoxx	65a0c9fc79	[UI] Displaying creatures that can attack	2014-07-18 16:05:21 +04:00
magenoxx	e949918da9	[UI] Fixed Issue#464: Play card interaction with set hand order	2014-07-18 12:07:08 +04:00
LevelX2	ee44e41da0	* Added Starter 1999 + 2000 sets + known and simple cards.	2014-07-16 16:36:57 +02:00
magenoxx	60d04e2614	[UI] Showing choosable cards in dialog - Issue#456	2014-07-15 16:31:41 +04:00
magenoxx	118196c8c3	[UI] CardPanel code clean up	2014-07-15 15:12:51 +04:00
LevelX2	0d31e319c5	* Card download - Fixed a bug that prevented to download some cards with blanks in names from MtgImageSource.	2014-07-15 01:09:20 +02:00
magenoxx	5dc2a1b8f5	[UI] removing y offset effect because of no rely on mouse message existing/order	2014-07-14 18:11:48 +04:00
magenoxx	b368e3661c	[UI] Fix for NPE on battlefield cards	2014-07-14 13:49:23 +04:00
magenoxx	6cdef93426	[UI] Added minor y offset effect on d'n'd	2014-07-14 13:41:59 +04:00
magenoxx	43a31f6d98	[UI] Fixed wrong card position on d'n'd with small moves	2014-07-14 13:30:02 +04:00
magenoxx	b6e0544c95	[UI] Fixed stack cards offset	2014-07-14 13:29:32 +04:00
magenoxx	8ca8d80a5c	[UI] Fixed Issue#454: Enchanted land position is not correct on the layout	2014-07-12 11:20:01 +04:00
magenoxx	bcb91dade1	[UI] Fixed popup location	2014-07-11 21:52:24 +04:00
magenoxx	5fcc3b1ba8	[UI] Displaying playable cards in hand	2014-07-11 19:35:01 +04:00
magenoxx	2b76bbf2c6	Fixed Issue#438: Enchanted permanent can't be clicked because out of sight	2014-07-11 14:40:37 +04:00
magenoxx	045a81e66a	Fixed Issue#396: Display of stacking auras	2014-07-11 13:14:44 +04:00
magenoxx	f8a1b327b4	[UI] Order of cards in hand is changable	2014-07-11 10:49:00 +04:00
magenoxx	6d0d511323	[UI] Changing from card.mousePressed to card.mouseReleased. Shouldn't matter.	2014-07-10 11:00:18 +04:00
LevelX2	03e6ccf4ab	[M15] Added temp. fix for image download of M15 cards from Wizards side. Problems caused by new web design of wizards. Images are now added as png files. Png images are saved with a jpg suffix name but they are correctly displayed in XMage. Needs more work for a clean solution.	2014-07-09 17:36:07 +02:00
LevelX2	63612b4291	[M15] Removed M15 image download prevention.	2014-07-09 17:32:36 +02:00
magenoxx	41a2046479	[UI] FullScreen mode for Mac OS clients	2014-07-07 15:09:21 +04:00
LevelX2	14a58b0338	* Added Magic 2015 set.	2014-07-01 08:34:39 +02:00
LevelX2	6c6d12f40f	* Fixed that game name for menu works also for watching games.	2014-06-25 12:28:43 +02:00
LevelX2	c519814f03	* Vintage Masters - Added set and already implemented cards.	2014-06-25 10:37:07 +02:00
LevelX2	eb1e8dda14	* Client Windows - Name of game in windows sub menu is now build with player names.	2014-06-25 01:32:55 +02:00
LevelX2	fc95ef68f1	* Conspiracy - Added Conspiracy set to XMage. Changed order of sets in deck editor set selector.	2014-06-23 15:58:07 +02:00
Plopman	64b0da7aab	Deck editor. Don't reload all cards every times. Fix scrolling issue #439	2014-06-22 14:28:04 +02:00
Plopman	0d3223ff0e	Deck editor. Simplify code	2014-06-22 12:46:06 +02:00
LevelX2	d244551e3b	* Added Morph ability.	2014-06-09 17:53:55 +02:00
magenoxx	97dd0dd8a7	New XMage Logo	2014-06-04 10:45:45 +04:00
North	77d05d665d	fixed Mage.Client build	2014-06-02 16:06:09 +03:00
magenoxx	c09215a7f3	build fix	2014-06-02 16:01:47 +04:00
magenoxx	4e1901166b	Undo old implementation change (caused an enchant land bug)	2014-06-02 10:12:04 +04:00
LevelX2	b39eeac103	* Client - fixed wrong borders on some of the client menu bar items at the top of the window.	2014-05-30 23:00:22 +02:00
LevelX2	03f01bba3b	Updated some texts, changed from MAGE to XMage.	2014-05-30 21:00:01 +02:00
LevelX2	1ae85dc1b4	Some minor formatting.	2014-05-30 18:39:32 +02:00
magenoxx	ca49dc7a31	Moved card layout strategy to separate class	2014-05-30 18:44:17 +04:00
LevelX2	09669baedc	* Table / Games list - Selecting watch game for an already watched game brings the panel of the watched game to front.	2014-05-29 18:22:32 +02:00
LevelX2	37a1c9a6f9	Face down cards use now the cardback image.	2014-05-29 16:41:41 +02:00
North	2b8afe379a	fixed auto reconnect feature	2014-05-28 08:35:10 +03:00
LevelX2	c13f7a2115	* Mana pool handling - Fixed bug where wrong playerId was used. Fixed that menu check state is the same for all GamePanles of client.	2014-05-27 16:54:38 +02:00
LevelX2	d9e4e99a0f	Some changes to manual mana pool handling.	2014-05-27 08:37:16 +02:00