455 commits

Author	SHA1	Message	Date
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	7d0cf3cd8c	Set version to 1.1.0 dev.	2013-07-21 22:52:25 +02: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
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	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	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	97acebacdd	Pumped version to 1.0.2.dev	2013-04-01 16:00:30 +04: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	441a9870c8	Pumped version in java files and main pom	2013-02-26 15:44:21 +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
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
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	c783cbc41f	personal game messages	2012-07-23 01:29:56 +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	9ac166abc9	updated version to r2	2012-07-03 00:38:41 +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	f44ceee263	NPE fix	2012-06-27 15:06:30 +04:00
North	239a4fb100	[refactoring][minor] Replaced all tabs with four spaces.	2012-06-19 23:50:20 +03:00
Loki	29f117fba2	update revision to r5	2012-06-14 21:10:50 +03: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	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	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	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