1704 commits

Author	SHA1	Message	Date
LevelX2	d34779fa68	* Changed logging level back to info, changed level of a lot of messages to debug from info. Added check that certain AI players can't join a table with no appropriate format.	2013-10-09 15:22:40 +02:00
LevelX2	21f101c5fa	* Player list - Sorting of player names is now case unsensitive.	2013-10-08 23:21:17 +02:00
LevelX2	360a62917b	Added optional server config parameter to limit the number of AI players when creating tournaments.	2013-10-07 18:14:27 +02:00
LevelX2	15374134ac	* Sample decks - 4 moden decks from GP Brisbane from October 6 2013	2013-10-07 08:29:38 +02:00
LevelX2	628569fbc9	* Players panel - The number of player online is appended to the heading text "Players (xx)".	2013-10-05 19:34:12 +02:00
LevelX2	aa2fcb09d2	Added commander sample deck.	2013-10-05 16:30:24 +02:00
LevelX2	3e71b3dbd5	* Example decks - Added the theros event deck (Inspiring Heroics) and the decks from Duel: Heroes vs Monsters.	2013-10-04 17:53:22 +02:00
magenoxx	38d5a50b23	Issue #329: displaying a token image only from the same set, displaying magic card back image otherwise.	2013-10-04 12:35:53 +04:00
magenoxx	48445a4b87	Downloading backside image.	2013-10-04 11:34:21 +04:00
magenoxx	7800f62b70	Downloading all token images even if Type 2 only is chosen.	2013-10-04 11:34:04 +04:00
magenoxx	006d3b5a87	Forgot to commit in previous commit	2013-10-02 18:26:08 +04:00
magenoxx	9d5e1dee69	Possible fix for Issue #204: The [Done] button does not appear some times	2013-10-02 18:11:05 +04:00
magenoxx	9230acffaf	[images] Added the ability to download Type 2 images only (80 Mb instead of 700 Mb)	2013-10-02 12:27:26 +04:00
magenoxx	c4b1105dd4	Updated list of sets included into Type 2 format	2013-10-02 12:26:25 +04:00
magenoxx	591547d878	formatting	2013-10-02 12:25:46 +04:00
LevelX2	44ccb830b7	* Added missing function for the auto save game log function.	2013-09-30 11:21:32 +02:00
LevelX2	49db840d77	* Heroes vs. Monsters - Added duel set.	2013-09-30 08:38:18 +02:00
LevelX2	842c07e093	* Game log - Added an option to the preferences to auto save the game logs as txt files.	2013-09-30 00:18:12 +02:00
LevelX2	87218c2847	More standard example decks.	2013-09-28 19:14:13 +02:00
LevelX2	b6e1497b5c	Minor formatting.	2013-09-28 19:13:33 +02:00
LevelX2	fe82b49930	* Join Table - Changed handling of messages while creating or joining a table.	2013-09-28 16:59:43 +02:00
LevelX2	3c695f09a9	Added Theros token download URL's.	2013-09-27 16:12:48 +02:00
LevelX2	0d6853bd8f	* MageBook - Won't be loaded by default if the client starts (now the change is included).	2013-09-27 08:26:22 +02:00
LevelX2	3af0532623	* MageBook - Won't be loaded by default if the client starts.	2013-09-27 00:16:20 +02:00
LevelX2	893a3acb65	* Card editor - Done some code cleanup, done some speed up for card loading time.	2013-09-26 17:26:23 +02:00
LevelX2	d8f90c6908	Some post Theros standard decks.	2013-09-23 19:53:17 +02:00
LevelX2	330ff60bc5	Theros intro packs.	2013-09-23 18:23:25 +02:00
LevelX2	0468fe7299	Show info in card tooltip of permanents if controller not equal owner.	2013-09-23 14:58:21 +02:00
LevelX2	825277bad9	Load and save setting of deck generator.	2013-09-23 14:57:50 +02:00
LevelX2	4b15dafda3	Save and load tournament settings.	2013-09-23 08:39:34 +02:00
LevelX2	70899ec4f8	[THS] Added Gift of Immortality, fixed some wrong names, minor formatting. Allow download of THS images.	2013-09-18 08:27:30 +02:00
LevelX2	6066cc2308	Removed unused Constants class.	2013-09-05 16:27:12 +02:00
LevelX2	7f6eca171e	Redesigned handling of chat start message.	2013-09-05 16:25:14 +02:00
LevelX2	5496cb4afd	Added the Theros set.	2013-09-02 17:10:38 +02:00
LevelX2	182839d41a	Added some new sound files (PlayerLost, PlayerWon, PlayerSubmittedDeck, PlayerLeft).	2013-08-31 19:00:38 +02:00
LevelX2	ae697db2d8	* Fixed possible NPE in CardView (fixes #278).	2013-08-28 16:23:04 +02:00
LevelX2	8836a5637b	More Standard sample decks.	2013-08-20 16:26:26 +02:00
LevelX2	68333a2eff	Added names to download the Modern Masters token images.	2013-08-19 12:49:35 +02:00
LevelX2	ae44981cfa	Added a game end dialog, that shows the result of the finished game.	2013-08-07 16:50:25 +02:00
LevelX2	2225c6f988	[Minor] Formatting.	2013-08-05 18:03:38 +02:00
LevelX2	78dc712944	Allow to generate 40 or 60 cars decks.	2013-07-30 13:42:20 +02:00
LevelX2	3d2f262ff4	Field alignment in new table dialog.	2013-07-30 13:41:40 +02:00
LevelX2	0ba83a7d5d	[minor] Formatting.	2013-07-30 13:41:07 +02:00
LevelX2	235d314104	Sample decks DailyMTG ReConstrcted Standard	2013-07-24 17:01:11 +02:00
LevelX2	0db3164ae4	Updated sample decks to use cards from newest editions.	2013-07-24 16:31:38 +02:00
LevelX2	94f5a0cc0f	Sample decks SCG Richmond open (Standard)	2013-07-24 16:14:16 +02:00
LevelX2	a0c3f32b9b	Added tip to tips shown at chatpanel at game start.	2013-07-23 17:21:03 +02:00
LevelX2	f76ee65bf5	Merge branch 'master' of https://github.com/magefree/mage.git	2013-07-21 22:55:45 +02:00
LevelX2	7d0cf3cd8c	Set version to 1.1.0 dev.	2013-07-21 22:52:25 +02:00
KholdFuzion	a6a09e0008	linux fixes (dox2unix) and basic lands added from LEA to 3ED	2013-07-21 03:18:23 -05:00
LevelX2	2e5fc5fc98	Some small changes for Release 1.0.3	2013-07-21 09:45:58 +02:00
LevelX2	57bec7a0c1	Fixed that the chat text input area's high was to small to show the descender of letters completely.	2013-07-19 14:20:16 +02:00
LevelX2	41034ccdd8	Split pane divider positions of table panel and tournament panel are saved and restored now.	2013-07-19 14:04:59 +02:00
LevelX2	85b8edf630	Improved player quits / leaves mage handling for tournaments (not perfect yet, will more improve it).	2013-07-18 17:40:06 +02:00
Li REN	dcce8c30a1	[minor] fix a bug causes assembly plugin error	2013-07-18 04:36:21 -04:00
Plopman	e6847a472d	[Commander] Display Commander in client	2013-07-17 20:35:52 +02:00
Li REN	1cea80fd5d	fix error of audioManager when start client from IDE.	2013-07-17 13:51:59 -04:00
LevelX2	10fd7c6f6a	Removed old debug messges.	2013-07-17 17:31:49 +02:00
LevelX2	69c3ae0666	Added 13 standard format decks using already M14 cards.	2013-07-17 16:09:53 +02:00
LevelX2	ffa8e53a68	Added another sample deck to client.	2013-07-17 14:22:05 +02:00
LevelX2	9838dea551	Added possibility to show tournament panel and watch tournament games (if allowed at tournament start) for spectators .	2013-07-16 17:39:02 +02:00
LevelX2	2abeba7c47	Deleted sample music.	2013-07-15 21:17:14 +02:00
LevelX2	178b4cb158	Fixed random set for basic land definition. (Fixed issue #274)	2013-07-15 13:27:12 +02:00
Li REN	60d81ffb37	fix a bug that cause incomplete multimedia files released	2013-07-13 17:18:00 -04:00
Li REN	ec1ee245f8	adjust path of sounds and music ... add sample BGM delete a sample deck that cause error in release	2013-07-12 16:57:58 -04:00
LevelX2	c4f6d95f5a	Fixed deck generator for client decoupling.	2013-07-10 20:07:33 +02:00
LevelX2	68b2f589f0	Added some missing configurations for M14.	2013-07-10 14:11:11 +02:00
LevelX2	034f71cead	Fixed NPE for picking order of triggered abilities.	2013-07-09 22:52:17 +02:00
LevelX2	5a8a7b19de	Client add land set search uses now ExpansionRepository.	2013-07-07 18:23:31 +02:00
LevelX2	ec3565e5f7	Using now ExpansionRepository or tournament booster selection in client.	2013-07-07 18:22:13 +02:00
LevelX2	a3e041e364	Cleaned up PhaseManager.	2013-07-07 18:18:40 +02:00
LevelX2	52d90a8d6f	Added sample decks from GP Kansas City (Modern).	2013-07-07 09:25:05 +02:00
LevelX2	51e4caca19	Tables panel - check for null value of date finished.	2013-07-06 15:15:20 +02:00
North	4657268476	fixed bug where one couldn't create a sideboard in the deck editor	2013-07-06 10:46:18 +03:00
Nicolas	ff5d16e132	Merge branch 'master' of https://github.com/magefree/mage.git	2013-07-05 18:51:20 +02:00
LevelX2	f540e78045	Fixed some display problems with emblems and there abilities on the stack.	2013-07-05 18:49:42 +02:00
Plopman	e3ab68bb37	Added M14 in ConstructedFormats	2013-07-05 18:48:40 +02:00
LevelX2	42dc0d142c	Improved Emblem handling. Added a MageObjectType to CardView (in progress).	2013-07-05 15:29:55 +02:00
LevelX2	5897f764e5	Fixed a NPE bug when calling the test.dck.	2013-07-04 23:36:51 +02:00
North	96ff08dc9a	Merge branch 'decouple-client' ... Conflicts: Mage/src/mage/cards/repository/CardRepository.java	2013-07-03 21:42:40 +03:00
LevelX2	c28bdf8a02	Added alternate part as commets to get UI editor to run.	2013-07-02 23:48:02 +02:00
LevelX2	7b260c960b	Added a quit match option. FFA game gets no more killed if host left mage or quitted match.	2013-07-02 22:15:49 +02:00
LevelX2	d39a581df9	Sample Deck: Craig Wescoe's WR Aggro	2013-07-02 07:54:15 +02:00
North	ae86414658	Removed getAllCards method from CardRepository	2013-07-01 23:46:27 +03:00
LevelX2	06163d6ac5	Adding Player state to TournamentPlayer and TournamentPanel.	2013-07-01 17:11:44 +02:00
LevelX2	319135b8ed	Cleanup preferences dialog.	2013-07-01 12:41:13 +02:00
LevelX2	7ef8753183	Cleanup wrong includes in TournamentPanel.	2013-07-01 10:13:31 +02:00
LevelX2	4c129706ca	Cleanup layout of preferences dialog.	2013-07-01 08:27:33 +02:00
Li REN	df6f43761e	Merge pull request #257 from Noahsark/master ... update	2013-06-30 12:07:20 -07:00
Li REN	70ebb6bfbc	add UI to adjust BGM path	2013-06-30 15:05:30 -04:00
LevelX2	eaf55be919	* Draft tournament - NPE on draft construct deck start.	2013-06-30 16:40:11 +02:00
North	1fccbd6b87	Merge remote-tracking branch 'origin/master' into decouple-client ... Conflicts: Mage/src/mage/cards/repository/CardRepository.java	2013-06-30 11:26:40 +03:00
LevelX2	17c893799f	Added a close button, tournament header infos, name in window item and movable divider bars to the tournament panel.	2013-06-29 22:30:43 +02:00
LevelX2	4cb4a377d2	Changed message of the day panel to full width.	2013-06-29 22:28:52 +02:00
LevelX2	55a6de849e	Ignoring M14 cards for download.	2013-06-29 20:51:54 +02:00
LevelX2	63783d9fe2	* Tornament construction time - Fixed that the selected value was not used.	2013-06-29 17:52:19 +02:00
North	dc0db40428	removed planechase from wizards image source (doesn't exist)	2013-06-29 18:00:18 +03:00
North	3558a67f77	added M14 to wizards download source	2013-06-29 17:26:09 +03:00
North	619b7222e7	refactoring to cards downloading and image path generation	2013-06-29 16:59:23 +03:00
North	6c51bcd599	fix for lands download (wizards source)	2013-06-29 16:58:53 +03:00
North	a43bc8bed6	fixed issue where second face was considered a card	2013-06-29 12:52:43 +03:00
North	4c83fd7d6a	fix for downloading cards from wizards spoilers	2013-06-29 00:08:10 +03:00
LevelX2	106b3831c4	One more sample deck.	2013-06-28 08:17:20 +02:00
North	a5eebbbf12	fixed NPE at downloading card images	2013-06-27 23:57:38 +03:00
LevelX2	e1ae922214	Some match time options added. Set the deafult macth time to 25 minutes per player.	2013-06-24 17:09:21 +02:00
LevelX2	ba7bf794f5	Some more Modern sample decks.	2013-06-24 16:33:20 +02:00
LevelX2	5898f8a798	[minor] Changed layout of create tournament table dialog.	2013-06-23 02:45:30 +02:00
LevelX2	738efcc47f	Added option to select time limit (also none) on match or tournament creation.	2013-06-21 21:34:06 +02:00
magenoxx	66d1a66967	[Timers] Removed debug logging.	2013-06-20 18:09:30 +04:00
magenoxx	7c187a1d2a	Fixes for timers.	2013-06-20 15:50:06 +04:00
Li REN	64f2452089	simplify image file filter for background	2013-06-20 01:24:16 -04:00
Li REN	7a6f42556e	simplify image file filter for background	2013-06-20 01:21:36 -04:00
magenoxx	b6fddc301c	Merge branch 'master' of https://github.com/magefree/mage	2013-06-20 00:20:42 +04:00
magenoxx	6532aaffdf	Timers on client side. Refactored.	2013-06-20 00:17:06 +04:00
North	1b3a51484e	replaced Card instances in client with MockCard	2013-06-19 22:53:53 +03:00
North	462992e838	removed dependency to Mage.Sets and Mage.Server	2013-06-19 21:21:35 +03:00
magenoxx	42dd9d81b4	Timers (In progress)	2013-06-19 17:12:31 +04:00
LevelX2	b7c88b3c6d	* Added Sample deck.	2013-06-18 21:49:38 +02:00
North	fb2ea95f55	removed card scanning from the client	2013-06-18 22:47:01 +03:00
North	0166975e83	refactored getSetCodes to be used from ExpansionReposiitory	2013-06-18 22:46:09 +03:00
LevelX2	af4759f127	Added some background images to client/backgrounds.	2013-06-18 12:28:49 +02:00
LevelX2	e1db02baec	Added a sound playing if human player joins a match.	2013-06-17 21:38:30 +02:00
Li REN	b8e7a50415	Merge pull request #11 from magefree/master ... update	2013-06-17 11:28:58 -07:00
Li REN	200c791eed	fix a bug causes npe.	2013-06-17 14:27:54 -04:00
LevelX2	95a12028e6	Added small icon for tokens on token permanents. Token copied from permanents (Giant Adephage) show now the image of the permanent.	2013-06-17 17:00:17 +02:00
LevelX2	5216eddb71	In the card info (tooltip) tokens have now the work "Token" written below the expansion symbol. Some code cleaning concering handling of counters.	2013-06-17 13:59:23 +02:00
Li REN	848e542ee4	clean	2013-06-17 00:01:37 -04:00
Li REN	b057857485	Transfer timeout counter to clock format (minute:second, for example, 100 -> 01:40)	2013-06-16 23:53:25 -04:00
North	d91813b08a	removed Card dependency for image downloading	2013-06-16 18:13:51 +03:00
North	b13394f03c	refactoring to CardImageSource	2013-06-16 17:19:10 +03:00
North	467d246a12	renamed CardInfo to CardDownloadData	2013-06-16 16:14:40 +03:00
North	1d4b3a2be6	Merge branch 'constants-refactor'	2013-06-16 15:25:35 +03:00
North	0bb110be45	[refactor] moved enums from Constants class	2013-06-16 12:28:10 +03:00
Li REN	2424c80718	Set default view of Sideboard to cardGrid. Make it similar to MTGO setting.	2013-06-16 04:06:28 -04:00
Li REN	1749eb7ded	Add a feature to addlandDialog. Now it can help player calculate lands they need as the same function on MTGO.	2013-06-16 03:29:56 -04:00
LevelX2	df2fd3f68e	Removed mage-theme-plugin dependency because it causes cyclic reference.	2013-06-15 20:02:39 +02:00
Li REN	fab2759579	update and adjustment	2013-06-15 04:12:26 -04:00
Li REN	11ed1f57d4	fix a bug of package importation that cause code not be able to compiled	2013-06-15 02:50:02 -04:00
Li REN	8ac58cfc41	Combine ThemePluginImpl into Mage Client project to avoid cycling dependency.	2013-06-15 02:01:58 -04:00
Li REN	c5873fdc2a	Add UI for background image selection - selection, random, default	2013-06-15 00:53:18 -04:00
LevelX2	84df0f2c43	* Added tournament options for adjustable construction time and free mulligans ... * Added duel options for free mulligans	2013-06-14 23:45:30 +02:00
Li REN	7ce050641d	fix a bug of MusicPlayer that cause nullpointer exception	2013-06-14 13:04:48 -04:00
Li REN	cc49f71b3c	Clean the code	2013-06-13 20:24:26 -04:00
Li REN	c41a2df3ac	Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.	2013-06-12 23:34:43 -04:00
Li REN	6bbaa9fda1	Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.	2013-06-12 22:55:25 -04:00
Li REN	7102d08637	Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.	2013-06-12 22:27:08 -04:00
Li REN	3eef0b1080	Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.	2013-06-12 22:18:49 -04:00
LevelX2	3dbdba32e9	* Number of wins can be set for tournaments. * Current score of running matches is shown in the table list.	2013-06-10 16:25:31 +02:00
LevelX2	dec8f24c68	* The list of completed matches and tournaments shows now also columns with start and end time.	2013-06-10 14:12:24 +02:00
LevelX2	511170c645	* Some more Standard format example decks.	2013-06-09 10:04:51 +02:00
LevelX2	50c43c839c	Renamed some decks.	2013-06-08 22:41:58 +02:00
LevelX2	00f22afdf0	Added Modern Masters set and already implemented cards.	2013-06-06 21:44:16 +02:00
North	90e6db057e	deleted mage-rate-executable.jar	2013-06-05 21:51:39 +03:00
LevelX2	332697282d	Some more modern sample decks.	2013-06-05 17:26:54 +02:00
magenoxx	b25b91b325	Issue#232: Avatar pictures sometimes missing	2013-06-05 10:39:48 +04:00
LevelX2	5cb438f701	Added the one token image of DGM.	2013-06-03 08:28:49 +02:00
LevelX2	010645b406	Fixed that PC2 mythic expansion symbol was not loaded.	2013-06-03 08:28:28 +02:00
LevelX2	a8f463e862	Sample decks from GP Guadalajara.	2013-05-27 19:40:32 +02:00
LevelX2	908b9194c3	Added some more sample decks.	2013-05-27 08:15:17 +02:00
LevelX2	e22400d0ae	Sample deck from GP Portland.	2013-05-25 15:47:08 +02:00
LevelX2	6718332f6a	Workaround for issue #213, removing object from the stack that wasn't correctly removed.	2013-05-23 20:28:30 +02:00
LevelX2	54daf4ee13	Added a werewolve sample deck	2013-05-22 17:26:02 +02:00
LevelX2	449195daed	Added check for JRE7 directory to the windows start .bat files.	2013-05-20 17:02:58 +02:00
LevelX2	43b641ff17	2 modern sample decks (GP Portland)	2013-05-18 06:46:34 +02:00
LevelX2	5336d4c0f9	Pushed version to 1.0.3 dev.	2013-05-12 16:00:25 +02:00
LevelX2	6b38cd5b18	Mage Version 1.0.2	2013-05-11 23:06:30 +02:00
LevelX2	101194acf7	Many changes to split cards handling (showing arrows and log text for fused spells., handling protection and other things correctly).	2013-05-11 20:11:58 +02:00
LevelX2	9eb3e8f308	Some more sample decks.	2013-05-10 15:21:02 +02:00
LevelX2	b352217e17	Some improvements to split card handling. Better display of tooltip of split cards, also added handling if not cast from hand.	2013-05-09 21:26:15 +02:00
LevelX2	a29dc6cb18	Changed split card name using " // " as separator to be more conform with elsewere used name. But image save name uses " - ".	2013-05-09 14:02:15 +02:00
LevelX2	d799fa86d9	[DGM] Intro and event decks, some more example decks.	2013-05-09 13:59:44 +02:00
LevelX2	d00e953ad9	Added Levacy to the construced formats.	2013-05-03 08:37:30 +02:00
LevelX2	25948e089e	Implemented Split cards, not yet finished. Fuse does not work. Comparation for e.g. converterted mana (708.6a) does also not work correctly.	2013-05-01 21:41:56 +02:00
LevelX2	a8c430e839	A new standard sample deck.	2013-04-29 22:58:11 +02:00
LevelX2	b6ddaabe44	Show user name in title bar of MAGE. Clear table chat after disconnect. Remove user from chat after disconnect. Some tweaking about the messages if a user disconnected/session expired.	2013-04-29 17:18:43 +02:00
LevelX2	4647221868	Open DGM image download. New PreventAllDamageToControllerEffect. Rule text formating to DetainTargetEffect.	2013-04-27 02:04:47 +02:00
LevelX2	a37a5e0e1c	Display life > 99 and cards in graveyard > 99 with smaller font.	2013-04-15 18:50:05 +02:00
LevelX2	8fc9ca7a94	Fixed a bug that the sets Shards of Alara and Alara Reborn were swapt in client logic.	2013-04-11 16:38:12 +02:00
LevelX2	7c06d242dd	More sample decks.	2013-04-11 00:54:53 +02:00
LevelX2	2fc53fa71e	Added Commander and Dragon's Maze set objects to MAGE.	2013-04-10 16:55:31 +02:00
LevelX2	f644ffe041	Changed color of frame of avatar for active player to green again. Checked that a player of a game can't also watch his own game. Added a match score to the start of the game log. Changed the color of the Turn [X] message. Tips and join messages during a game are displayed in the chat panel instead the game log panel. Display of the player name when hovering over the avatar is more vertical centered.	2013-04-07 21:29:27 +02:00
LevelX2	cb6ac8e619	Some spelling changes to reminder text of shortcut keys.	2013-04-05 23:44:59 +02:00
LevelX2	b4f424a9a9	Send now also event to server if you click on a face down card.	2013-04-04 00:07:11 +02:00
LevelX2	6a9a245c15	Setting from new table dialog are saved and restored from java prefs when the client is started.	2013-04-03 21:24:18 +02:00
LevelX2	fb539cd177	More sample decks.	2013-04-03 19:13:06 +02:00
LevelX2	de20fcb5cc	[minor] formatting	2013-04-02 13:46:43 +02:00
magenoxx	97acebacdd	Pumped version to 1.0.2.dev	2013-04-01 16:00:30 +04:00
magenoxx	df3739e5f4	Added packing sounds into release packages	2013-04-01 15:03:52 +04:00
magenoxx	143f0f76e7	Fixed #180 : Paying additional cost of Mana Leak or Spell Rupture isn't handled correct	2013-04-01 14:24:56 +04:00
LevelX2	7ef08656f6	[Minor] change of phase display.	2013-04-01 03:31:57 +02:00
LevelX2	c88093d699	The table list of current matches / tournaments shows now all names of players.	2013-03-31 20:13:04 +02:00
LevelX2	ca9b424f1a	Made background of top area of the cardSelector brighter to make it better readable.	2013-03-31 19:17:00 +02:00
LevelX2	9bda45ae29	More sample decks.	2013-03-31 09:03:20 +02:00
magenoxx	29b84e0d92	Closed #169: Make it possible to untap lands	2013-03-29 20:35:16 +04:00
magenoxx	dd9aec6a49	Minor fix	2013-03-29 19:11:00 +04:00
magenoxx	fab1417421	Fixed #178: During watching a game you get Concede and Cancel as menu point with right mouse button	2013-03-29 17:36:03 +04:00
magenoxx	05191e8793	Closed #168 : Enhance priority hot keys	2013-03-29 17:18:12 +04:00
LevelX2	402f7fffd9	Tournaments status is updated now and if tournament finished, it's moved to the lower finished matches view.	2013-03-27 22:31:15 +01:00
LevelX2	095c3c5776	Improved message transformation.	2013-03-27 22:29:50 +01:00
LevelX2	7014b28797	Improved sceduled logic to remove bugged tables. Reactivated logic to show the list of the last finished 50 matches (no replay possible).	2013-03-27 16:58:34 +01:00
LevelX2	30b738b3ad	Fixed a bug for loading selected view from java prefs. Minor formatting.	2013-03-27 14:52:03 +01:00
LevelX2	39d67eec8a	Last settings for CardView concering view, piles and order are always saved and restored in Java Prefs now.	2013-03-27 08:26:04 +01:00
LevelX2	12a01788e6	Added a new column to the table list showing the number of wins for matches and number of used / total seats for tournaments.	2013-03-26 17:18:43 +01:00
LevelX2	d4e12b2fea	Fixed a small bug that player list was not updated if size didn#t changed but values.	2013-03-26 15:33:47 +01:00
LevelX2	d8961a7a82	[minor] formatting	2013-03-26 13:43:24 +01:00
magenoxx	3a59ca9465	Not changing hand ui size in small mode	2013-03-22 08:39:35 +04:00
magenoxx	3afa5cc867	Fixed Issue #[166]: Allow table creator to remove table - added confirm dialog	2013-03-22 08:26:57 +04:00
magenoxx	67fcf4a911	Implemented Issue#166: Allow table creator to remove table - added remove action also for watch/replay state	2013-03-20 08:29:57 +04:00
magenoxx	4adb63cc7a	Fixed Issue#165: Decksize over 99 cards not displayed correct	2013-03-20 08:27:55 +04:00
magenoxx	13c2b2d477	Implemented Issue#166: Allow table creator to remove table	2013-03-20 08:09:36 +04:00
LevelX2	579bc652a0	Some more sample decks.	2013-03-20 00:10:05 +01:00
LevelX2	52cb0be02c	Two more sample decks.	2013-03-17 16:14:16 +01:00
LevelX2	e42f32b16a	More modern sample decks. Renamed one.	2013-03-16 19:50:03 +01:00
LevelX2	09aba1bd87	Some more sample decks.	2013-03-15 15:55:01 +01:00
magenoxx	3191ad7e32	Fixed Issue#158: The select a pile window is shown over the tooltip window	2013-03-15 11:53:32 +04:00
LevelX2	4840bcf4b6	Added top 8 modern decks from GP Bilbao January 19th.	2013-03-11 17:35:07 +01:00
LevelX2	9298e2341d	Sample decks: Standard - top 8 decks from GP Verona.	2013-03-11 15:48:08 +01:00
North	a7a565bb8f	[minor] access modifer order	2013-03-10 14:53:02 +02:00
LevelX2	aa0290fd32	Set Version to 1.0.1	2013-03-10 11:40:56 +01:00
LevelX2	0565cd1289	Added top 4 modern decks from Pro Tour Dragon's Maze Qualifier Season New Mexico - Albuquerque.	2013-03-09 18:42:45 +01:00
LevelX2	dc131fa8dd	Changes to show name and number of counter on a card.	2013-03-04 00:03:21 +01:00
LevelX2	cc96a55523	Some changes to logging.	2013-03-04 00:01:12 +01:00
North	2daae9fb47	[minor] code style	2013-03-03 10:41:31 +02:00
North	122e9c700d	URL hash and equal methods do IO operations; replaced with URI	2013-03-02 20:06:57 +02:00
North	a327668660	fixed possible NPEs	2013-03-02 18:02:09 +02:00
North	c0f837c2e0	removed unused fields	2013-03-02 18:02:08 +02:00
North	cdd5c3f2d3	[minor] removed redundant modifiers	2013-03-02 18:02:05 +02:00
North	5f6f1c7528	[minor] removed unused imports	2013-03-02 18:02:02 +02:00
LevelX2	0687731913	Added two weird modern decks from http://www.wizards.com/Magic/Magazine/Article.aspx?x=mtg/daily/rc/236.	2013-02-28 08:29:55 +01:00
magenoxx	6444ff723f	Fixed Issue#131: If I'm using not the default location for images, the handling of symbols is faulty	2013-02-26 16:37:14 +04:00
magenoxx	441a9870c8	Pumped version in java files and main pom	2013-02-26 15:44:21 +04:00
magenoxx	5577d5b3a8	Changed version from 0.10.1 to 1.0.0	2013-02-26 14:11:00 +04:00
magenoxx	23c93be6a8	Displaying loading time for checking images	2013-02-26 13:42:07 +04:00
LevelX2	2ac3073abf	Top 8 decks GP Quebec City.	2013-02-25 20:19:18 +01:00
magenoxx	cd7b0f5b08	Client start up time speed up: don't check for new images by default	2013-02-25 20:29:09 +04:00
magenoxx	a5598c3c4b	JVM tuning for scripts	2013-02-25 19:47:41 +04:00
magenoxx	7db2889ab3	Added MaxPermSize to client scripts in release folder	2013-02-25 13:22:25 +04:00
LevelX2	2b3bf70d54	4 Standard decks from GP Quebec City Saturday.	2013-02-24 19:18:52 +01:00
LevelX2	b13fa6ce9f	Some MTGO Modern format decks from WOTC side.	2013-02-23 17:18:42 +01:00
magenoxx	0ca04e0285	Fixed Issue#142: Player's panel cosmetic bug	2013-02-22 23:47:38 +04:00
magenoxx	7f6d730975	Fixed Issue#125: Show source/reason of triggering abilites	2013-02-22 22:54:43 +04:00
LevelX2	e112ea4f8d	Sample modern deck.	2013-02-21 17:05:59 +01:00
LevelX2	91b20f76b0	Sample standard deck.	2013-02-19 16:54:50 +01:00
LevelX2	e4145c90b5	Fixed issue #135 that cards with miracle were always shown on the stack if it was possible to cast them with miracle also if the owner of the card dicided not to use the miracle ability. Minor formating.	2013-02-14 14:50:41 +01:00
LevelX2	13e008f102	Added a new sort mode to editor that sorts by color detailed by color combinations.	2013-02-10 10:47:44 +01:00
LevelX2	fcd24572dd	Computer generated decks for tournaments use now also appropriate basic lands for the cards included in the deck.	2013-02-06 00:50:00 +01:00
LevelX2	68088627b5	Added gatecrash event decks to client sample decks.	2013-02-05 09:56:04 +01:00
LevelX2	6b49ab3582	Added gatecrash token and emlem definition for download.	2013-02-05 09:33:18 +01:00
LevelX2	cf62ba330d	Fixed a bug that froze the game if you finished a game, pushed ok and directly started to open a new game. The FeedbackPanel.endWithTimeout() task triggered after 8 seconds and locked the client.	2013-02-04 17:00:34 +01:00
LevelX2	5f3a8eb360	Changed logic of adding basic lands in deck generation and the add land function in limited deck editor to use lands from the sets of the cards in the decks. Added missing attributes to set definitions.	2013-02-03 16:54:03 +01:00
LevelX2	a168cb603b	Added the gatecrash Intro Pack decks to client sample decks.	2013-02-02 01:32:01 +01:00
LevelX2	98ab1f18e3	[GTC] Corrected wrong cards numbers, allow GTC for image download	2013-01-23 13:14:09 +01:00
magenoxx	2c652770fb	Fixed Issue#122: Check of deck and game type during creating a new table doesn't show a qualified error message	2013-01-21 21:14:22 +04:00
magenoxx	9f241a7041	Fixed Issue#109: Unwanted blue rectangle in UI	2013-01-15 17:30:36 +04:00
LevelX2	0d3785937b	Setting position of dialog centered.	2013-01-15 00:53:32 +01:00
magenoxx	3908d8f9cd	Fixed Issue#108: Display of flipped cards is erroneous	2013-01-14 22:09:28 +04:00
magenoxx	3df5466d8a	Added downloading flipped card images. Removed counting images for ignored sets.	2013-01-14 22:07:07 +04:00
magenoxx	20c57ef2d6	Added GTC to image download ignore list for a while	2013-01-14 21:03:13 +04:00
LevelX2	6a138740ba	Fixed NPE in deck editor cause by changes for issue #73.	2013-01-14 17:11:16 +01:00
magenoxx	55f40d2e9d	Implemented Issue#73: Enchant Player enchantments - show enchanted player	2013-01-14 18:57:13 +04:00
magenoxx	17b8619b3e	Implemented Issue#106: Display emblems of players	2013-01-14 18:16:12 +04:00
magenoxx	1fac540639	Fixed 'Graveyard' label cut on top in grave dialog	2013-01-14 17:57:03 +04:00
magenoxx	1de8321f44	Fixed Issue#107: Text of tooltip is shown behind the exile windows.	2013-01-14 11:52:05 +04:00
magenoxx	5ed24f1488	Fixed Issue#99: The choices window should be positioned centered of the battlefield	2013-01-11 16:03:31 +04:00
magenoxx	5345e93c30	Fixed Issue#75: tooltip textbox stays sometimes undesired	2013-01-11 15:52:56 +04:00
LevelX2	8b4b1691a4	Fixed set icon load of conflux.	2013-01-08 22:32:05 +01:00
LevelX2	8dab110060	Fixed a NPE in deck editor caused by fix of #84.	2013-01-08 22:31:43 +01:00
magenoxx	ec5b5845ef	Fixed Issue#84: Arrows that show the targets are always on top	2013-01-08 15:58:48 +04:00
LevelX2	1b8adc2b25	Added download/image information.	2013-01-08 00:16:54 +01:00
magenoxx	c53bcd6b2b	Minor fix for fixed Issue#45	2013-01-07 19:27:25 +04:00
magenoxx	fd7ab45a14	Fixed Issue#85: Frame resizing doesn't handle display of hand	2013-01-07 19:23:22 +04:00
magenoxx	78e1bb99d9	Fixed Issue#45: Textbox for tooltip is sometimes too small to show all the text	2013-01-07 18:02:45 +04:00
magenoxx	d951df41ec	Fixed Issue#75: tooltip textbox stays sometimes undesired	2013-01-07 16:02:47 +04:00
Backfir3	2803ffe539	Add [DDF-MIR]AEtherSpellbomb and M13 Starter Decks	2013-01-06 12:58:38 +01:00
LevelX2	11e2df7a86	Fixed symbol replacement and format definition.	2013-01-06 11:17:06 +01:00
LevelX2	36a2906ab5	Added "Unlimited Edition", "Revised Edition", "Limited Edition Beta", "Limited Edition Alpha" to the Format selector.	2013-01-06 09:26:18 +01:00
North	8e2b094837	Added LEA, LEB, 2ED and 3ED sets.	2013-01-05 18:14:38 +02:00
LevelX2	3b948a1e70	Added GTC (gatecrash) to some objects and lists.	2013-01-03 20:31:24 +01:00
LevelX2	5517474c90	Changed set selection for tournament boosters to only show sets with boosters. Closes issue #91.	2013-01-02 15:46:21 +01:00
LevelX2	03f419d176	Added Gatecrash to the available sets.	2013-01-02 13:33:00 +01:00
Loki	aa31ef23d3	bump version to 0.10.1	2012-12-28 12:48:26 +13:00
North	c0ad7812cd	minor changes (mostly code style)	2012-12-24 18:43:54 +02:00
North	fde10788db	removed redundant modifiers from interfaces	2012-12-20 23:45:47 +02:00
LevelX2	dcb904308c	Game panel uses now a bigger vertical area for the bigCardPanel. Positions of the dividers of the game panel are saved and restored now.	2012-12-20 16:38:48 +01:00
North	f0b32e7ca3	Removed unused imports	2012-12-20 00:26:21 +02:00
LevelX2	4b2e6a8bc0	Redesigned handling of various art for cards.	2012-11-27 15:24:29 +01:00
LevelX2	f72e1a1038	Improved the handling of image files for handling also different images of non basic lands (e.g. Fallen Empires).	2012-11-25 20:09:13 +01:00
North	bee9d63dec	Removed rendundant repositories definitions from pom files	2012-11-25 12:23:26 +02:00
LevelX2	487350016c	Some T2 sample decks.	2012-11-21 23:14:27 +01:00
Loki	45316daf88	version bump to 0.10.0 dev	2012-11-17 01:46:36 +13:00
LevelX2	91b2d7056f	Fixed wrong size of textbox when showing big card for the spell/ability on the stack.	2012-11-16 08:31:15 +01:00
LevelX2	ced533709d	Fixed bug that the path for zip files of the card images is always the default path and never the individual defined preferences path.	2012-11-15 20:52:44 +01:00
Loki	f017ab903c	version bump to 0.10.0	2012-11-15 22:47:15 +13:00
LevelX2	facfc6f1ce	Added tooltip to window titel bar to show longer titels of windows at least as tooltip.	2012-11-09 01:28:28 +01:00
LevelX2	baedfd54bf	Fixed card selector not removing card from sideboard.	2012-11-09 01:22:45 +01:00
North	dfbe144ad2	Fixed drafting cards	2012-11-08 23:26:41 +02:00
LevelX2	903c98b0ba	Fixed loading and saving of preferences - Images options.	2012-11-08 13:59:26 +01:00
LevelX2	5e4d0a2008	Added Planechase 2012 edition to mage. Added missing Planechase entry to set selector.	2012-11-07 14:31:12 +01:00
North	e049f39cb1	Fixed image download when name contains ":"	2012-11-05 20:31:19 +02:00
North	cc306b2119	Removed CardsStorage.	2012-11-05 20:09:09 +02:00
North	f64149971a	Merge branch 'CardRepository'	2012-11-05 19:37:51 +02:00
North	6f23ce362e	Deleted CardTableSelector (unused)	2012-11-04 16:15:38 +02:00
North	bc80844fbe	Fixed booster generation in Deck Editor	2012-11-04 16:15:27 +02:00
North	25cd490be3	[CardRepository] moved Sets, DeckImporter and CardRepository to Mage Framework	2012-11-04 12:52:02 +02:00
LevelX2	7eb6ee15c0	ExileFromHand Cost, some small changes	2012-11-03 16:41:19 +01:00
LevelX2	31d9934b5f	[RTR] added the two event decks to the sample decks	2012-10-24 09:01:45 +02:00
magenoxx	10ba5c2e72	Downloading images according to save_to_zip option	2012-10-23 17:10:56 +04:00
magenoxx	789ed428b7	[ui] disabled choosing path for images. added zip files option	2012-10-23 15:59:46 +04:00
magenoxx	6e1e27f51d	[ui] updated about dialog	2012-10-23 15:55:13 +04:00
North	9acb0e23bc	Removed unused code from Sets and ExpansionSet	2012-10-22 23:57:14 +03:00
North	08815ffb88	[CardRepository] Replaced findCard methods from Sets and ExpansionSet	2012-10-22 23:48:52 +03:00
LevelX2	f480d5cb66	added the RTR intro pack deck lists	2012-10-22 16:09:59 +02:00
LevelX2	62844401ee	fixed M13 emblem picture download (emblem pictures are not used yet?)	2012-10-22 16:08:05 +02:00
North	271aaab5fd	[CardRepository] replaced Sets.findCard(setCode, cardNum)	2012-10-21 18:30:15 +03:00
North	8d83251428	Renamed method in CardRepository	2012-10-21 18:23:27 +03:00
North	6faca63354	Removed unused methods from CardsStorage ... Only ratings are left and should be moved	2012-10-21 18:15:44 +03:00
North	809910e8c7	Used CardRepository in Deck Editor	2012-10-21 18:15:43 +03:00
North	56a11f4da2	Replaced CardStorage references from MageFrame with CardRepository	2012-10-21 18:15:42 +03:00
North	4a4ed72324	Replaced some CardStorage references with CardRepository	2012-10-21 18:15:40 +03:00
North	ca912d4e03	Used CardRepository for DeckGenerator ... Rewritten the getRandomColors method	2012-10-21 18:15:38 +03:00
North	7ea23a1ba1	Added CardRepository initialization	2012-10-21 18:15:37 +03:00
LevelX2	c335a8f34b	Added token names for downloading pictures of token creatures from M13 and RTR. Added RTR name for download of tokens.	2012-10-15 16:26:08 +02:00
LevelX2	cf88bb5ac3	Updated selected sets for "Standard" and "Selected". Added blocks to selectable Formats. Made all formats selectable in card selector, mage book and automated deck generation.	2012-10-14 10:08:16 +02:00
LevelX2	665ea374ed	added missing set abbr. anc corrected wrong values for symbol download	2012-10-03 19:10:34 +02:00
magenoxx	72de08ed39	RTR is default set for Collection Viewer	2012-09-26 13:07:03 +04:00
magenoxx	63b066672b	Removing temp zip files on download task completion. Removed recreating executor.	2012-09-26 13:01:24 +04:00
North	ff77767098	Already downloaded image files are moved to the zip file.	2012-09-25 22:10:28 +03:00
North	6a5b656419	Replaced AEther Tradewinds special character in wwk.txt	2012-09-25 21:48:41 +03:00
North	1223d0e9ce	Added RTR to WizardCardsImageSource	2012-09-23 21:44:14 +03:00
North	b1d2212ee7	Fixed downloading double sided cards from magiccards.info source	2012-09-23 21:43:50 +03:00
North	7ede15438e	Fixed image downloading for HML, ALL and DRK	2012-09-23 20:46:17 +03:00
North	ca047718b6	Added early sets	2012-09-12 10:33:11 +03:00
North	183553a684	[ICE][CSP] added sets (completed Ice Age block)	2012-09-12 09:37:18 +03:00
North	20ea0ba76f	Fixed support for HQ archives (inconsistent capitalization)	2012-09-12 00:45:41 +03:00
Backfir3	40f03c9be1	[ALL] Added Alliances set with simple and extended cards	2012-09-11 21:34:09 +02:00
LevelX2	db58ef2daf	Minor fixes and 2012 starter and event decks ... - War Priest of Thune made destroy effect optional - ExileFromGraveCost modified tooltip generation	2012-09-11 13:56:12 +02:00
North	964bf0ed13	Moved archiving configuration to MageFrame	2012-09-11 13:25:21 +03:00
North	dbe0d9170c	[refactoring] improved support for HQ image archives ... The names for the images in the HQ arhives don't have consistent capitalization	2012-09-10 12:33:12 +03:00
North	ce9dc9ebe9	Removed ROE and M13 from CarsStorage	2012-09-10 12:33:12 +03:00
magenoxx	e0de28693b	[client] Autoclosing game windows after 8 seconds they finished	2012-09-09 13:56:42 +04:00
magenoxx	ec123fee33	Added RTR to ignore list	2012-09-08 11:30:43 +04:00
North	fa82f1b159	[feature] Card images are now saved and read from zip files	2012-09-07 20:49:01 +03:00
North	e0d4285a69	Replaced checks for BasicLandNames with regular expresion.	2012-09-07 20:49:00 +03:00
North	9b10053e11	Removed MtgatheringRuImageSource	2012-09-07 20:49:00 +03:00
magenoxx	6b895d90cf	Fixed Issue#46: Creature display order on the battlefield random	2012-09-07 21:11:24 +04:00
LevelX2	fe72ab9192	Fixed bug that leaves unmodifiable lines for lands in the deck editor. ... Happens when you add more than one land from the same expansion with quantity > 1 and e.g. pushed new button afterwards.	2012-09-07 13:34:03 +02:00
North	8ff5ddf9d4	Fixed build	2012-09-04 14:06:15 +03:00
Loki	46ec86b54c	0.9.2 dev	2012-09-04 21:24:44 +12:00
Loki	76bb3f827d	0.9.1	2012-09-04 18:33:51 +12:00
North	ae0ec7793b	Removed server plugin binaries	2012-08-27 20:04:06 +03:00
North	0589ef94cb	[minor] Moved PLUGINS_DIRECTORY constant	2012-08-26 18:54:22 +03:00
North	0575034084	Removed TrayIconDemo class	2012-08-20 22:16:27 +03:00
magenoxx	b229fafcf9	Fixed Issue#36: End combat icon will not be shifted to left if it's the current phase	2012-08-16 01:07:01 +04:00
Loki	85b31df2d5	Bump version to 0.9.1dev	2012-08-14 15:28:06 +12:00
Loki	b729631cc6	0.9.0	2012-08-13 18:58:51 +12:00
jeff	067386cd94	- Added deck.	2012-08-12 10:54:18 -05:00
magenoxx	36cb5f95b9	Fixed Issue#37: graveyard dialog not displayed when multi games played	2012-08-08 11:31:35 +04:00
magenoxx	964aaf23ab	Graveyard dialog auto close on pay message. Usefull for flashback cards.	2012-08-03 19:44:48 +04:00
magenoxx	5c1a2f7a43	Madness fixes. Removed end_of_turn sound	2012-08-03 17:11:16 +04:00
magenoxx	931381606d	Fixed concede game option not working in popup menu	2012-08-03 13:27:10 +04:00
North	aaf296afd0	[4ED] added set	2012-07-29 20:42:19 +03:00
North	90559b8d69	[6ED] added set	2012-07-29 20:42:17 +03:00
North	355f4bcb7b	[7ED] added set	2012-07-29 20:42:16 +03:00
magenoxx	50ffb96a3f	[UI] Quick game start missing test.dck handling	2012-07-29 08:34:04 +04:00
magenoxx	e832ff3b53	[UI] made cheat button not focusable	2012-07-27 17:11:16 +04:00
magenoxx	0e0f90d29d	[draft] M13 draft picks	2012-07-25 20:29:25 +04:00
magenoxx	0e361959c6	Removed list of M13 cards (all h.b. implemented)	2012-07-25 19:39:00 +04:00
magenoxx	721c87757b	[UI] trasnparent players list in gamefind panel	2012-07-25 09:54:40 +04:00
magenoxx	421732a404	[UI] Displaying current phase	2012-07-25 00:21:53 +04:00
magenoxx	bef51b5085	Cropped startup image	2012-07-25 00:21:33 +04:00
magenoxx	0d20e954dc	[UI] Phases new Look and Feel	2012-07-24 19:40:09 +04:00
magenoxx	5c58edced6	[UI] Added Phases component to the right centered by Relative Layout.	2012-07-24 14:42:52 +04:00
magenoxx	886bd640ea	[UI] RelativeLayout	2012-07-24 14:41:57 +04:00
magenoxx	3d03a37e2d	[UI] New background for startup and gamefind panels. Update mage theme plugin version from 0.4 to 0.5. Removed unused images.	2012-07-24 13:55:13 +04:00
magenoxx	47d44c6aef	Returned game info panel to the right	2012-07-24 09:32:55 +04:00
North	1542ba9ab6	[filters] converted FilterCard conditions to Predicates	2012-07-23 21:53:54 +03:00
magenoxx	29e57830b4	Remembering toggle state for BigCard component between games	2012-07-23 09:07:25 +04:00
magenoxx	c783cbc41f	personal game messages	2012-07-23 01:29:56 +04:00
North	265bc900a9	Added sets: Mirage, Visions	2012-07-21 15:38:58 +03:00
North	eeca9e6db2	Added sets: Stronghold, Exodus	2012-07-21 15:27:32 +03:00
North	3351d9420b	Added sets: Mercadian Masques, Nemesis, Prophecy	2012-07-21 14:31:43 +03:00
North	a9b95595dc	Added Odyssey and Torment sets	2012-07-21 14:31:41 +03:00
magenoxx	6fbf4c1257	Renamed parameter name. [UI] Fixed big card image blinking on mouse move	2012-07-21 14:10:07 +04:00
North	6bbb7521c7	[SCG] added set	2012-07-21 11:46:08 +03:00
North	9cf12d4c15	[LGN] Added Set	2012-07-21 11:46:07 +03:00
magenoxx	59b9087257	BigCard component back with toggle option.	2012-07-20 17:33:48 +04:00
North	5d0a832642	cleaned pom files and updated sqlight dependency	2012-07-19 21:15:09 +03:00
magenoxx	de146458a9	[UI] Some sounds	2012-07-19 18:11:00 +04:00
magenoxx	99b32dcc33	Deleted server msg file from mage.client module	2012-07-18 17:16:49 +04:00
magenoxx	b2cd3e75bd	changed version from 0.8.7.dev to 0.9.0.dev	2012-07-18 15:59:07 +04:00
magenoxx	9c6dc78842	Shuffling player seats in multi player	2012-07-18 12:12:12 +04:00
magenoxx	ed0af0faee	Added skip-all-turns-and-actions feature. Bound to F9.	2012-07-18 10:15:50 +04:00
magenoxx	8598f9ead1	Displaying tray message on player join and quit events	2012-07-17 14:18:38 +04:00
magenoxx	e198b317e4	[UI] new game background	2012-07-17 10:32:14 +04:00
magenoxx	872ced4344	[UI] Tray menu. Blinking on new players added to table. Added window restore on double-click.	2012-07-16 20:23:56 +04:00
magenoxx	9214051279	[UI] Mage tray icon	2012-07-16 19:08:03 +04:00
magenoxx	2de4506ad2	[UI] Added popup menu. Moved Concede action to popup.	2012-07-16 16:49:09 +04:00
magenoxx	44a3c05ba8	[UI] displaying tooltips: clean up and code refactoring	2012-07-16 16:14:53 +04:00
magenoxx	7443e2a9fa	[UI] card image zoom in/out on mouse wheel with 700 ms timeout	2012-07-16 16:08:12 +04:00
magenoxx	6d24c7001b	Fixed tooltip not displayed in Collection Viewer	2012-07-16 09:07:28 +04:00
magenoxx	ccf201cfc4	stack min size	2012-07-16 09:06:55 +04:00
North	43322d3c1a	Merge branch 'filters'	2012-07-13 23:10:10 +03:00
magenoxx	fc2283898c	[UI]Alt+E:enlarge card. New game panel layout (experimental).	2012-07-13 14:55:52 +04:00
North	ecf765ecf5	[filters] Replaced CardType conditions with Predicate	2012-07-12 23:42:46 +03:00
magenoxx	9187cbff07	(Issue#6) Fixed tooltip not displayed until updated in Preferences dialog	2012-07-12 06:00:26 +04:00
magenoxx	7d1bdfb0ce	Added F4 hot key for 'End Turn' action	2012-07-08 18:42:28 +04:00
magenoxx	5294e2cba4	Changed title for graveyard dialog	2012-07-08 18:40:53 +04:00
magenoxx	6d670fa3ff	[UI] Moved Concede button from helper component to bottom-left	2012-07-08 09:41:04 +04:00
magenoxx	d9e0590763	fix for m13 type in deck generator	2012-07-08 08:06:54 +04:00
magenoxx	3ddff4a113	Added M13 option for deck generator	2012-07-08 07:21:26 +04:00
North	ff2f12fcc7	[USD] added set	2012-07-07 22:33:23 +03:00
North	4ee6ea5ae9	[JUD] added set	2012-07-07 22:19:45 +03:00
North	6395e82e47	[M13] added set	2012-07-06 14:23:24 +03:00
North	7734abe87f	Fixed quick start action (for testing).	2012-07-03 08:25:50 +03:00
magenoxx	9ac166abc9	updated version to r2	2012-07-03 00:38:41 +04:00
magenoxx	375cc311b9	Fixed ClassCastException for Client windows	2012-06-30 09:10:36 +04:00
magenoxx	8ba88ff5f2	config changes	2012-06-29 17:19:12 +04:00
magenoxx	4d6b48b661	Another two decks for AI	2012-06-29 17:02:29 +04:00
magenoxx	5541fe4163	updated version from 0.8.6.r5 to 0.8.7	2012-06-29 14:56:13 +04:00
magenoxx	ebf8e372bd	Minor helper fix	2012-06-29 10:01:37 +04:00
magenoxx	7bcd512351	Not included changes (can be ignored for now)	2012-06-28 16:40:46 +04:00
magenoxx	30264a4326	Made button non visible on helper component rather than disabled	2012-06-28 10:08:13 +04:00
magenoxx	6ad352709a	Focus on button for space and enter hot keys	2012-06-28 01:06:38 +04:00
magenoxx	25bdce4b67	Hiding 'End Turn' button	2012-06-28 00:53:59 +04:00
magenoxx	004aa20d08	Decreased tooltip display delay from 700ms to 300ms	2012-06-28 00:16:26 +04:00
magenoxx	b5032226f4	Showing already chosen cards in choice dialog	2012-06-27 18:44:03 +04:00
magenoxx	638a6368d2	Displayint card name in choice dialog. Bigger cards for choice many.	2012-06-27 18:07:13 +04:00
magenoxx	8f0159d706	Displaying tooltips over card choice dialogs	2012-06-27 17:34:58 +04:00
magenoxx	0f15fd1186	ClassCastException fix on game close	2012-06-27 17:33:47 +04:00
magenoxx	a8588c1c83	Added displaying 'Your turn' message	2012-06-27 15:35:37 +04:00
magenoxx	d5c5a89e85	Made stack window bg color transparent	2012-06-27 15:13:59 +04:00
magenoxx	75e641580c	Displaying text in helper component. Removed feedback component	2012-06-27 15:07:01 +04:00
magenoxx	c2a517f1b3	New helper component	2012-06-27 14:25:12 +04:00
magenoxx	b11d843d0b	Unlocked 3 avatars	2012-06-27 12:59:38 +04:00
magenoxx	d31197a8c2	Fix for arrows not removed on game end	2012-06-27 12:59:06 +04:00
magenoxx	559ba76906	New graveyard dialog	2012-06-27 12:09:14 +04:00
magenoxx	59a2eaafd8	Minor changes	2012-06-26 18:13:32 +04:00
magenoxx	653f236c65	Cards lazy loading	2012-06-26 17:20:05 +04:00
magenoxx	96daa4e0a9	Added support for splash image	2012-06-26 15:39:00 +04:00
magenoxx	541be44d21	Updated splash image	2012-06-26 15:38:08 +04:00
magenoxx	22acb87c37	Good deck for AI	2012-06-25 18:00:51 +04:00
magenoxx	830533360e	Fixed close dialog not working correctly	2012-06-25 13:43:43 +04:00
magenoxx	cac2490f77	Displaying background in draft picks dialog	2012-06-25 13:04:41 +04:00
magenoxx	0c4217adf1	Removed stack dialog	2012-06-25 10:08:45 +04:00
magenoxx	37e7941807	sorting sets in drafts by release date	2012-06-24 22:44:37 +04:00
North	239a4fb100	[refactoring][minor] Replaced all tabs with four spaces.	2012-06-19 23:50:20 +03:00
magenoxx	0c785abb46	New way for displaying combat	2012-06-17 13:13:51 +04:00
magenoxx	25edb58811	Added sideboard to Pro Tour Barcelona Miracle deck	2012-06-17 11:17:17 +04:00
magenoxx	48f2018af6	New stack dialog (experimental)	2012-06-16 19:33:03 +04:00
Loki	29f117fba2	update revision to r5	2012-06-14 21:10:50 +03:00
magenoxx	e34ee2e7f6	Added downloading and displaying emblem images	2012-06-13 09:48:10 +04:00
magenoxx	4393a55569	Added token type for displaying different images	2012-06-12 22:58:21 +04:00
magenoxx	9c8fe7268b	Reworked emblems	2012-06-12 20:57:23 +04:00
magenoxx	d895b3e8d0	Lazy card loading	2012-06-05 19:41:17 +04:00
Loki	f088039c35	fix ULG symbols downloading	2012-06-05 17:49:47 +03:00
magenoxx	2c175dadf4	Fixed random stack abilities display order in client	2012-06-05 17:26:17 +04:00
magenoxx	d07236352b	Turbo Poison deck	2012-06-05 14:16:57 +04:00
Loki	7001caa64d	bump version to 0.8.6.r4	2012-06-04 21:32:40 +03:00
Loki	1adee62789	bump revision to 0.8.6 r3	2012-06-01 23:21:32 +03:00
magenoxx	9c3cc85ff2	Added filtering by Standard cards into DeckEditor. Changed sorting to release date.	2012-06-01 01:23:48 +04:00
magenoxx	500b4ab651	[WTH] Weatherlight set and simple cards	2012-05-28 16:11:23 +04:00
magenoxx	c4cbc2a34e	Changed version to 0.8.6.r2	2012-05-27 11:03:49 +04:00
North	06a185a3a5	removed unused imports	2012-05-26 20:08:39 +03:00
magenoxx	032a261e5f	2 decks	2012-05-25 22:24:10 +04:00
magenoxx	4ae362c050	Displaying lands from the same set but different images separately in deck editor	2012-05-25 21:33:29 +04:00
magenoxx	6bd53a856f	Remove buttons in DeckEditor	2012-05-25 21:22:22 +04:00
jeffwadsworth	fb6d7eac1f	- Added 2 decks.	2012-05-25 11:46:53 -05:00
magenoxx	342b5a8444	moved old decks to 2011 folder	2012-05-25 19:40:16 +04:00
magenoxx	bebd9644be	updated jars	2012-05-25 19:23:25 +04:00
magenoxx	135f4d6841	reverting java-image-scaling version back to 0.8.5	2012-05-25 19:21:38 +04:00
magenoxx	12b21abe52	changed version from 0.8.5 to 0.8.6	2012-05-25 19:04:40 +04:00
magenoxx	675d2f1183	UI fix for attachments z-order	2012-05-25 10:19:31 +04:00
magenoxx	9a5000616d	Fixed UI bit with cards z-order	2012-05-25 08:58:16 +04:00
magenoxx	5e97b56508	UI battlefield transparency fix	2012-05-25 01:32:17 +04:00
magenoxx	32e29392d2	[AVR] Second Guest + tests. Refactored filters.	2012-05-24 09:01:31 +04:00
magenoxx	2ac151bf25	Added Urza's Legacy set	2012-05-22 09:45:26 +04:00
magenoxx	d15499748d	Fixed 1,5 years old bug with battlefield scroll missing. Also removed unnecessary gap.	2012-05-21 21:55:04 +04:00
magenoxx	2312b38a75	UI battlefield layout fix	2012-05-21 00:18:31 +04:00
magenoxx	1bf0e216de	Displaying tooltips and green arrows for paired creatures	2012-05-17 11:59:47 +04:00
magenoxx	0e2481c0a9	Saving collection viewer format in preferences	2012-05-11 19:25:07 +04:00
magenoxx	be7f01b0ba	Enhanced card-by-text searching in deck editor	2012-05-08 14:28:06 +04:00
magenoxx	7740143e07	Added Innistrad block option to deck generator	2012-05-07 08:41:12 +04:00
magenoxx	5d0ce8ac09	Fixed token description	2012-05-07 08:30:02 +04:00
magenoxx	fa0e623120	changed version from 0.8.4 to 0.8.5	2012-05-07 07:50:07 +04:00
Loki	9de37bea5a	Fixed memory leak	2012-05-06 23:40:44 +03:00
Loki	2577f708bf	card plugin fix for null rule in tooltip	2012-05-06 23:40:40 +03:00
Loki	a746ca680b	[load] one place server ping	2012-05-06 23:40:37 +03:00
magenoxx	9edac9426e	starting server at 0.0.0.0	2012-05-04 11:11:13 +04:00
magenoxx	80a25377b5	GatekeeperOfMalakir kicker test. Fails.	2012-05-03 18:21:30 +04:00
magenoxx	f6ef3fdd89	Fixed CollectionViewer with layoyt config not set on startup.	2012-05-03 05:47:51 +04:00
magenoxx	ef2a36c329	Fixed Issue#5: 'Show tooltips' doesn't affect cards in all zones	2012-04-30 19:26:26 +04:00
magenoxx	537c326789	[load] loading testing: added simple test for starting game by two players	2012-04-30 18:56:36 +04:00
magenoxx	96cfb51686	Extracted Session interface, moved implementation to SessionImpl	2012-04-29 19:03:08 +04:00
magenoxx	0970856fc8	Added saving layout configuration in collection viewer. Fixed bug with empty pages on layout switching.	2012-04-29 18:57:32 +04:00
North	0c1cccbd03	Added Avacyn Restored set	2012-04-28 11:26:09 +03:00
magenoxx	42108ef59c	fixed downloading images from flip cards according to changes on magiccards.info site	2012-04-28 03:27:36 +04:00
magenoxx	11df72593c	changed version from 0.8.4.dev to 0.8.4	2012-04-27 18:09:19 +04:00
magenoxx	6ea1983696	commented out launch4j plugin	2012-04-27 18:08:00 +04:00
North	47bd74a24c	[refactoring] Moved Sets.loadDeck to a DeckImporterImplementation	2012-04-08 16:52:21 +03:00
North	e9ac5a180b	[refactoring] removed dead code (action for Challenge button)	2012-04-08 12:14:52 +03:00
magenoxx	33f19e9f8d	Fixed NPE in client	2012-04-06 12:40:57 +04:00
magenoxx	4ab62efc38	Now it is possible to choose game format in deck generator.	2012-03-28 11:52:38 +04:00
magenoxx	2b7cb8ca19	Changed default tab in collection viewer to DKA.	2012-03-28 11:52:00 +04:00
magenoxx	653b2c8a05	Displaying card count in deck editor.	2012-03-26 10:06:16 +04:00
magenoxx	3875c1f7c0	Changed component version from 0.8.3 to 0.8.4 (dev)	2012-03-25 12:16:46 +04:00
Loki	770bc451c9	add missing set images, fix non-utf8 char	2012-03-09 13:41:00 +04:00
North	263c937133	Ignored Integration tests (would fail when building Mage Client)	2012-02-29 22:38:20 +02:00
BetaSteward	d79cbcb54f	fixes	2012-02-09 15:58:14 -05:00
BetaSteward	6205ebaeb9	fixed Liliana Of The Veil npe when targeting tokens + added choose pile dialog	2012-02-07 15:15:47 -05:00
BetaSteward	65ce0c3948	fixed resizing	2012-02-04 16:57:22 -05:00
magenoxx	79919e1550	changed version from 0.8.3.dev to 0.8.3	2012-02-04 15:39:03 +04:00
BetaSteward	37e5c135f5	updated all jars - not sure which ones I might have messed up so I'm updating all	2012-02-02 23:55:39 -05:00
BetaSteward	d813283c19	adding back recent changes - not quite sure how I managed to revert all this	2012-02-02 23:48:25 -05:00
magenoxx	ca0fcbad58	Fixed bug with the email value not sent to server ;((	2012-01-30 20:34:14 +04:00
North	b31c23d686	updated .gitignore ... removed deck file (should not be there)	2012-01-29 22:46:27 +02:00
North	34765debdc	[refactoring] removed DrawCardEffect (misleading and there was better solution already implemented); also fixed Cruel Ultimatum ... [refactoring] removed special char from deck name.	2012-01-29 22:39:58 +02:00
North	90ad4a16c6	[sets] Added Dark Ascension	2012-01-29 17:00:23 +02:00
magenoxx	803947e053	Fixed capital letters in startup scripts.	2012-01-28 22:23:21 +04:00
magenoxx	bef2adadf2	Changed url for server-list.txt.	2012-01-28 21:37:16 +04:00
Loki	4ea776ce76	Merge remote-tracking branch 'origin/master'	2012-01-28 14:30:11 +04:00
Loki	3b1169e9d3	add USG set icon to download list	2012-01-28 14:29:54 +04:00
magenoxx	0cd53d37c7	Changed url for server-list.txt.	2012-01-28 13:37:32 +04:00
magenoxx	b3f99c43d5	Closing Feedback Dialog on send.	2012-01-28 13:37:12 +04:00
magenoxx	3434dc1a97	Added User Feedback support.	2012-01-26 22:13:44 +04:00
magenoxx	bdb2754847	Added sending broadcast message to all users on server from Admin Console.	2012-01-25 19:13:27 +04:00
LevelX	6a282d1e51	3 new cards ... [CHK] Marrow-Gnawer / Orochi Eggwatcher / Kiku, Night's Flower Fix ShisatoWhisperingHunter - using now sacrificeControllerEffect instead of sacrificeEffect Framework BeginningOfUpkeepTriggeredAbility - reverted change to set targetPointer if targetController == YOU (this caused unwanted side effects) SacrificeControllerEffect - new effect that the controller of an ability has to sacrifice something GainAbilityAllEffect - improved text generation some minor comment and include fixes	2012-01-24 23:33:27 +01:00
North	9ce828f491	Fixed name for two sample decks	2012-01-22 13:55:34 +02:00
LevelX	d441020f5f	Font of Mythos - Fixed bug giving only opponent the draw efffect	2012-01-20 00:26:30 +01:00
magenoxx	3d4d3a0b34	one more	2011-12-26 22:23:00 +04:00
magenoxx	c570ea4e61	Lots of decks submitted by Iran.	2011-12-26 22:22:00 +04:00
magenoxx	4c7cbfa9dd	Added server configs to release folder for embedded server.	2011-12-26 21:46:59 +04:00
magenoxx	4d9493a256	Update jars. BugCantFindCardInLibrary now works.	2011-12-26 18:49:32 +04:00
magenoxx	eb0bc89597	Tree optimizers. Fixed Issue 420.	2011-12-26 12:52:31 +04:00
magenoxx	3f20b725db	[MAD2.0] New scoring and undo system. Migrated draw cards action.	2011-12-25 11:42:32 +04:00
magenoxx	24dea6a02c	updated jars	2011-12-24 22:21:37 +04:00
magenoxx	e5999166d8	updated jars	2011-12-24 19:37:01 +04:00
magenoxx	cdb9cd69ff	Now AI will use all abilities without paying attention to effect outcome. ... This fixes ObNixilistheFallenTest.	2011-12-24 19:25:28 +04:00
magenoxx	53e9d2752b	Fixed combat actions in MAD AI. Updated tests.	2011-12-24 18:45:13 +04:00
Loki	1f259ec772	fix symbol downloading for PLS and INV	2011-12-24 17:21:14 +04:00
magenoxx	dc2ebdd16d	Some tests fixes. Returned back checking for repeated action with the fix.	2011-12-24 12:34:00 +04:00
magenoxx	a7a496af0e	Now client can start embedded Mage Server (player's feature request). ... Works only for "localhost". Still can be used with external server but in such case server should be started first.	2011-12-23 13:14:32 +04:00
magenoxx	7bd38bb208	Fixed assembly (daily builds were broken).	2011-12-18 12:29:16 +04:00
magenoxx	13c5177d54	[ui] Now pressing "Enter" on any text field in Connect dialog will force connecting - No need to press "Connect" button anymore.	2011-12-09 15:15:48 +04:00
magenoxx	e076c0b6ee	Fixed client bug where pressing "No" on "Are you sure you want to disconnect?" closed the client anyway.	2011-12-09 15:10:09 +04:00
magenoxx	ba6508cbeb	Updated component version from 0.8.1 to 0.8.2.	2011-12-09 13:15:07 +04:00
BetaSteward	afef9c06fe	handle smaller screen sizes	2011-12-07 10:03:17 -05:00
BetaSteward	e911f0b662	fixed large hand cards + improved resizing	2011-12-01 14:49:14 -05:00
BetaSteward	70421439f0	resize game panel when window resizes	2011-11-25 08:20:05 -05:00
magenoxx	16c03d6d4d	Test for multiple connects. Reproduces bug with "already connected" exception.	2011-11-24 13:17:15 +04:00
BetaSteward	b975d98bf5	partial fix for issue 81	2011-11-21 08:29:21 -05:00
honaker215	8c23757260	Updated startClient.command to refer to the current project version instead of the static value of 0.8	2011-11-01 13:39:34 +00:00
Loki	a004ced17d	artifactId to lowercase	2011-10-28 15:42:54 +04:00
magenoxx	490b95bcc6	added additional scripts for Win 7 and MacOs. added "how to start" instructions.	2011-10-28 11:40:39 +04:00
magenoxx	e302a12f5d	Updated component's version from 0.8 to 0.8.1 ... manually	2011-10-28 11:36:42 +04:00
maurer.it	5750f757ce	[REF] references 291 - Thanks for the contribution, always nice to know non-windows OS's are used.	2011-10-19 21:08:07 -04:00
maurer.it	3c8e5d4ea2	Sample decks from a couple Star City Open Standard Series tournaments.	2011-10-18 20:29:57 -04:00
Loki	778b0dc15f	fix libs path for launch4j	2011-10-16 22:34:37 +03:00
North	6467649b27	Removed duplicate decks	2011-10-16 21:13:51 +03:00
magenoxx	f42e9084f7	decks from slightlymagic.net	2011-10-16 21:44:45 +04:00
magenoxx	cbfc696c6b	fixed version in launch4j	2011-10-16 21:18:20 +04:00
magenoxx	3350c3e829	Updated components' version from 0.7.6 to 0.8	2011-10-16 21:02:04 +04:00
North	63bfc59e26	[Decks] added the decks submited by Iran	2011-10-16 19:38:09 +03:00
magenoxx	c7dcd3605c	change tournament ai level component size. changed default value to 10.	2011-10-16 18:06:13 +04:00
BetaSteward	a21e815ae9	fixed issue 281	2011-10-15 23:42:24 -04:00
BetaSteward	4c1d0728bc	fixed issue 280	2011-10-15 23:41:57 -04:00
magenoxx	e2049409ab	Fixed image not correctly resized for big card component.	2011-10-16 02:43:43 +04:00
magenoxx	ef1fa35555	Fixed Issue 256.	2011-10-16 02:27:37 +04:00
North	04e1d7efe2	Preconstructed decks	2011-10-16 01:26:00 +03:00
magenoxx	2926f0b6cb	Transparent panel in Collection Viewer. ... was gray.	2011-10-16 02:14:25 +04:00
magenoxx	3ab6b76c07	fix	2011-10-15 20:23:26 +04:00
magenoxx	ba19cc7f61	Added tab switching into Collection Viewer.	2011-10-15 19:45:16 +04:00
magenoxx	74b21979a5	Added choosing size to Collection Viewer.	2011-10-15 15:31:29 +04:00
magenoxx	5fbb8b1053	Sorting by formats in Collection Viewer.	2011-10-15 14:16:13 +04:00
magenoxx	446c1517cf	Added random colors to deck generator. Fixed Issue 267.	2011-10-13 17:18:05 +04:00
Loki	6f177b1d82	Magic Player Rewards - full art cards	2011-10-12 20:39:05 +03:00
magenoxx	3e0e1e6ecd	Updated AboutDialog.	2011-10-12 20:22:55 +04:00
magenoxx	0bb803a681	Added download tokens for ISD.	2011-10-12 13:02:01 +04:00
magenoxx	bf62ef248c	unban ISD in magiccards.info image source	2011-10-12 12:53:30 +04:00
North	f4aa7fb71f	Added remaing sets from modern. ... Added simple cards for added sets Fixed blockName for existing sets.	2011-10-10 22:21:00 +03:00
North	4b995918a2	removed ISD from unimplemented list	2011-10-10 21:53:39 +03:00
magenoxx	57d5dde609	Made ISD default opened set in Collection Viewer	2011-10-07 23:59:15 +04:00
North	8fe2ffc8f8	[ISD] Starter Decks	2011-10-07 21:40:11 +03:00
Loki	6f4d3b3963	Time Spiral set added	2011-10-06 23:58:30 +03:00
Loki	4d53d7ce00	add ISD symbol to downloading list	2011-10-06 10:26:03 +03:00
magenoxx	06b83d8a5e	Fixed transform animation.	2011-10-04 20:14:04 +04:00
magenoxx	f8c853fe4e	Test that reproduces Issue 266. Fixed Issue 266.	2011-09-28 09:00:44 +04:00
Loki	ab3a09181c	fix running client and server from bat files	2011-09-26 19:30:22 +03:00
BetaSteward	835879fe78	reformatted chat panel and game message - you can now see both areas at the same time	2011-09-25 21:53:27 -04:00
North	d050c80de0	Fixed function that reads unimplemented cards	2011-09-25 15:24:14 +03:00
North	529de2f8cf	return null if url is not available for current download source	2011-09-25 15:23:25 +03:00
magenoxx	e63bec1977	Removed repaint override in CardPanel. ... Ccaused awt deadlocks.	2011-09-25 15:08:21 +04:00
magenoxx	f3316853a2	For a while ISD images are restricted for downloading from magiccards.info ... Images have too bad quality	2011-09-25 14:25:54 +04:00
North	04a7e79ada	Added unimplemented ISD to collection viewer. ... Removed unimplemented list files for completed sets.	2011-09-25 11:56:07 +03:00
BetaSteward	5efe352305	removed modal messages in game panel	2011-09-24 22:05:19 -04:00
North	27c8514d64	minor changes (removed unused imports, added @Override ...)	2011-09-24 22:37:53 +03:00
North	e72da7f4ed	Fixes issue 260. ... Fixes download issue from magiccards.info (optimized CPU usage too).	2011-09-24 22:37:03 +03:00
magenoxx	2a25b207ea	Merge	2011-09-24 13:08:05 +04:00
North	b0b6b1186c	Download possible for Double faced cards from wizards spoilers.	2011-09-24 11:06:08 +03:00
magenoxx	617374e13f	fixed night card not displayed in the stack	2011-09-24 11:00:50 +04:00
magenoxx	a3105dae8c	Merge	2011-09-23 11:27:21 +04:00