1199 commits

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