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

675 commits

Author SHA1 Message Date
Me Car
3bc8f4bec2 Do not register users and connect users without passwords when authentication is not activated. 2016-01-11 10:17:30 +09:00
LevelX2
a5b10b7efd Some default settings for config.xml 2016-01-10 20:58:58 +01:00
LevelX2
bc822c9677 Some minor changes for user registration. 2016-01-10 20:56:09 +01:00
Me Car
a0ddd4fff0 Send an email on successful user registration. Use Gmail API for that. Add password confirmation and email to RegisterUserDialog. 2016-01-10 18:18:38 +09:00
Me Car
835f08c18f Add a user registration dialog. 2016-01-09 06:43:10 +09:00
Me Car
787f4f010a Keep registerClient for older clients. Rename the new version to registerClientWithPassword. Add an error message on NoSuchMethodException so that this kind of version incompatibility can be handled and informed to user. 2016-01-07 23:43:28 +09:00
Me Car
32b4675f13 Integrate Shiro. 2016-01-05 03:48:43 +09:00
Me Car
d0ea7d9c37 Transfer password. 2016-01-05 02:40:05 +09:00
LevelX2
aecb2c8829 [OGW] Added surge and Crush of Tentacles. 2015-12-24 10:02:11 +01:00
Neil Gentleman
02a6780766 add Momir Basic game type 
- re-using Emblems as Vanguard cards; should probably give them their own
  CommandObject class
- setting the timing on the Momir ability to TimingRule.SORCERY causes the
  ability not to activate (?), so I've left it at INSTANT for now
- need to add a new card image source for vanguard cards
 2015-11-11 12:31:30 -08:00
LevelX2
a5d7ca83d7 Checked objects possible to cause null pointer exceptions. Added some logging. 2015-10-31 11:55:20 +01:00
LevelX2
e88c60eb85 * Scroll Rack - Fixed that the cards were shown face down if setting the order they go to library. 2015-10-31 10:33:37 +01:00
LevelX2
e2453abbb5 * Fixed a bug that some options in preferences were handled with the wrong state as long as never set manually. 2015-09-29 17:26:29 +02:00
LevelX2
b95d7ca705 * Fixed some problems with new avatar handling. 2015-09-27 14:50:44 +02:00
LevelX2
9d3619b68c * Some rework of preferences avatar panel. 2015-09-26 01:10:05 +02:00
LevelX2
2023686ee8 * Some minor changes. 2015-09-25 23:22:54 +02:00
LevelX2
758f56792e * Added button popup menu to be able to automatically answer ability related "Yes" / "No" requests (related to #328). 2015-08-28 11:44:14 +02:00
LevelX2
78071ce0a3 * Fixed a bug that order of triggered abilities of tokens were not shown to human player and the UI was locked (fixes #910). 2015-08-25 23:34:15 +02:00
LevelX2
532d4e0af0 * Added automatic handling for order of triggered abilities going to stack (fixes #701 / related to #328). 2015-08-22 19:29:57 +02:00
LevelX2
662ee7ca10 * Fixed handling of face down card selection (e.g. for Scroll Rack). 2015-08-05 17:45:45 +02:00
LevelX2
efb5e06e57 * Rollback - Fixed that UI is locked after a accepted rollback request (fixes #1158). 2015-08-02 12:39:02 +02:00
LevelX2
635c33fa87 Merge pull request #1117 from brodee/master 
random draft bug fix and random draft ui improvements
 2015-07-15 08:30:22 +02:00
brodee
c7a349f65f random draft bug fix: 
packs are forced to be 15 cards; weirdness occurs if the packs are uneven sizes including the draft ending early.
Random draft ui improvements: 
only the sets that will be used are displayed in the lobby, and the number of characters is large but still greatly reduced.
the pack selector ui will prevent you from chosing fewer than 2 packs.
 2015-07-14 22:34:58 -07:00
LevelX2
b80e27f3b3 * Fixed handling of Phyrexian mana. 2015-07-09 01:43:26 +02:00
LevelX2
d847fb7109 Some minor changes. 2015-07-08 22:51:31 +02:00
Wehk
6e5acee2dc Avatar test 
Testing access to a "normal" avatar that is not added to "available_avatars". Can't test name cases in local build.
 2015-07-06 21:53:22 +02:00
LevelX2
946af6913d Fixed NPE handling. 2015-07-03 21:05:05 +02:00
LevelX2
0cbe590cac * Fixed that mana auto-payment settings were not correctly set from previous settings on game start. 2015-07-02 13:18:12 +02:00
LevelX2
87f3978589 Some changes to userData handling. Added country flag to some dialogs. Saved and restored some more table columns width and order information. 2015-06-28 00:10:38 +02:00
LevelX2
c774e95335 * Fixed some possible java exception causes. 2015-06-27 09:32:50 +02:00
LevelX2
87f919ecac * Reworked handling of revealed and look at windows. Windows can stay open now and moved to a position and stay there. 2015-06-21 23:49:16 +02:00
LevelX2
6420666668 Some fixes to player handling. 2015-06-14 02:42:56 +02:00
LevelX2
ce26bc8ed0 Added option to deactivate to ask th eplayer in which order cards go to gaveyard. 2015-06-13 12:27:50 +02:00
LevelX2
8ae9293c98 * Added user country flag. View of image in user list is still missing. 2015-06-10 17:52:18 +02:00
LevelX2
9da44a547d Added an option that player has to confirm if he passes priority with empty stack and has mana in his pool. Implements #707. 2015-06-07 22:37:12 +02:00
LevelX2
907ec7abb0 Added new option for mana payment handling of mana already in the mana pool. Reworked the battlefield context menu a bit. 2015-06-07 17:14:43 +02:00
LevelX2
8acf28eed1 * Added optional rollback current turn and up to 3 previous turns to the battlefield menu. All other players have to agree to the rollback to let it happen. 2015-06-07 00:53:08 +02:00
LevelX2
bafd27f5b3 Identifier are shown for Looked at and revealed cards view 2015-06-03 17:05:59 +02:00
LevelX2
64ea893ea0 Some changes to logging. 2015-05-22 22:33:01 +02:00
LevelX2
ed501cad21 * Some minor adjustements/changes. 2015-05-12 23:00:34 +02:00
LevelX2
9c97953b6b Added some font color to object and player names output to game logging and feedback area. 2015-05-09 21:18:00 +02:00
North
c323c5b0b8 replaced jboss Logger usage with log4j 2015-05-06 00:38:29 +02:00
LevelX2
c2fb2de67a Fixed a bunch of NPE and other possible exceptions. 2015-04-20 23:37:28 +02:00
LevelX2
ed9d0a5fc1 Fixed a bug that user data was not set for players of tournaments (fixes #903). 2015-04-12 08:34:23 +02:00
LevelX2
c65adebc57 Fixed that to allow watchers of a game to see the hand cards of players did not work correctly. 2015-04-10 12:36:22 +02:00
LevelX2
78df43fd30 Fixed a sideboarding bug of Tiny Leaders Format (fixes #807). 2015-03-19 00:54:04 +01:00
LevelX2
6f6b35d40f Some minor changes. 2015-02-27 01:07:49 +01:00
LevelX2
38f9bb90b2 * Set the game thread name to the game id. 2015-02-12 13:51:27 +01:00
LevelX2
5727791526 * Fixed table health checking of tournament tables (waiting tournament tables were accidently removed). 2015-02-08 14:01:20 +01:00
LevelX2
adbd1bca94 * Imporoved release of draft object during draft tournament. 2015-02-06 00:23:01 +01:00
LevelX2
4e56e584b6 * Fixed that PriorityTimer was not canceled. Added gaeId to Timer name. 2015-02-05 22:43:51 +01:00
LevelX2
dd54269216 * Fixed handling of Split cards (fixes #670). 2015-02-03 00:05:30 +01:00
LevelX2
2425704305 Reset table check intervall back to 10 minutes (was accidently commited with 1 minute). 2015-02-02 12:00:44 +01:00
LevelX2
00801e3ecf * Some chnages to logging, added changes to table health check. 2015-02-02 08:40:30 +01:00
LevelX2
2544c12d48 * Some minor changes. 2015-02-01 16:47:21 +01:00
LevelX2
5701c36446 * Fixed possible null pointer exception. 2015-01-26 19:26:49 +01:00
LevelX2
6ef8b4f976 * Reworked DB comparison between client and server. 2015-01-25 19:21:50 +01:00
LevelX2
b12b044e36 * Added some basic logging for deck format validation 2015-01-21 14:40:05 +01:00
LevelX2
148994c9e5 * Fixed a bug that for players was not shown, that they play a tournament after round 1. 2015-01-07 23:43:58 +01:00
LevelX2
dd8a11ba5c * Redesigned idle timeout handling to prevent selecting wrong player for timeout. 2014-12-27 17:31:52 +01:00
LevelX2
0ef340d108 * Some rework of User/Tournament/Quit handling. 2014-12-20 17:54:02 +01:00
LevelX2
43a90c6805 Added logging statement. 2014-12-14 22:56:50 +01:00
LevelX2
6434df04b2 * Some minor changes to server logging. 2014-12-11 02:06:34 +01:00
LevelX2
b3f1cc002e * Changes to server lock handling and logging. 2014-12-10 15:00:55 +01:00
LevelX2
30869beca0 * Some changes to game start logic (better handling for disconnected users). Changes to server logging. 2014-12-08 01:30:18 +01:00
LevelX2
c5bc99b8de * Changes to session lock handling. 2014-12-05 20:14:28 +01:00
LevelX2
896793b93d * Session locking - Fixed some problems with the reentrant lock. 2014-12-01 17:00:26 +01:00
LevelX2
f85f477b90 Fixed a bug that a tournament match did not end, if a player left during sideboarding. 2014-11-27 18:41:33 +01:00
LevelX2
67479bb5a4 * Fixed wrong timer handling while other player controlled a player's turn. Attackers now marked with blue frame. Playable cards have a violet frame. If a player has to select cards from hand, the possible cards are marked yellow now. Discard of multiple cards now marks already selected cards and happens in one selection. 2014-11-26 01:48:00 +01:00
LevelX2
7e145d2cfd * Added possibility to allow other players to see hand cards of player. 2014-11-24 23:03:21 +01:00
LevelX2
c22b54d262 *Draft - Non hidden picked cards go to the deck. Hidden cards to sideboard. 2014-11-23 18:43:31 +01:00
LevelX2
b0238b402e *Changed lock handling of session to prevent continuous locking. 2014-11-23 18:42:22 +01:00
LevelX2
a82e9bfa64 * Admin console - Forced cancel user session . 2014-11-21 18:54:04 +01:00
LevelX2
751365124e * Commander - Players no longer go to a sideboarding phase during caommander matches. 2014-11-07 14:24:07 +01:00
LevelX2
65c9ca845e * Fixed a bug in table view sort. 2014-11-02 17:07:21 +01:00
LevelX2
8f642df60e Added workaround for "Comparison method violates its general contract!" message of table sort. 2014-11-02 12:09:52 +01:00
LevelX2
8426816b09 * Some changes to table and match view. 2014-11-01 14:24:23 +01:00
LevelX2
e6c7fa5f96 * Draft - Added possibility to mark a card to draft on timeout. Added sounds to draft. Changed compression of some sound files. 2014-10-31 16:22:10 +01:00
LevelX2
2ac1340af7 * Some changes to version handling. Added display of server version (incl. minor server version) in client window titel. 2014-10-31 10:35:53 +01:00
LevelX2
df71237f46 * Added logic to auto select replacement effects. Some changes to counter size and font size handling. 2014-10-30 20:40:23 +01:00
LevelX2
1241f6582b * Minor changes to logging. 2014-10-28 08:14:03 +01:00
LevelX2
6db39452cd * Fixed bug of player handling if player left during sideboarding. Added player info to show if tournament player is in sideboarding state. 2014-10-25 16:03:29 +02:00
LevelX2
c43521438d * Fixed that a check for the submitted deck was wrongly also made for limited tournaments. 2014-10-22 19:57:28 +02:00
LevelX2
7f3774deb6 Some minor changes. 2014-10-17 17:22:36 +02:00
LevelX2
400e8bf0ae Chnaged tooltip text generation of modal spells to use bullets. 2014-10-17 14:57:38 +02:00
LevelX2
d03966738e * Some changes to logging. 2014-10-13 08:39:40 +02:00
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
a10c30ac00 Changes to logging. 2014-08-11 08:33:53 +02: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
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
020daf94f5 Changes to logging an chat session handling. 2014-08-06 17:17:50 +02:00