1247 commits

Author	SHA1	Message	Date
LevelX2	3699b7ca3d	Fixed a bug of handling of tournament sub tables if a user left. Some chnages to match view.	2014-09-04 18:20:40 +02:00
LevelX2	b770c9d0ab	* Fixed a problem of match handling if a player left XMage during sideboarding.	2014-09-04 12:30:43 +02:00
LevelX2	6f9a6ccabf	* Fixed a bug in table expired check. Changed expired check. Some fixed for table / tournament state handling.	2014-09-03 16:17:43 +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	cb6cc62ed4	If match timer is used, the AI consumes now also time for their priority action. Some minor changes to Gamemanager.	2014-09-03 09:49:44 +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	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
LevelX2	df04bf829d	More changes to user and session handling. Fixes somes issues with client reconnect and connecting other instance.	2014-08-29 01:46:53 +02:00
LevelX2	d3a2ba683c	Some changes to user / session / chat / tournament handling (not all tested yet).	2014-08-28 17:18:36 +02:00
LevelX2	e8cfb2231c	Some minor changes.	2014-08-28 13:32:44 +02:00
LevelX2	bdde1bd45f	Fixed a bug that lets a player that has reconnected to a game and the game still last for the timeout duration the player loses wrongly because of timeout (fixes #547).	2014-08-27 22:24:42 +02:00
LevelX2	37efad7d2c	Added Release the Ants. Created package for post resolve effects and started moving post resolve effects there.	2014-08-26 17:45:13 +02:00
Dustin Conrad	f8902483ea	Lord of the Pit, Crash, Necrogen Mists, Pyrostatic Pillar, Arcane Laboratory, Oppression, Bottomless Pit implemented	2014-08-25 19:57:55 -04: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	44d9a538ee	Some minor changes to server handling.	2014-08-20 17:09:52 +02:00
LevelX2	0bc6952933	Changes to logging.	2014-08-19 08:31:57 +02:00
LevelX2	c03dc6c2b5	Some more changes to Server Console and Admin server handling.	2014-08-18 21:48:59 +02:00
LevelX2	a6332e6505	Server console - Some updates to Admin handling.	2014-08-18 17:56:21 +02:00
LevelX2	ddb9c786b4	Some changes to logging and NPE handling.	2014-08-17 20:38:57 +02:00
LevelX2	0c03ce3727	Some changes to game end handling (in hope to fix/improve server handling of games). Some chanmges to log messages.	2014-08-17 02:49:21 +02:00
LevelX2	6e4facfa8b	Fixed a spelling bug in chat help text.	2014-08-16 17:36:59 +02:00
LevelX2	9838590896	Changed lost connection handling. Changed logging message.	2014-08-14 08:15:58 +02:00
LevelX2	797ee3d945	Some minor logging and comment changes.	2014-08-13 16:58:19 +02:00
LevelX2	9020a287d6	Some NPE fixing for server and client.	2014-08-12 08:51:06 +02:00
LevelX2	4beb1ccad3	Some changes to logging.	2014-08-11 13:57:34 +02:00
magenoxx	94eedd3348	Merge branch 'master' of https://github.com/magefree/mage	2014-08-11 11:10:44 +04:00
magenoxx	58e4c66af6	Fixes #492 : Tarmogoyf p/t stats are not displayed in hand	2014-08-11 11:10:27 +04:00
LevelX2	d573f5b3cf	Merge origin/master	2014-08-11 08:34:32 +02:00
LevelX2	a10c30ac00	Changes to logging.	2014-08-11 08:33:53 +02:00
magenoxx	b9618a2074	removed server log	2014-08-11 10:23:49 +04:00
LevelX2	7992e654ff	Some changes to logging and exception handling.	2014-08-11 00:56:08 +02:00
LevelX2	80346d44da	Changes to logging and NPE checks.	2014-08-10 10:56:35 +02:00
Dustin Conrad	809d61d5ea	Use dependency management to use common versions of log4j and junit in all the projects.	2014-08-09 19:38:34 -04:00
LevelX2	2ca945fabf	Some more changes concerning ThoughtAsEffects.	2014-08-09 11:48:40 +02:00
LevelX2	708f54b66c	Some changes to logging.	2014-08-08 17:25:30 +02:00
LevelX2	49a23503a1	Some changes to logging.	2014-08-07 17:17:04 +02:00
LevelX2	471c5bed4a	* Pauper - Added pauper format.	2014-08-07 17:16:42 +02:00
LevelX2	020daf94f5	Changes to logging an chat session handling.	2014-08-06 17:17:50 +02:00
LevelX2	568984615f	* Changes to logging.	2014-08-05 07:39:13 +02: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
LevelX2	9bcbdbb73d	* Updated log4J version.	2014-08-03 14:59:51 +02:00
LevelX2	61f1ebeb80	Change to chat kill user handling (try to fix / workaround for #440).	2014-08-02 16:06:28 +02:00
LevelX2	f2fc548f08	* Fixed ChatSession handling.	2014-07-30 20:07:55 +02:00
LevelX2	ccb554dd87	Some more chages to logging.	2014-07-30 17:30:21 +02:00
LevelX2	8bf5f01c2e	Fixed a handling bug in TournamentController. Modified some debug messages.	2014-07-30 14:38:55 +02:00
LevelX2	f51e7722cc	* Changed ReplacementEffects for TARGET and COUNTER events to ContinuousRuleModifyingEffects.	2014-07-28 08:21:17 +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
LevelX2	de87cb6082	* Tournament - Fixed a bug that prevented users from quitting a tournament. Also created some problems with users that were disconnected.	2014-07-23 17:21:03 +02:00
LevelX2	9fb718c0c0	Change to debug logging.	2014-07-23 08:10:04 +02:00
LevelX2	a527e5108c	Changed debug message.	2014-07-22 08:35:42 +02:00
LevelX2	c8fca83f51	Changed debug message.	2014-07-22 08:33:31 +02:00
LevelX2	c70828bda0	Added debug messages to narrow down #440.	2014-07-21 15:19:50 +02:00
magenoxx	65a0c9fc79	[UI] Displaying creatures that can attack	2014-07-18 16:05:21 +04:00
LevelX2	7322ffb842	Added some checking for null objects.	2014-07-17 08:21:48 +02:00
magenoxx	8a9474d839	[Server] fastDbMode for starting without scanning for cards	2014-07-15 21:44:48 +04:00
LevelX2	943ff0d78d	Some minor formattings.	2014-07-14 09:05:33 +02:00
magenoxx	5fcc3b1ba8	[UI] Displaying playable cards in hand	2014-07-11 19:35:01 +04:00
LevelX2	d40a3f591d	Changes to game log.	2014-07-09 20:44:06 +02:00
LevelX2	0120808ef8	* Added try catch block for user expired handling.	2014-07-08 02:13:26 +02:00
LevelX2	18e78b8294	Some fixes to M15 cards or by M15 used classes.	2014-07-06 16:00:32 +02:00
LevelX2	30645e2ee0	Some changes to server logging.	2014-07-06 07:22:40 +02:00
LevelX2	0115052b81	* Fixed a bug that you can't create tournaments with AI players (Showing the "You can join a table only one time." message).	2014-06-30 01:04:29 +02:00
LevelX2	3ee609d98b	* Table handling - Fixed that it was possible to join a table multiple times with the same user.	2014-06-27 19:40:26 +02:00
LevelX2	d337e2cc13	* Some changes to logging.	2014-06-25 17:17:17 +02:00
LevelX2	513b012dc0	* Fixed draw handling. Fixed concede handling. Fixed message generation for game end view. Added some debug messages.	2014-06-25 01:34:11 +02:00
LevelX2	b360bb1528	Removed redundant remove user from chat call and some formatting.	2014-06-16 07:48:15 +02:00
LevelX2	6c8b818d89	* User handling - Fixed a recently added bug and added some debug messages.	2014-06-15 14:00:45 +02:00
LevelX2	d244551e3b	* Added Morph ability.	2014-06-09 17:53:55 +02:00
LevelX2	6a3b0afc09	* Mage server - Some changes to disconnect reason handling.	2014-06-09 13:16:35 +02:00
LevelX2	9dd35eced4	Added some debug messages.	2014-06-02 08:31:06 +02:00
LevelX2	ffcdb51d1b	Fixed a possible NPE in GameController.	2014-06-01 23:23:22 +02:00
LevelX2	03f01bba3b	Updated some texts, changed from MAGE to XMage.	2014-05-30 21:00:01 +02:00
LevelX2	0e71ac5e53	* Tournament handling - Fixed player handling for swiss tournament. No more quit sound or stat eif player already finished the tournament correctly.	2014-05-30 15:43:59 +02:00
LevelX2	3a5dd428e6	* Game watching - Show number of games watched by player in player list.	2014-05-29 18:21:04 +02:00
LevelX2	dad109b88e	* Control player - Fixed the phase names shown to the controlled player (fixes #415).	2014-05-28 17:29:04 +02: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
LevelX2	71fb7bf25b	Added context menu to switch between manual and automatic usage of the mana in mana pool. Manual usage is done by clicking on the mana symbol in the player panel. Still some fine tuning to do.	2014-05-24 02:56:35 +02:00
LevelX2	0739a5826e	Added some logic to prevent error if player does not submit a deck in limited format.	2014-05-19 08:24:14 +02:00
LevelX2	2d109222a8	* Changed some links and messages.	2014-05-11 20:45:20 +02:00
magenoxx	c8ea8e7260	Added error handling for TournamentSession	2014-05-03 14:12:31 +05:30
LevelX2	c77c43a1b0	Changed again action that is called if timer runs out.	2014-05-03 09:27:21 +02:00
magenoxx	9f2466f42f	Merge changes	2014-05-03 11:00:05 +05:30
LevelX2	21149dc0ac	* Undo wrongly removed generic Exception hadling,	2014-05-02 09:34:36 +02:00
magenoxx	6ae4546ddb	Added comment explaining how createPlayerTimer works	2014-05-02 11:27:39 +05:30
LevelX2	473c9e207b	Fixed (probably) the player1 concedes but other player2 wins. Fixed that if player runs out of timer time or player lose of beeing idle, the match will end correctly.	2014-05-01 19:34:52 +02:00
magenoxx	517f9b6a08	Now fatat messages of the Game Worker are logged into separate magediag.log file	2014-04-30 16:42:59 +05:30
magenoxx	e82bc6e671	Added exception and error handling for game worker	2014-04-30 16:41:52 +05:30
magenoxx	9c088fa75b	Made table controller logging game id (needed as correlation id for magediag logs)	2014-04-30 16:40:39 +05:30
magenoxx	80b07e62f9	Fixed wrong comment on timer duration	2014-04-30 14:32:13 +05:30
magenoxx	bc286a0002	Added comment description for params set	2014-04-30 13:04:00 +05:30
LevelX2	915651335a	Fixed that in tournament a automatically generated deck will be submitted if player doesn't submit a deck in time (fixes #421).	2014-04-29 17:32:24 +02:00
magenoxx	74ddaa4a57	[AdminConsole] Added the possibility to end user session without kicking him/her off. Fixed bug with discarding row selection in user table	2014-04-28 18:21:55 +05:30
magenoxx	7740cc6f66	Made loading cards more verbose (Issue#423)	2014-04-28 15:43:14 +05:30
LevelX2	bc6f0f65bc	Removed not needed chat message about player leaving mage.	2014-04-26 18:45:27 +02:00
LevelX2	07bfebcd7d	* Table sorting - Fixed bug that caused wrong sorting of waiting tables to the bottom of the tables list.	2014-04-25 15:58:20 +02:00
LevelX2	628cf2e018	Fixed that user expired sceduled job died without reporting causing error. Handling changed so that if an exception raises it does not prevent the server to check expired user next time. (Hope this will workaround the existing nasty problem in user handling and show the error causing code sequence).	2014-04-25 14:57:45 +02:00
LevelX2	90b3e75435	Some minor changes to debug logging messages and server user handling.	2014-04-24 08:26:37 +02:00
LevelX2	236ebe2a12	Some changes to debug logging messages.	2014-04-23 08:12:40 +02:00
LevelX2	4e53ff73ea	Improved sorting of tables and matches.	2014-04-17 16:39:19 +02:00
LevelX2	d53a3245d6	Changes to connect messages, added some debug messages to narrow down server user handling bug.	2014-04-14 23:11:34 +02:00
LevelX2	b829ad499e	* Tournament play - Player state set to "Eliminated" as soon as he lost a match in an elimination tournament. Points for a Bye for player are shown immediately. Players finishing the last round are set to Finishedinstead of wating for next round.	2014-04-13 02:04:43 +02:00
LevelX2	50e82ef930	* User manager added some debug messages, changed remove player logic.	2014-04-12 18:17:17 +02:00
LevelX2	b03048b01a	* Tournament play - Fixed that AI players were unwanted removed from combat at the start of a new tournament round.	2014-04-12 18:15:32 +02:00
LevelX2	dda09ce535	* Eye of Ugin - Fixed tooltip text ("colorless" was missing).	2014-04-07 00:20:01 +02:00
LevelX2	85a3864140	Merge origin/master	2014-04-01 17:34:56 +02:00
LevelX2	c9f72bfc0c	* Server log - Added some logging information.	2014-04-01 17:32:48 +02:00
LevelX2	cb018dd0f0	* Changed tournament result genration and disconnect time formatting.	2014-04-01 00:07:49 +02:00
LevelX2	9ff5bcbd92	Improved reconnect and tournament handling. Reconnect time is now shown for disconneted players on player list and tournament panel. You can now reconnect (during 3 minutes) to a tournament also if meanwhile new game (after sideboarding ended) or round was started. Conceding the complete match in a tournament can no longer result in a draw, if you won games before. Quitting a tournament does now always end all active games of that quitting player.	2014-03-31 02:24:59 +02:00
LevelX2	f5ff18acfa	* Cube - Added "MTGO Cube March 2014" cube.	2014-03-29 20:44:36 +01:00
LevelX2	e9a301da3c	Added a mono blue draft cube.	2014-03-17 16:57:11 +01:00
LevelX2	af01639bd1	Updated readme.txt.	2014-03-06 21:48:08 +01:00
LevelX2	dc73d85cd0	Minor changes to readme.md. Some minor formatiing.	2014-03-02 21:58:13 +01:00
LevelX2	8d2f4cc9ac	* Draft - Added "Quit Tournament" button to draft panel. Minor formatting.	2014-02-28 17:47:27 +01:00
LevelX2	62b92f1c5d	Added Phyrexian Dreadnought.	2014-02-26 16:57:32 +01:00
LevelX2	8491b5b90b	* Cleanup of server memory handling - removed memory leaks for Chat, Player, Match, Game etc.	2014-02-21 01:13:27 +01:00
LevelX2	c7289a3810	* Some formatting. Some cleanup for server memory handling.	2014-02-20 17:49:21 +01:00
LevelX2	e346c6903f	Minor formatting.	2014-02-20 08:12:18 +01:00
LevelX2	1f3687cc86	Switched to binary/source format java 1.7.	2014-02-18 17:35:32 +01:00
LevelX2	fb8c4fcbc3	* Removed logger output used for debug.	2014-02-16 02:23:26 +01:00
LevelX2	d9f2f8a4a7	* Remove JRE6 from start scripts. Reduced Xmx value of client to 512m (should be enough and reduces problems that client does not start because of not available memory).	2014-02-15 09:30:01 +01:00
LevelX2	67e25d43bd	* Finished changes for new preference option to force showing ability picker for 0 mana spells or abilities with only tap costs.	2014-02-12 20:52:33 +01:00
LevelX2	ee76ccfee4	Added option that AbilityPicker is forced to show if ability or spell has no or only tap cost (not finished yet).	2014-02-12 17:18:06 +01:00
LevelX2	d4592b2ee2	* Simplified version info handling.	2014-02-11 19:36:05 +01:00
LevelX2	b92a2c83b9	* Memory leaks - removed some more memory leaks for match / game handling.	2014-02-11 02:23:13 +01:00
LevelX2	753ada0a01	* Fixed a cleanup problem that locked the game at game end. Minor formattings and cleanup additions.	2014-02-11 00:38:10 +01:00
LevelX2	e672e63736	* Serverstart - Show some server settings in the log.	2014-02-10 17:11:10 +01:00
LevelX2	e6f55d3b80	* Some changes to game handling to support replay in the future (not working yet).	2014-02-07 16:07:15 +01:00
LevelX2	b273074e2f	* Removed dev version string accidently committed.	2014-02-07 13:54:16 +01:00
LevelX2	40c25fae34	Fixed some bugs in table handling. Fixed that matches were not set to finished yet, if players left match during sideboarding phase.	2014-02-07 02:04:14 +01:00
LevelX2	efb04f2b9a	Merge pull request #377 from jbonofre/master ... Some improvements for Unix on Mage Server and Client	2014-02-02 16:03:25 -08:00
LevelX2	30ddcaf99b	Some changes to reduce memory leaks.	2014-01-31 15:08:40 +01:00
Jean-Baptiste Onofré	378bb6ca5e	Fix JVM arguments order to avoid weird OutOfMemoryError	2014-01-30 03:21:02 +01:00
Jean-Baptiste Onofré	67133cc2e8	Set *.sh Unix scripts executable by default	2014-01-30 03:13:43 +01:00
LevelX2	4ab572bd0e	* MageDialog - Removed some memory leaks for client dialogs (more to come soon).	2014-01-30 03:05:49 +01:00
LevelX2	c75c5ac9e1	* Some changed to avoid ConcurrentModificationExceptions (fixes #333).	2014-01-27 18:03:25 +01:00
LevelX2	926210a159	* Chat time - Fixed a bug that the chat time was not updated.	2014-01-27 15:06:14 +01:00
LevelX2	43fed81ff4	Sort user list case insensitive.	2014-01-26 11:26:45 +01:00
LevelX2	6242271ecc	Some small changes for the release.	2014-01-25 18:59:06 +01:00
LevelX2	1a744ad533	Updated server txt file to 1.3.0	2014-01-25 16:28:16 +01:00
LevelX2	ad71ec6aad	Set Version 1.3.0.	2014-01-25 15:55:39 +01:00
LevelX2	e490d6af61	Added cubes for Sealed and Daft Tournaments. Added a simple Swiss like tournament format.	2014-01-10 19:58:55 +01:00
LevelX2	c0323c168c	Added user info text that user can set. Addd chat whisper command. Some minor changes to chat. Impoved display of user list.	2014-01-09 13:26:25 +01:00
LevelX2	b724d7fe13	Mage 1.2.0 Release	2013-12-31 17:29:00 +01:00
LevelX2	46e450fa96	Mage 1.2.0 Release	2013-12-31 17:28:34 +01:00
LevelX2	05cbd90fe2	* Commander - Added commander multiplayer format. Fixed commander damage win condition to only counting combat damage. Added some info to tooltip text of commander.	2013-12-23 17:14:56 +01:00
LevelX2	c58ecf366b	Fixed possible NPE in GameController.	2013-12-08 09:36:15 +01:00
LevelX2	33c6bf1385	Ability picker shows now the name of the object instead of {this] in ability text..	2013-11-06 14:32:50 +01:00
LevelX2	3d4bb90805	Updated for release 1.2.0.	2013-10-27 08:38:38 +01:00
LevelX2	d094f291aa	Pushed version to 1.2.0dev.	2013-10-26 13:01:31 +02:00
LevelX2	6c54812068	* User list added info about games and tournaments. Fixed a logging NPE.	2013-10-21 23:58:11 +02:00
LevelX2	5a2b445e43	* Fixed a bug that tournament player was not removed correctly, if he left thetournament start panel. Changes to logging.	2013-10-21 00:38:59 +02:00
LevelX2	5f85d52837	Some changes to server logging messages.	2013-10-21 00:38:01 +02:00
LevelX2	038b15f399	* Changed some server logging.	2013-10-19 18:40:46 +02:00
LevelX2	c22a75a6c3	* PopUp Menus -Added F2/F3/F4/F9 to menu. Set correct popup menu for watcher.	2013-10-19 18:40:20 +02:00
LevelX2	51b93600e6	* Session - Added additional information for exception.	2013-10-15 00:47:13 +02:00
LevelX2	d6c1075125	* Release Mage 1.1.0 final	2013-10-12 11:22:06 +02:00
LevelX2	4513c7f7c3	Created a ConstrucedEliminationTournament (only the server plugin yet).	2013-10-10 16:19:30 +02:00
LevelX2	45c875384c	* some logging changes.	2013-10-09 17:12:14 +02:00
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	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	e2532a9b11	Improvements player cancels or leaves match or tournament. Draft can replace human player by draft bot if human leaves.	2013-10-03 22:42:16 +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	50056df24e	* TableController - Removed unneccessary warinings.	2013-09-28 14:37:10 +02:00
LevelX2	2b18ed76cb	* TableController - Removed unneccessary warinings.	2013-09-28 14:36:44 +02:00
LevelX2	a9415db2e5	Fixing some possible NPE after player left tournamen/match and submits the construct/sideborading panel.	2013-09-28 11:56:15 +02:00
LevelX2	0357dcb59d	Prevented 0 damage prevention events.	2013-09-27 16:14:13 +02:00
LevelX2	d2f83b1ade	Added Theros block format.	2013-09-24 16:54:55 +02:00
LevelX2	faafa3f8be	Fixed some possible NPE in MageServerImpl (Fixes #342).	2013-09-24 11:16:27 +02:00
LevelX2	d48a8b35fd	Added timeout duration in seconds to timeout message.	2013-09-21 19:41:59 +02:00
LevelX2	be883d6b70	Fixed that timeout for autoconcede is only applied if the player has priority. This prevents that player autoconcede if other players need more time to finish their turns.	2013-09-21 19:30:03 +02:00
LevelX2	06d5e2a4c6	* Rescue From the Underworld - small fix to the tooltip text.	2013-09-19 14:42:07 +02:00
LevelX2	182839d41a	Added some new sound files (PlayerLost, PlayerWon, PlayerSubmittedDeck, PlayerLeft).	2013-08-31 19:00:38 +02:00
LevelX2	3092373d1d	* Fixed possible NPE in TableController (fixes #298).	2013-08-28 15:51:06 +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	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	7ba3d451da	Small changes for Release 1.0.3	2013-07-21 09:46:45 +02:00
LevelX2	2e5fc5fc98	Some small changes for Release 1.0.3	2013-07-21 09:45:58 +02:00
LevelX2	ac23750310	* Fixed a bug that looked at cards were sometimes not shown (fixes #266 and fixes #264). Removed unused code.	2013-07-20 16:58:02 +02:00
LevelX2	a7a023b5c1	Fixed NPE if non tournament player submits a deck.	2013-07-19 19:14:33 +02:00
LevelX2	6098aa1d7c	Handling of players that cancel tournament improved.	2013-07-19 14:05:56 +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
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	26ca873eb6	[minor] Some text renaming.	2013-07-15 23:56:10 +02:00
LevelX2	ded726d2ef	Prevent that the tournament sub tables are deleted by expire check (delete logik must be added).	2013-07-15 15:03:38 +02:00
LevelX2	73fbfa1888	Deactivated call to replay because game savin is deactivated..	2013-07-15 01:06:53 +02:00
LevelX2	40c6ba2efc	Fixed some handling to possible NPEs.	2013-07-15 00:54:14 +02:00
Li REN	8612d17aaa	add a comment for the fix	2013-07-13 20:24:50 -04:00
Li REN	71909e8310	Add exclusion condition 'two player duel' to expire checker in TableManager. That fix the bug cause the table with AI player be removed in tournament temporarily	2013-07-13 20:19:04 -04:00
LevelX2	bb06591f53	Finished changes for priority timer, works now per match and match will be continiued after first game is finished.	2013-07-06 15:14:15 +02:00
LevelX2	0f32fc72de	Solution for the deck editor / sideboarding / construct - mockcards problem.	2013-07-06 00:44:13 +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	83ad29b0a9	Added missing change for quit match.	2013-07-02 23:49:07 +02:00
LevelX2	05b221fbbf	Added a check to TableController.	2013-07-02 23:42:33 +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	5e3970a0e0	added method for updating cards database	2013-07-02 22:29:06 +03:00
LevelX2	a71285a768	Remove table if a user disconnects only if state is waiting or starting.	2013-07-02 17:00:57 +02:00
North	e4ea8adf94	added method for updating expansions database	2013-07-02 00:32:25 +03:00
LevelX2	06163d6ac5	Adding Player state to TournamentPlayer and TournamentPanel.	2013-07-01 17:11:44 +02:00
LevelX2	ccc107f7ef	Added count for started tournaments.	2013-06-29 22:27:58 +02:00
LevelX2	c924ca8727	Posting a message to the tornament panel, if a player submits his deck.	2013-06-29 20:50:56 +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	6532aaffdf	Timers on client side. Refactored.	2013-06-20 00:17:06 +04:00
magenoxx	42dd9d81b4	Timers (In progress)	2013-06-19 17:12:31 +04:00
LevelX2	ef83ec2874	Set the server release log level property to warn.	2013-06-18 13:28:09 +02:00
North	0bb110be45	[refactor] moved enums from Constants class	2013-06-16 12:28:10 +03:00
LevelX2	aef53bc4ce	* The list of open tables shows now the codes of boosters selected for sealed or draft tournaments in the deck type column.	2013-06-10 12:38:38 +02:00
LevelX2	ef8d10a770	Some minor additions/changes to release assembly.	2013-06-08 16:56:23 +02:00
LevelX2	a734d604d5	Added mage-player-ai-draftbot to server dependencies to get it included in assembled release package.	2013-05-30 09:47:13 +02:00
LevelX2	449195daed	Added check for JRE7 directory to the windows start .bat files.	2013-05-20 17:02:58 +02:00
LevelX2	31da9dcdfd	[minor] Some formatting, remove unused code, changes to logging.	2013-05-19 08:29:38 +02:00
LevelX2	8c56231e15	[minor] some formatting	2013-05-18 14:55:50 +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	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	d00e953ad9	Added Levacy to the construced formats.	2013-05-03 08:37:30 +02:00
LevelX2	44d0df6bde	Small changes to user/chat/session handling (not finished yet).	2013-04-30 17:10:35 +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
North	a3411f2486	[cleanup] removed unused imports	2013-04-19 20:01:10 +03:00
LevelX2	6e4b06fc5b	Added server config values to check user name minimal and maximal length and allowed chars for user name. Set to 3-14 length and [^a-z0-9_] chars (ignoring case) .	2013-04-13 14:21:42 +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	a070c5a8e1	Fixed a bug that players were not removed properly from matches or tournaments they left before the match or tournament was started.	2013-04-06 02:09:04 +02:00
LevelX2	48f1560cb8	Added new AsThoughtEffectType to reveal face down cards (not a perfect solution I know, but better as using the cast type. If someone has a better idea to handle this, I'm open).	2013-04-06 00:04:21 +02:00
magenoxx	73793f6868	Merge branch 'master' of https://github.com/magefree/mage	2013-04-01 21:55:48 +04:00
magenoxx	6bc14d3da3	Updated formats in release config	2013-04-01 21:55:37 +04:00
magenoxx	97acebacdd	Pumped version to 1.0.2.dev	2013-04-01 16:00:30 +04:00
LevelX2	5afb189315	Added modern format to the constructed formats. Updated list of banned cards of constructed formats.	2013-03-31 19:14:33 +02:00
magenoxx	29b84e0d92	Closed #169: Make it possible to untap lands	2013-03-29 20:35:16 +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	8e3ebed11f	[minor] formatting	2013-03-27 17:24:51 +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	53a4caf9be	Added a " (discon.)" suffix to player names in the list of players if they are disconnected.	2013-03-26 15:36:21 +01:00
LevelX2	d8961a7a82	[minor] formatting	2013-03-26 13:43:24 +01:00
LevelX2	e52c35fec9	Show player joins message in chat window only, if player isn't already connected. Suppres posting of empty strings in the chat window.	2013-03-17 23:44:45 +01:00
North	a7a565bb8f	[minor] access modifer order	2013-03-10 14:53:02 +02:00
LevelX2	ec546a5ae6	Merge branch 'master' of https://github.com/magefree/mage.git	2013-03-10 13:46:02 +01:00
magenoxx	a3be8073e2	Moved job schedule time value to constant	2013-03-10 15:57:30 +04:00
magenoxx	a6decdbd14	Extending running schedule for the job	2013-03-10 15:33:14 +04:00
magenoxx	c1375f7b76	Job for removing expired tables	2013-03-10 15:32:06 +04:00
magenoxx	ef6d5e826e	Fixed admin pswd not always parsed correctly on server	2013-03-10 15:26:01 +04:00
LevelX2	aa0290fd32	Set Version to 1.0.1	2013-03-10 11:40:56 +01:00
LevelX2	ffcd51989e	[minor] formatting	2013-03-06 16:35:22 +01:00
LevelX2	cc96a55523	Some changes to logging.	2013-03-04 00:01:12 +01:00
magenoxx	9947fb9847	Updated server messages files	2013-02-26 15:44:56 +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	77d7523dc4	Added MaxPermSize=256m to server startup scripts in release folder	2013-02-25 13:09:08 +04:00
LevelX2	169eec0ebf	Added Commander Deck Type. Renamed block constructed deck types from "Constructed" to "Block Constructed".	2013-02-07 16:51:58 +01:00
magenoxx	2038adb707	Replaced Commander as a default game type by Two Player Duel	2013-01-21 21:18:27 +04:00
Backfir3	ef54888e01	Commander Game. Added placeholder game plugin ... - modified players life amount - updated .gitignore	2013-01-15 22:00:37 +01:00
Loki	aa31ef23d3	bump version to 0.10.1	2012-12-28 12:48:26 +13:00
North	fde10788db	removed redundant modifiers from interfaces	2012-12-20 23:45:47 +02:00
North	bee9d63dec	Removed rendundant repositories definitions from pom files	2012-11-25 12:23:26 +02:00
Loki	45316daf88	version bump to 0.10.0 dev	2012-11-17 01:46:36 +13:00
Loki	f017ab903c	version bump to 0.10.0	2012-11-15 22:47:15 +13:00
LevelX2	8ccca932c1	Added some more block formats for deck validation. Sort list.	2012-11-14 07:51:24 +01:00
LevelX2	2745d31768	Fixed a bug that created multiple uneccessary windows for every computer player behind the correct waiting for players window when you created a match or a tournament. That fixed also the bug that the Ai joint the chat with the name of the human player.	2012-11-09 16:17:23 +01:00
North	25cd490be3	[CardRepository] moved Sets, DeckImporter and CardRepository to Mage Framework	2012-11-04 12:52:02 +02:00
North	cf93d74206	[CardRepository] Added card scanning on server startup	2012-10-22 23:49:26 +03:00
North	08815ffb88	[CardRepository] Replaced findCard methods from Sets and ExpansionSet	2012-10-22 23:48:52 +03:00
LevelX2	7c44b16504	AbilityPicker shows abilities now always in the order they were defined on the object.	2012-10-10 20:43:18 +02:00
LevelX2	b64e1658e9	Prevent some exceptions if sesssion is session is expired	2012-09-24 07:36:05 +02: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
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
magenoxx	c97d5e8a35	AI enhancements	2012-08-03 16:53:01 +04:00
magenoxx	eefedc03b9	[AI] enhanced targeting. card fixes	2012-07-29 10:31:46 +04:00
magenoxx	2200fb8572	[AI] Improvements on repeating actions	2012-07-29 08:56:35 +04:00
magenoxx	1eb230e236	Fixed Issue#29: It is possible to cancel creature attack even if it must attack	2012-07-26 18:47:04 +04:00
magenoxx	0e0f90d29d	[draft] M13 draft picks	2012-07-25 20:29:25 +04:00
North	987e28cef3	[M10] Mirror of Fate	2012-07-23 23:53:24 +03:00
magenoxx	c783cbc41f	personal game messages	2012-07-23 01:29:56 +04:00
North	d773ed3d13	[filters] Replaced EvilTwin filter with predicate ... This commit also touches the targeting system. Changes were made for consistency.	2012-07-21 23:18:17 +03:00
North	5d0a832642	cleaned pom files and updated sqlight dependency	2012-07-19 21:15:09 +03:00
magenoxx	23a75c39ba	[M13] Odric Master Tactician	2012-07-18 20:45:39 +04:00
magenoxx	f92333504d	Updated server.msg.txt with hotkeys description	2012-07-18 18:50:14 +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	c304812770	Debug logging for Issue#19	2012-07-18 13:57:54 +04:00
magenoxx	fce6756d77	Skipping attack declare if skipped turn. Made F4 and F9 working on declare attackers and blockers phases	2012-07-18 10:44:08 +04:00
magenoxx	ed0af0faee	Added skip-all-turns-and-actions feature. Bound to F9.	2012-07-18 10:15:50 +04:00
magenoxx	4282afe023	Updated server plugin jars	2012-07-17 10:24:04 +04:00
North	9890d3d9c2	Removed cache objects from repository	2012-07-06 23:46:44 +03:00
magenoxx	9ac166abc9	updated version to r2	2012-07-03 00:38:41 +04:00
magenoxx	a60c05b861	Updated server message file	2012-06-29 20:22:42 +04:00
magenoxx	8f19d75374	configs	2012-06-29 20:12:35 +04:00
magenoxx	8ba88ff5f2	config changes	2012-06-29 17:19:12 +04:00
magenoxx	5541fe4163	updated version from 0.8.6.r5 to 0.8.7	2012-06-29 14:56:13 +04:00
magenoxx	354b07d50e	Draft bot - only draft picks, will be auto eliminated and doesn't participate in tournament	2012-06-28 19:32:32 +04:00
magenoxx	b5032226f4	Showing already chosen cards in choice dialog	2012-06-27 18:44:03 +04:00
magenoxx	f44ceee263	NPE fix	2012-06-27 15:06:30 +04:00
magenoxx	7d4aaec015	Card names, types file based caching	2012-06-25 14:31:28 +04:00
magenoxx	29de517736	updated plugin jars	2012-06-20 11:19:25 +04:00
North	239a4fb100	[refactoring][minor] Replaced all tabs with four spaces.	2012-06-19 23:50:20 +03:00
magenoxx	0a12e0af7e	Updated server plugin jars	2012-06-17 13:12:01 +04:00
Loki	29f117fba2	update revision to r5	2012-06-14 21:10:50 +03:00
magenoxx	5be6f78d59	Adding writting amount of mana payed for {X} cost	2012-06-12 10:38:39 +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	4e0a5c65e3	Fixed AI attacking not causing attack triggers	2012-05-29 09:09:38 +04:00
magenoxx	51ff877f8d	Commented out saving game (not used)	2012-05-28 16:18:44 +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	bebd9644be	updated jars	2012-05-25 19:23:25 +04:00
magenoxx	12b21abe52	changed version from 0.8.5 to 0.8.6	2012-05-25 19:04:40 +04:00
magenoxx	87c111a253	[AVR] 5 cards. Various fixes.	2012-05-08 18:41:39 +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	95e4ef4ff8	[mad ai] removed dynamic aggression calculation for now. doesn't work correctly	2012-05-06 23:40:38 +03:00
Loki	ee73ac75eb	npe fix appearing on server	2012-05-06 23:40:37 +03:00
Loki	a746ca680b	[load] one place server ping	2012-05-06 23:40:37 +03:00
Loki	e62f06cc54	two minute timeout	2012-05-06 23:40:36 +03:00
Loki	231582f039	optimizations	2012-05-06 23:40:34 +03:00
magenoxx	18f8fa17ad	starting server at 0.0.0.0	2012-05-04 11:05:37 +04:00
magenoxx	8a0117359f	added startServerWin7.bat like it was for client	2012-05-03 18:24:50 +04:00
magenoxx	0f950dbc50	[AVR] Miracle keyword	2012-05-01 23:59:36 +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	d10385fad2	changed "already connected" state handling	2012-04-28 03:00:11 +04:00
magenoxx	11df72593c	changed version from 0.8.4.dev to 0.8.4	2012-04-27 18:09:19 +04:00
magenoxx	deb6533bd8	[mad ai] emulating block declaration. safe block. (in progress)	2012-03-26 22:04:31 +04:00
BetaSteward	e859e142fa	2 DKA	2012-03-26 08:55:30 -04:00
magenoxx	523481b5a2	Added additional parameter for effect outcome. Updated choosing permanents for AI.	2012-03-26 10:59:04 +04:00
magenoxx	3875c1f7c0	Changed component version from 0.8.3 to 0.8.4 (dev)	2012-03-25 12:16:46 +04:00
magenoxx	f5acfcc58a	[mad ai] migrating to static attack\block algorithm	2012-03-15 20:37:02 +04:00
BetaSteward	68391a7522	fixed some NPE's and other errors	2012-02-23 15:26:57 -05:00
BetaSteward	48f5a469d4	fixes for monte carlo ai	2012-02-13 09:05:01 -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
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
BetaSteward	e6d38e6558	updated jars	2012-02-02 23:28:34 -05:00
magenoxx	b52a0f1c2c	Displaying server uptime message at the last (otherwise it is hard to inform players about anything).	2012-01-30 20:33:22 +04:00
magenoxx	803947e053	Fixed capital letters in startup scripts.	2012-01-28 22:23:21 +04:00
BetaSteward	d641a6de72	update MCTS + removed from config.xml	2012-01-27 21:40:33 -05:00
magenoxx	3434dc1a97	Added User Feedback support.	2012-01-26 22:13:44 +04:00
magenoxx	e50de69420	compilation error fix.	2012-01-26 01:59:53 +04:00
magenoxx	6defeeed1f	minor change	2012-01-26 01:53:44 +04:00
magenoxx	b9a65e7c62	MageServerImpl refactoring. More event logging.	2012-01-26 01:50:08 +04:00
magenoxx	a60c61cb00	More actions got logging. Some refactoring to use ActionWithResult.	2012-01-26 00:40:00 +04:00
magenoxx	b0a1c07067	LogService. Added saving game started event to DB. Some refactoring.	2012-01-25 20:27:08 +04:00
magenoxx	bdb2754847	Added sending broadcast message to all users on server from Admin Console.	2012-01-25 19:13:27 +04:00
BetaSteward	436a8ea440	Merge branch 'master' of ssh://109.200.159.85/var/lib/git/mage	2012-01-24 22:52:38 -05:00
BetaSteward	7fce6c552d	fixes + optimizations + updates to monte carlo ai	2012-01-24 22:51:31 -05:00
magenoxx	e901343aad	Changed version exception message. Added logging about version difference on registering (for stats).	2012-01-24 12:17:50 +04:00
magenoxx	0e3a368d66	test commit	2012-01-20 01:13:50 +04:00
magenoxx	ffd6deeabe	test commit	2012-01-20 01:12:36 +04:00
magenoxx	df44d5b666	test commit	2012-01-20 00:22:54 +04:00
magenoxx	0a8de07828	[config] updated init.txt.example	2012-01-19 02:53:17 +04:00
BetaSteward	377dd54fca	single-threaded monte carlo + some fixes	2012-01-16 18:55:35 -05:00
BetaSteward	dfffdfcf8c	latest monte carlo ai - has a memory leak	2012-01-10 21:29:53 -05:00
BetaSteward	7df6bb8db6	add step name to message	2012-01-10 21:09:11 -05:00
magenoxx	569d2c240a	Fixed Issue 424. ... Number of poison counters not updated when winning the game with an attack.	2011-12-30 17:27:40 +04:00
Loki	d0b82cb1b0	fix char case	2011-12-27 00:40:28 +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
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	af05af7050	Fixed Issue 441.	2011-12-11 15:53:34 +04:00
magenoxx	21852af144	updated server plugins jars	2011-12-09 13:30:18 +04:00
magenoxx	ba6508cbeb	Updated component version from 0.8.1 to 0.8.2.	2011-12-09 13:15:07 +04:00
BetaSteward	d7e694713c	added jar	2011-12-01 14:52:09 -05:00
BetaSteward	4651d68f95	fixed infinite loop with certain cards	2011-11-23 09:54:18 -05:00
BetaSteward	c902998fa0	fixed monte carlo NPE's	2011-11-22 13:56:00 -05:00
BetaSteward	ec297c243c	fixed shuffle event	2011-11-22 10:59:53 -05:00
magenoxx	58b959ff65	Fixes in MAD ai.	2011-11-16 10:44:55 +04:00
magenoxx	d89131e63c	Updated server messages.	2011-11-15 16:01:43 +04:00
magenoxx	38e5ae1f03	Fixed init.txt not working for hand zone.	2011-11-05 12:38:54 +03:00
magenoxx	0a300cf610	fixed wrong artifactIds used in pom.xml	2011-11-05 11:42:28 +03:00
BetaSteward	c508f07910	added monte carlo AI - still needs some work	2011-11-04 23:02:32 -04:00
BetaSteward	a1f1ed44c0	adjustment to GameState.getValue	2011-11-04 22:57:50 -04:00
BetaSteward	7c69bc6f30	fixes + optimizations + allow games to be paused and resumed	2011-11-02 21:39:03 -04:00
BetaSteward	8fd03a5bb5	disable timeout if game contains any non-human players	2011-11-02 21:18:25 -04:00
Loki	a004ced17d	artifactId to lowercase	2011-10-28 15:42:54 +04:00
magenoxx	416e8cd30b	added memory settings to scripts. fixed .command script for server.	2011-10-28 14:38:25 +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
BetaSteward	7ab5649132	some server optimizations	2011-10-27 11:20:10 -04:00
magenoxx	e97d655bd1	Fixed Issue 339.	2011-10-27 12:28:36 +04:00
BetaSteward	517a0cae26	optimizations + some fixes - mostly for monte carlo simulations	2011-10-25 15:17:42 -04:00
magenoxx	8983a26e5b	Some server NPE fixes	2011-10-24 20:48:58 +04:00
maurer.it	53d47c3228	Doh, don't need this test.dck in here.	2011-10-21 08:08:42 -04:00
maurer.it	d652ad2417	Puts the fixed ai built jar into the server's plugin path for local testing.	2011-10-21 08:08:01 -04:00
BetaSteward	ca6e1556f0	fixed several NPEs on server	2011-10-20 12:49:31 -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
magenoxx	6933c5a9f3	Added the possibility to force AI to play cards in cheat mode.	2011-10-19 19:13:51 +04:00
Loki	778b0dc15f	fix libs path for launch4j	2011-10-16 22:34:37 +03: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
magenoxx	8a668c4880	server message fix	2011-10-16 18:05:41 +04:00
magenoxx	538dd696ad	Server statistics - server uptime in hours, games played count.	2011-10-13 17:50:29 +04:00
magenoxx	a81dde0cdb	Some more fixed in choosing targets.	2011-10-12 20:03:34 +04:00
magenoxx	3cadbeb68b	Some fixes for targeting (this bug caused game freezes).	2011-10-12 19:39:58 +04:00
BetaSteward	f2c44688d0	fixed issue 93	2011-10-09 14:27:38 -04:00
magenoxx	82dcb53cb9	Target refactoring. Fixed Issue 273.	2011-10-08 12:46:34 +04:00
magenoxx	b3ac9c2f87	Fixed Issue 271	2011-10-05 00:56:11 +04:00
Loki	ab3a09181c	fix running client and server from bat files	2011-09-26 19:30:22 +03:00
magenoxx	fc275e7e5e	updated message for picking triggered abilities	2011-09-22 19:31:30 +04:00
magenoxx	9e7f3ad787	new custom avatars for me	2011-09-22 19:31:11 +04:00
BetaSteward	bbb4f8a346	fixed issue 255	2011-09-21 23:21:40 -04:00
North	3ff462e20b	Modified ExaltedAbility to use fixed target	2011-09-21 23:11:31 +03:00
magenoxx	5978d57298	Custom avatar for "Rahan"	2011-09-21 13:46:04 +04:00
BetaSteward	16aa9ad3da	Merge	2011-09-19 15:03:51 -04:00
BetaSteward	4b8d7b2649	NPH - Praetors Grasp	2011-09-19 14:51:10 -04:00
Loki	19f0a6b7b0	move Mage-Server and Mage-Client jars to lib	2011-09-19 20:58:03 +03:00
magenoxx	0d30981443	removed debug messages	2011-09-18 14:06:22 +04:00
magenoxx	2d8948b8f6	Changed version from 0.7.5 to 0.7.6	2011-09-18 13:57:43 +04:00
magenoxx	abdff12e15	Fixed MOD.	2011-09-18 13:50:13 +04:00
BetaSteward	8c011aeb36	fixed invalid deck messages + added some banned/restricted cards	2011-09-12 22:10:59 -04:00
BetaSteward	798eb7813b	fixed issue 247	2011-09-12 21:20:18 -04:00
BetaSteward	ad4b4e82c2	fixed various NPEs	2011-09-12 21:15:54 -04:00
BetaSteward	2c5463d5eb	fixed client not disconnected if error occurred during callback	2011-09-11 22:19:26 -04:00
magenoxx	444341dee9	custom avatar for "Alive"	2011-09-10 11:17:18 +04:00
magenoxx	8e9b6ac821	avatar for "loki"	2011-09-08 13:50:59 +04:00
magenoxx	33be6bd828	UserDataView. More custom avatars.	2011-09-08 10:41:52 +04:00
magenoxx	bf1a49dd0b	Sending user data. Sending avatar to server on connect.	2011-09-07 21:18:58 +04:00
BetaSteward	f5c3494723	improved replays - can now skip forward 10 moves or let the client play through the moves	2011-09-05 22:12:36 -04:00
BetaSteward	fe79ee97a9	update deck every 5 seconds while constructing or sideboarding	2011-09-04 13:23:16 -04:00
BetaSteward	ea44fc973f	added timeout on sideboard + show construct and/or sideboard on reconnect	2011-09-03 21:44:05 -04:00
magenoxx	c9a3f112b7	Fixed Issue 239.	2011-09-03 11:47:33 +04:00
magenoxx	75c04f49d1	Forgot to change version in the code.	2011-09-02 08:44:03 +04:00
magenoxx	2f58949ff7	Updated server.msg.txt	2011-09-02 08:19:06 +04:00
magenoxx	0fbc805492	Lowered version from 0.8 to 0.7.5 for release.	2011-09-02 08:18:49 +04:00
BetaSteward	f67aaf80cf	add stack trace to error dialog	2011-08-31 22:30:18 -04:00
BetaSteward	50a2edf80c	added MageVersionException - needed for automatic client download	2011-08-31 11:32:59 -04:00
BetaSteward	12d3b974d0	fixed issue 219	2011-08-30 09:01:18 -04:00
BetaSteward	b838fe36b8	cache tables and matches - refresh every 2 seconds	2011-08-29 15:52:36 -04:00
BetaSteward	7926fc5004	fixed issue 228	2011-08-29 13:06:25 -04:00
BetaSteward	19481bf961	fixed issue 94	2011-08-28 22:10:05 -04:00
North	766a412e67	Added missed branch code for issue 224	2011-08-29 01:30:58 +03:00
North	24c4b3d6c8	Fixes Issue 224	2011-08-28 23:55:32 +03:00
magenoxx	3aa947c14b	Sending options for another variant of target method - to replace Cancel by Done	2011-08-28 20:26:02 +04:00
magenoxx	03f1ce92b1	Removed session destroying on ClientDisconnectedException.	2011-08-28 18:58:24 +04:00
magenoxx	a00701c756	game.endTurn	2011-08-28 12:00:40 +04:00
magenoxx	b7d11c723c	Playing top card.	2011-08-27 16:30:39 +04:00
BetaSteward	4a653d55cd	show completed matches - view replays	2011-08-26 10:41:28 -04:00
BetaSteward	b09de12f23	Merge	2011-08-25 07:47:08 -04:00
BetaSteward	5023d13525	fixed some NPEs	2011-08-24 21:42:06 -04:00
BetaSteward	48d7afa375	catch spell and activated ability errors and rollback state - show error dialog on client	2011-08-24 12:59:51 -04:00
BetaSteward	aecdbe0778	added SimpleCardView - will reduce the amount of data passed between client and server	2011-08-22 13:54:55 -04:00
North	8fbc9da473	Changed logging level from debug to info (Server).	2011-08-22 16:25:31 +03:00
magenoxx	3a88168bdd	Added logging to file for server instance being run in IDE.	2011-08-22 14:57:03 +04:00
BetaSteward	2e0662e295	cleanup	2011-08-19 22:19:09 -04:00
BetaSteward	2ad50b2983	show Table Waiting dialog on reconnect	2011-08-18 22:47:12 -04:00
magenoxx	3f4ed0a919	Fixed choosing replacement effects for similar effects (didn't ask to choose);	2011-08-18 18:54:52 +04:00
magenoxx	6e911e88fe	Updated weight for card rating using by ai.	2011-08-17 08:22:00 +04:00
magenoxx	5d19c9cfee	Displaying "Done" button instead of "Cancel" for "target up to" effects	2011-08-12 17:39:36 +04:00
BetaSteward	3d2e77954f	prevent multiple servers from running	2011-08-11 09:11:49 -04:00
magenoxx	6c144b5fc2	Message of the Day.	2011-08-11 12:45:59 +04:00
magenoxx	a60fe86fbb	Fixed filter for "Target ANOTHER permanent" not working. Now sourceId is passed to match method. Updated sever plugins (game freezes otherwise).	2011-08-10 12:28:57 +04:00
magenoxx	4cafa3fc52	Allow only actions for current priority.	2011-08-05 19:46:41 +04:00
magenoxx	a6c3e03885	Fixed in setting priority.	2011-08-05 19:46:02 +04:00
magenoxx	7690899fab	forgot to commit a class	2011-08-05 19:03:01 +04:00
magenoxx	9223fe63ad	Control turn implementation fix.	2011-08-05 17:23:09 +04:00
magenoxx	b562f57a5c	Fixed in controlling the turn. Mindslaver works now.	2011-08-05 16:49:13 +04:00
magenoxx	98d99d01c6	splitter. still in progress.	2011-08-05 01:52:51 +04:00
magenoxx	f3334c6e92	Possibility to view other player's hands in UI.	2011-08-04 21:51:00 +04:00
magenoxx	d33bf20bf0	Attackers sorting, Blocking groups - rule 509.3. Fixed Issue 195.	2011-08-02 21:32:05 +04:00
magenoxx	830664b834	Fixed Issue 193	2011-08-02 11:34:10 +04:00
BetaSteward	0f097beb17	Merge	2011-07-24 15:05:02 -04:00
BetaSteward	84b9cbb16b	this is a big one - fixed modal targetting and refactored getText()	2011-07-21 22:04:08 -04:00
BetaSteward	14d863a8f2	added modal abilities + Slagstorm	2011-07-20 13:42:27 -04:00
BetaSteward	9ddea9d9c5	Merge with version 0.8	2011-07-17 15:49:38 -04:00
BetaSteward	7f312ed453	reconnect to drafts and tournaments	2011-07-12 23:13:50 -04:00
BetaSteward	bf2f4e3078	remove stale users after 10 minutes	2011-07-06 22:50:01 -04:00
magenoxx	1091fc3cbe	removed debug logging	2011-07-06 08:56:29 +04:00
magenoxx	e8b228af1f	Fixed Issue 122. Also fixes issue with searching cards with no actual option.	2011-07-06 08:55:32 +04:00
BetaSteward	b4b02d0f68	reconnect to games when client reconnects	2011-07-04 15:15:05 -04:00
BetaSteward	1a43757ed0	Replaced Session with User - needed for reconnect	2011-07-03 22:55:14 -04:00
North	f2f46ae9a9	Refactored cards to use BoostEnchantedEffect (with dynamic value) ... Added SigilOfTheNayanGods card	2011-07-01 21:07:59 +03:00
BetaSteward	3d540160a8	missed some files	2011-06-27 21:50:53 -04:00
BetaSteward	bdd8a2a28e	separated User from Session - will be need for reconnecting	2011-06-27 21:50:35 -04:00
magenoxx	370d042858	Fixed MasterOfTheWildHunt, now target controller gets custom message while selecting targets to response.	2011-06-26 15:32:02 +04:00
BetaSteward	526f0c09bc	fixed client ip address	2011-06-26 00:45:25 -04:00
BetaSteward	ade836c08a	added connection leasing + cleanup	2011-06-25 14:34:39 -04:00
BetaSteward	b1408507cb	added ping + code cleanup	2011-06-23 22:58:11 -04:00
BetaSteward	73939bd72c	fixes for localhost ip	2011-06-22 23:18:43 -04:00
BetaSteward	05be0a14ed	integrated jboss remoting	2011-06-22 22:37:50 -04:00
BetaSteward	34cd3bbcdc	fixed version	2011-06-22 22:32:33 -04:00
BetaSteward	a8b8d36637	updated pom files	2011-06-22 22:12:14 -04:00
magenoxx	cfa779661d	Fixed thread pool leak and work queue growing.	2011-06-22 20:36:48 +04:00
magenoxx	c7ae032d5a	Fixed possible NPE between callbacks (as client and server are not synchronized between calls)	2011-06-22 20:35:16 +04:00
magenoxx	2977afea2d	fixed socket leak.	2011-06-22 18:40:29 +04:00
BetaSteward	4dc0c33819	fixed issue 142 - damage assignment order now works with tokens	2011-06-17 23:41:32 -04:00
BetaSteward	82654f10d5	fixed issue 103 - this should catch most card logic errors, log the error on the server and trigger a message on the client	2011-06-17 22:42:04 -04:00
BetaSteward	a0192c0e47	fixed issue 160	2011-06-17 10:29:50 -04:00
BetaSteward	f1558a255a	implemented Damage Assignment Order	2011-06-16 23:02:24 -04:00
magenoxx	97eea533f3	updated version (from 0.7.3 to 0.7.4) in all pom files	2011-06-16 11:39:20 +04:00
magenoxx	8230775e0c	Updated version to 0.7.4 beta-2	2011-06-16 11:35:19 +04:00
BetaSteward	952b46bc1f	fixed tournament not starting error	2011-06-15 23:24:36 -04:00
BetaSteward	c4a3a496aa	moved Session to Mage.Common	2011-06-15 23:24:03 -04:00
BetaSteward	c38804af5f	rolled back changes since 0.7.3 R2 - going to switch client/server architecture	2011-06-14 23:09:18 -04:00
magenoxx	2a7b412a8c	[client] new chat	2011-06-14 21:08:38 +04:00
maurer.it	f5b08fcaed	Modified the <fileVersion> and <productVersion> to be dynamic based on the project.version. Modified the <originalFilename> to be mage-server.exe.	2011-06-11 21:52:33 -04:00
magenoxx	18a416d184	Change Mage version to 0.7.4-beta	2011-06-09 20:20:28 +04:00
BetaSteward	6cbd5369c3	Merge	2011-06-05 09:50:31 -04:00
BetaSteward	14891b1b77	added deck validation feedback to client + queue all RMI messages	2011-05-31 00:10:44 -04:00
BetaSteward	b676e59001	more client server improvements	2011-05-29 23:52:02 -04:00
BetaSteward	a03c084015	updated release config.xml	2011-05-29 23:49:46 -04:00
magenoxx	84b79000ff	Phyrexian mana support. NPH: Mutagenic Growth, Dismember.	2011-05-29 23:12:21 +04:00
BetaSteward	3115ee3c5c	Added deck types	2011-05-27 23:04:48 -04:00
BetaSteward	892f7cce1b	client/server overhaul - tested on localhost, remote testing pending	2011-05-24 23:52:26 -04:00
magenoxx	8afc9a1023	Forgot to change version in Server.	2011-05-20 01:17:56 +04:00
magenoxx	74c7feb470	Moved version to 0.7.3 in pom files.	2011-05-19 23:49:43 +04:00
magenoxx	cbeab91889	Minor fixes in table manager and matchImpl.	2011-05-19 23:49:15 +04:00
magenoxx	4133a13120	Non modal tablewaiting dialog (allows to chat, to create several games). Pressing "Join" causes all your games appear on top. Updated logging. Fixed removing table not working (but not fully, as game ending still doesn't work).	2011-05-19 20:07:34 +04:00
BetaSteward	94c5a0cdfb	client + server improvements	2011-05-17 21:55:20 -04:00
magenoxx	d056c8d05e	Updated mage-player-human plugin (wasn't updated after npe issue fix).	2011-05-17 01:14:41 +04:00
BetaSteward	0e66c5e030	retrying without jars	2011-05-14 23:39:41 -04:00
BetaSteward	a4c3deb7ac	Backed out changeset: 83cb579a3761	2011-05-14 23:32:22 -04:00
BetaSteward	473f6bcad9	fixed client/server ping + added server console	2011-05-14 23:28:07 -04:00
BetaSteward	55f3842464	fixed Issue 100	2011-05-13 23:11:06 -04:00
magenoxx	54adc043ec	Getting information about connected players in Mage Client (without gui part at the moment, only logging to console).	2011-05-13 20:25:46 +04:00
BetaSteward	04120e4ee3	log to console and log file	2011-05-12 21:12:29 -04:00
magenoxx	90c54aad24	Backed out changeset: 0fd3c45486e4	2011-05-12 19:32:28 +04:00
magenoxx	a9a2fbd1c2	fixed log4j.properties - wrong parameters for file	2011-05-12 19:29:33 +04:00
magenoxx	5502098e65	Merge with backout	2011-05-12 09:20:32 +04:00
magenoxx	92d42c16b5	Backed out changeset: b5d9cea65b73	2011-05-12 09:20:19 +04:00
BetaSteward	301d16128b	now need mage-player-ai.jar in lib folder + set default logging to console	2011-05-11 23:14:11 -04:00
BetaSteward	ab599dd335	added client/server ping + remove inactive connections from server	2011-05-11 22:08:11 -04:00
magenoxx	1ea69ee6c8	Fixed NPE in SessionManager.	2011-05-11 21:50:31 +04:00
magenoxx	7c18f9c6a8	Fixed NPE in SessionManager.	2011-05-11 21:50:11 +04:00
magenoxx	f78b4017bf	Added support for looking at cards (Jace, The Mind Sculptor 2nd ability). Fixed Issue 50.	2011-05-11 21:24:17 +04:00
BetaSteward	b9eac322d2	added additional logging + keep session alive for most connection errors	2011-05-10 23:57:47 -04:00
BetaSteward	346e6d3e8f	removed old AI's from config	2011-05-10 19:14:22 -04:00
Loki	28a5151131	update Launch4j	2011-05-10 18:25:22 +03:00
BetaSteward	017b2b4339	remove games from list when finished + added name and owner to tables	2011-05-09 23:02:54 -04:00
Loki	337eb9926e	Mosquito Guard, update server plugins	2011-05-09 01:34:22 +03:00
BetaSteward	a326bcda92	use different method for determining server IP	2011-05-07 23:16:38 -04:00
BetaSteward	c87328d08e	skill setting is now used by AIs	2011-05-07 23:16:00 -04:00
BetaSteward	b1ab23df37	missed file	2011-05-04 23:20:02 -04:00
BetaSteward	b81938210a	changes for public server	2011-05-04 23:18:13 -04:00
Loki	1fdc50570f	add initial Launch4j support and one card	2011-04-29 23:54:16 +03:00
magenoxx	be2fdd6487	Challenge Mode. In progress.	2011-04-29 20:32:22 +04:00
BetaSteward	86f708b17a	detect client version + client changes for AI skill level	2011-04-28 22:52:52 -04:00
BetaSteward	74bdfb9ea7	updated to version 0.7.1	2011-04-02 23:10:02 -04:00
BetaSteward	84c6ab76e0	update to version 0.7	2011-04-01 21:05:43 -04:00
BetaSteward	b1fdc03c4e	updated jars	2011-03-31 23:43:11 -04:00
BetaSteward	8287364f77	more optimizations	2011-03-24 00:09:07 -04:00
BetaSteward	35f0767f1b	fixed replay + some other fixes	2011-03-18 18:27:01 -04:00
BetaSteward	0668548f4f	more AI fixes - dont use x=0 for activated abilities	2011-03-10 22:07:13 -05:00
BetaSteward	42509dd4f8	optimizations + leave game fix	2011-03-10 22:05:15 -05:00
magenoxx	99735b368b	New testing frameworks for cards. BurntheImpure test.	2011-03-10 15:27:15 +03:00
BetaSteward	6982608043	more AI fixes	2011-03-07 22:59:55 -05:00
BetaSteward	4f06f78621	UI fixes - can now play simultaneous games	2011-03-04 22:46:56 -05:00
BetaSteward	7e00b5cc25	AI fix - better time out support	2011-03-04 21:54:45 -05:00
magenoxx	734c2fbc2d	Updated plugin jars (nullpointerexception still was there)	2011-03-01 09:33:02 +03:00
BetaSteward	a81e6da37c	a few more AI tweaks	2011-02-26 00:16:04 -05:00
BetaSteward	bc3acccf2c	fixed first turn draw skip	2011-02-26 00:15:15 -05:00
magenoxx	e9c2decd3c	Merged X value changes. Some UI fixes.	2011-02-25 20:54:54 +03:00
BetaSteward	51a9c03ed1	additional fixes + some missed files	2011-02-24 22:02:32 -05:00
BetaSteward	1945538041	added X cost options to AI	2011-02-24 22:01:04 -05:00
magenoxx	f1472d1fa4	Merge	2011-02-23 10:59:30 +03:00
BetaSteward	17f87daf5a	fixed issue with default AI playing unplayable spells	2011-02-22 21:40:25 -05:00
BetaSteward	47e1a7dd87	fixed issue with X costs	2011-02-22 21:39:24 -05:00
BetaSteward	85e1f68554	another AI fix	2011-02-21 00:20:36 -05:00
magenoxx	9bd5e95bda	Test scenario for Earthquake.	2011-02-20 02:10:04 +03:00
magenoxx	98ee9ff0c2	[mad ai] Critical AI fixes. Sync with Steward recent changes. New test command for lifes. New test scenarios.	2011-02-19 16:52:13 +03:00
BetaSteward	659f790325	AI fixes and deck construction	2011-02-18 23:22:31 -05:00
magenoxx	d579248266	updated another plugin (caused classcastexception because of recent targetimpl updates)	2011-02-18 00:32:13 +03:00
magenoxx	c1bf73c4de	updated server plugin.	2011-02-18 00:18:38 +03:00
BetaSteward	0c5261ce88	fixed canTarget error and started to convert logging to log4j	2011-02-14 14:41:29 -05:00
BetaSteward	fabcc28e46	more draft/sealed fixes	2011-02-13 08:20:14 -05:00
BetaSteward	d217d332b6	added sorting and counts to deck editor	2011-02-11 22:57:22 -05:00
BetaSteward	f7ffbb4773	added Sealed tournaments	2011-02-10 22:00:47 -05:00
magenoxx	3521b7d89f	Added "AI vs AI" test. Removed clientside tests.	2011-02-10 18:38:44 +03:00
BetaSteward	e2fd0299c7	fixed multi-human drafting	2011-02-08 11:34:28 -05:00
magenoxx	f377eee8e0	added jar.	2011-02-07 21:15:53 +03:00
magenoxx	bda75873de	Started working on new ai.	2011-02-07 21:14:50 +03:00
BetaSteward	ffc7b5bfd8	added tournaments - drafts are now a variant of tournament	2011-02-06 11:09:25 -05:00
magenoxx	5f4454c1e4	Change version to 0.6.1	2011-02-05 01:34:38 +03:00
BetaSteward	8952c96e1e	fixed Swing deadlock	2011-02-04 14:36:30 -05:00
magenoxx	f6b812bce1	Updated to version 0.6. Fixed and updated rate plugin.	2011-01-30 10:42:35 +03:00
magenoxx	76b1d94977	Reuploaded server plugins (caused targeting issue after previous commit). Enhanced Proliferate (now "Done" button is displayed instead of default "Cancel")	2011-01-28 00:30:05 +03:00
magenoxx	a1b2127962	Added options to gameclient target message.	2011-01-27 18:27:41 +03:00
BetaSteward	cb73d4a25d	added draft timing	2011-01-12 23:44:04 -05:00
magenoxx	982ee064a6	[draft] now computer chooses 2 or 3 card colors to draft starting from 3d pick.	2011-01-12 09:34:11 +03:00
maurer.it	0f514cc564	Fixes for release bundling.	2011-01-11 22:11:45 -05:00
BetaSteward	f74df18cc9	still more Deck Editor changes	2011-01-11 15:51:57 -05:00
maurer.it	01ef894fa2	merge	2011-01-11 13:49:42 -05:00
maurer.it	0a349e88dd	Release configuration for current draft stuff.	2011-01-11 13:49:27 -05:00
magenoxx	41e2342540	[draft] AI picks based on card ratings. Added debug logging for a while.	2011-01-11 20:49:36 +03:00
magenoxx	42f045a7ff	init.txt.example back	2011-01-11 02:23:13 +03:00
Loki	acfe8d1804	SOM and misc fixes	2011-01-11 00:02:23 +02:00
BetaSteward	c79758f0e5	added deck construction to draft	2011-01-09 23:33:22 -05:00
BetaSteward	03e3be90d6	draft stuff	2011-01-08 23:54:32 -05:00
BetaSteward	98d8a428a7	some more drafting stuff	2011-01-07 15:41:09 -05:00
BetaSteward	c67122b605	more draft stuff	2011-01-05 15:17:02 -05:00
BetaSteward	7bea472fff	initial drafting stuff	2011-01-03 23:52:28 -05:00