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 |
|