958 commits

Author	SHA1	Message	Date
Loki	9de37bea5a	Fixed memory leak	2012-05-06 23:40:44 +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	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	3875c1f7c0	Changed component version from 0.8.3 to 0.8.4 (dev)	2012-03-25 12:16:46 +04: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	d813283c19	adding back recent changes - not quite sure how I managed to revert all this	2012-02-02 23:48:25 -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	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
magenoxx	e901343aad	Changed version exception message. Added logging about version difference on registering (for stats).	2012-01-24 12:17:50 +04: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
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	ba6508cbeb	Updated component version from 0.8.1 to 0.8.2.	2011-12-09 13:15:07 +04:00
magenoxx	38e5ae1f03	Fixed init.txt not working for hand zone.	2011-11-05 12:38:54 +03:00
BetaSteward	8fd03a5bb5	disable timeout if game contains any non-human players	2011-11-02 21:18:25 -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
BetaSteward	ca6e1556f0	fixed several NPEs on server	2011-10-20 12:49:31 -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	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
magenoxx	5978d57298	Custom avatar for "Rahan"	2011-09-21 13:46:04 +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	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	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
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
magenoxx	03f1ce92b1	Removed session destroying on ClientDisconnectedException.	2011-08-28 18:58:24 +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
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	4cafa3fc52	Allow only actions for current priority.	2011-08-05 19:46:41 +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	830664b834	Fixed Issue 193	2011-08-02 11:34:10 +04:00
BetaSteward	14d863a8f2	added modal abilities + Slagstorm	2011-07-20 13:42:27 -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
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
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
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
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
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	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
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	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	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
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
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	017b2b4339	remove games from list when finished + added name and owner to tables	2011-05-09 23:02:54 -04: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	35f0767f1b	fixed replay + some other fixes	2011-03-18 18:27:01 -04:00
BetaSteward	4f06f78621	UI fixes - can now play simultaneous games	2011-03-04 22:46:56 -05:00
BetaSteward	51a9c03ed1	additional fixes + some missed files	2011-02-24 22:02:32 -05:00
BetaSteward	47e1a7dd87	fixed issue with X costs	2011-02-22 21:39:24 -05:00
BetaSteward	659f790325	AI fixes and deck construction	2011-02-18 23:22:31 -05: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	f7ffbb4773	added Sealed tournaments	2011-02-10 22:00:47 -05:00
BetaSteward	e2fd0299c7	fixed multi-human drafting	2011-02-08 11:34:28 -05: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	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
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
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
maurer.it	88627d5606	merge	2010-12-29 15:14:47 -05:00
BetaSteward	e460b9af20	fixed some match problems	2010-12-29 15:00:18 -05:00
maurer.it	4653a53078	Merge	2010-12-29 13:40:36 -05:00
BetaSteward	4b26727d71	changes to support multi-duel matches and sideboarding	2010-12-28 23:34:06 -05:00
maurer.it	f929d79b24	Fixes issue 19.	2010-12-26 14:06:25 -05:00
BetaSteward	6ae4ac3c5e	changes to support matches	2010-12-26 00:34:34 -05:00
BetaSteward	66d3ad1b15	updated poms with new version	2010-12-21 23:25:54 -05:00
magenoxx	2e27a676ed	[mage-tests] Added synchronization between steps. Updated bdd classes for step state handling.	2010-12-20 15:01:41 +03:00
magenoxx	1b6722f9b2	Added Mage.Tests project. Update server for test operations. Implemented bdd classes.	2010-12-20 01:03:12 +03:00
magenoxx	ddf1866d6e	Removed using bdd tests because of weird behaeve framework.	2010-12-20 00:59:11 +03:00
magenoxx	a3086fb2c4	[tests] Land story for testing playing lands.	2010-12-17 20:17:49 +03:00
magenoxx	7695b92eb1	[tests] Added bdd embedder, steps configure and runner. Added poc for starting games.	2010-12-17 20:17:18 +03:00
BetaSteward	7507a97712	check for server property	2010-12-10 10:49:56 -05:00
BetaSteward	681a030b8e	use server ip address as default	2010-12-10 10:12:57 -05:00
BetaSteward	4ad22c676d	fixed RMI timing issues + other fixes	2010-12-06 04:33:17 +00:00
BetaSteward	63d1710cb7	fixed issue 36	2010-12-05 03:36:59 +00:00
BetaSteward	5d8b5e47f3	updated server plugins	2010-12-04 03:23:12 +00:00
Loki	13e7826239	fix double included plugins	2010-12-03 13:06:18 +00:00
BetaSteward	d97286b5d8	fixes	2010-12-03 04:37:09 +00:00
Loki	592ba955f0	cleaning pom.xml, version bump to 0.5	2010-12-02 09:14:18 +00:00
BetaSteward	53d7e5623b	send list of targets to client	2010-12-02 04:39:18 +00:00
BetaSteward	3ca748e16d	fixed issue 25 - server waits for all clients to confirm initialization before starting game	2010-11-30 04:35:26 +00:00
BetaSteward	8f45bc1717	more fixes	2010-11-27 05:23:35 +00:00
BetaSteward	428609ab8b	fixes for issues 18, 19, 20, 21 + more fixes	2010-11-25 03:15:35 +00:00
Loki	7d9d2bc744	add assembly support for Mage.Server	2010-11-23 21:23:16 +00:00
Loki	5b10b13299	more cleaning	2010-11-23 21:07:06 +00:00
Loki	05ddef3629	more cleaning	2010-11-23 21:06:42 +00:00
Loki	e803d488db	more cleaning	2010-11-23 21:06:19 +00:00
magenoxx	0afe7572f4	moved xml-resources to src/main/java	2010-11-23 18:05:55 +00:00
magenoxx	0f321af7f1	move code from Mage.Server/src to Mage.Server/src/main/java	2010-11-23 17:59:24 +00:00
BetaSteward	0cd0b7045a	lots of fixes - mainly to continuous effects and zone changes	2010-11-23 05:08:45 +00:00
magenoxx	b1858396a5	Fixed NullPointerException in case card wasn't found by name. Fixed CardGrid (didn't removed mage card if card plugin was used)	2010-11-22 16:45:26 +00:00
BetaSteward	a2561515a3	fixes	2010-11-14 04:23:52 +00:00
BetaSteward	c61881e5df	fixes	2010-11-12 04:19:11 +00:00
BetaSteward	5acf46bb60	updated sets and added booster packs - commented out planechase set	2010-11-11 04:38:36 +00:00
BetaSteward	1ed7b3f486	fixes and new server plugins	2010-11-07 03:11:36 +00:00
BetaSteward	93120eedea	fixed some timing errors	2010-10-29 01:59:45 +00:00
magenoxx	b0e4549959	Reverted r270 changes for all pom files. Added some files to svn:ignore.	2010-10-28 09:16:36 +00:00
BetaSteward	3a784f59ee	...	2010-10-28 03:19:26 +00:00
magenoxx	c82d3c6dd9	Mage.Server/config/init.txt for adding cards to any zone in testMode. Fix for icon being null. Temporary fix for expansionSetCode being null for BasicLands.	2010-10-22 07:08:41 +00:00
BetaSteward	40a7ab9a4f	...	2010-10-06 02:05:54 +00:00
BetaSteward	e0b4388361	...	2010-09-25 20:35:23 +00:00
BetaSteward	3fa0e8b8f4	...	2010-09-01 03:01:43 +00:00
BetaSteward	ac69e684ad	...	2010-06-29 01:23:14 +00:00
BetaSteward	79dbfca2ff	changes to support multiplayer	2010-05-17 03:19:39 +00:00
BetaSteward	4896421f17	...	2010-05-04 02:49:07 +00:00
BetaSteward	2f32d2e6cf	...	2010-05-02 15:14:36 +00:00
BetaSteward	9013591805	latest	2010-04-16 03:51:49 +00:00
BetaSteward	a9a0075768	latest	2010-04-11 22:28:51 +00:00
BetaSteward	de6a672d24	...	2010-03-27 02:15:55 +00:00
BetaSteward	41d9cb30de	...	2010-03-21 03:54:48 +00:00
BetaSteward	5eee0c6de7	Initial	2010-03-20 03:44:53 +00:00