github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
12724 commits 2 branches 0 tags 782 MiB
Commit graph

827 commits

Author SHA1 Message Date
LevelX2
bdd163080d * Draft - Show draft time and draft progress. Show game threads and ma games. Fixed a problem with AI player and password. 2014-10-12 22:37:39 +02:00
LevelX2
03337221c9 * Fixed draft start handling to prevent unneccessary waiting check start thread. 2014-10-12 12:35:24 +02:00
LevelX2
5ccc1c91ae * Tournaments - Added handling for constructed formats and password protection. 2014-10-12 04:19:28 +02:00
LevelX2
8f690f7e02 * Added option to start matches with password protection. 2014-10-11 16:29:37 +02:00
LevelX2
c96153f544 * Somem minor formatting / changes. 2014-10-10 07:58:07 +02:00
LevelX2
1f4d3b9cea * Fixed a bug that tables waiting for players were removed unintended during table health check (running every 10 minutes). 2014-10-09 16:56:25 +02:00
LevelX2
3d4072922f * Fixed a bug that stopped the match because table was wrongly removed. Happened only during sideboarding phase. 2014-10-09 08:00:00 +02:00
LevelX2
7f46323f67 * Added F7 to skip until next main phase. Added some preference options to skip handling. Clicking on phase bar opens now phase bar preferences. 2014-10-05 14:33:47 +02:00
LevelX2
8fd2a9e234 * Multiplayer - Fixed a bug that a player that left a multiplayer game was not handled correctly. Next game did not start. Running game was ended after some minutes. 2014-10-04 11:13:11 +02:00
LevelX2
845d3a7951 * Added handling to show all tournament games in tournament view. 2014-10-02 01:15:21 +02:00
LevelX2
e0ffef40cc Added possibility to set some more JBoss Remoting parameters with config.xml on server start. 2014-10-01 16:04:26 +02:00
LevelX2
ae0417bf5c Some minor changes to server. 2014-09-29 08:11:18 +02:00
LevelX2
350897b0e2 Some fixes to player quits game handling. 2014-09-28 15:45:35 +02:00
LevelX2
0a068e2258 * Fixed chat command handling (\list), the user chat input is now escaped to prevent using html tags. 2014-09-26 19:42:58 +02:00
LevelX2
070e8609f4 * Some changes to user handling / logging. 2014-09-26 15:31:56 +02:00
LevelX2
f3ea64e27c * Changed handling of phases to stop to server based handling. 2014-09-25 00:33:58 +02:00
LevelX2
aa842efacc Added F5 button to skip priority until end step of opponent. Added PlayerAction handling. 2014-09-24 16:55:51 +02:00
LevelX2
a3505b6dba Some minor changes to logging and object handling. 2014-09-21 09:40:19 +02:00
LevelX2
a57ebc5314 * Table handling - Fixed a bug that if table owner tried to create a table with invalid deck, the table was added to the finished tables with no players. 2014-09-19 13:37:59 +02:00
LevelX2
eeb22c05ee Changes to user / tournament / match handling. 2014-09-18 23:50:34 +02:00
LevelX2
3c12b23928 * Match handling - some changes to solve/workaround the draw games that cause matches not to end. Changed disconnect handling to not block the client (needs tests if works correctly). 2014-09-18 17:14:33 +02:00
LevelX2
596a129f4c Added connection info to user debug info. 2014-09-15 08:17:30 +02:00
LevelX2
dc3d6e7aa5 Changed log message. 2014-09-11 00:07:06 +02:00
LevelX2
ddeb519848 * Some changes to logging / server handling. 2014-09-10 17:14:36 +02:00
LevelX2
9c1f69983b Fixed a problem with NPE and match start. Chanes to handling of logging. 2014-09-09 07:45:53 +02:00
LevelX2
65fdaba28d Fixed some possible NPE of server. 2014-09-07 22:01:38 +02:00
LevelX2
da44199b3d Fixed possible npe in debug info generation. 2014-09-07 15:44:21 +02:00
LevelX2
c3c77e3974 * Server - Some changes to user / match / table handling. 2014-09-07 02:28:47 +02:00
LevelX2
aec56554b8 User info - Disconnect info is now shown in the Connection column. 2014-09-05 13:07:05 +02:00
LevelX2
f12a616243 Some changes to debug messages and change to avoid conccurent change exception. 2014-09-05 12:47:49 +02:00
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