863 commits

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