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

1227 commits

Author SHA1 Message Date
fwannmacher
a052830628 - Removed "CARD ZONE" from tooltip when it is not necessary 2016-08-08 18:30:42 -03:00
Will Hall
e2fdcb8aa3 Use "his or her" rather than "his" 2016-08-05 22:34:46 -07:00
spjspj
883b63a01d spjspj - Update to push deck List across from Client to Server for Custom Cube 2016-07-25 22:44:21 +10:00
spjspj
5e6836a8f6 spjspj - Prevent some types of spam in the main chat 2016-07-24 01:56:05 +10:00
fireshoes
99dbdef5ce Added Vintage Cube June 2016 to the cube menu. Fixed that Permeating Mass did not use LKI for creating the copy. 2016-07-22 11:52:04 -05:00
Quercitron
cba91dc1d1 Add \me chat command. 2016-07-14 02:35:21 +03:00
LevelX2
d0ecb473da Xmage 1.4.13v0 2016-07-11 22:54:43 +02:00
spjspj
26d38f0773 spjspj - Add the option of having a .dck file as a cube 2016-07-04 00:20:31 +10:00
spjspj
2eb68403cf spjspj - Add Rich Man Cube draft. This is a variation on the Rich Man set draft. It still (like cube) shouldn't let there be more than one copy of a card in the draft but will give each player a new pack from the cards that haven't been picked already each time. Allows 2 player cube drafts to be playable. 2016-06-26 12:54:59 +10:00
LevelX2
663c6fe1e9 Try to fix "Comparison method violates its general contract" error. 2016-06-18 12:55:54 +02:00
LevelX2
266a0870ca Xmage 1.4.12v0 2016-05-29 10:59:39 +02:00
Quercitron
608cab21a9 Fix that incorrect UserStats endTime can be set when rating is updated. 2016-05-21 01:55:29 +03:00
Quercitron
c781728b97 Add rating to the client (#1498) 2016-05-17 17:27:43 +03:00
Quercitron
972d59aa37 Add user rating using Glicko rating system (#1498) 2016-05-17 17:22:14 +03:00
Nathaniel Brandes
43205b6f46 Fix Angel of Jubilation. 
The Angel now properly only restricts the sacrifice of creatures.
 2016-05-09 00:26:02 -07:00
LevelX2
eb98568b8c Added Rich Man Draft to the default config.xml used by the local xmage server. 2016-04-27 15:42:45 +02:00
LevelX2
e2a8ddef0f Merge pull request #1905 from KWottrich/clean-up-java-imports 
Clean up java imports
 2016-04-26 11:37:35 +02:00
LevelX2
1fcd26fc60 xmage 1.4.11v0 2016-04-26 00:59:03 +02:00
Kenny Wottrich
f3c83d54f5 Remove Unused Imports 
Delete unused java imports that cause compiler warnings
 2016-04-24 19:50:29 -05:00
fireshoes
a4e1444d63 Added Freeform constructed format (same requirements as limited), Shadows over Innistrad block constructed format, and added Wastes as a valid basic land for Momir Basic. 2016-04-18 20:16:44 -05:00
emerald000
b9ab16d945 Remove use of maven-shade-plugin causing some Netbeans bug. 
It shouldn't be necessary anyway.
 2016-04-17 19:23:38 -04:00
LevelX2
5770dd6014 Added some lost and reconnect statistics to footer data. 2016-04-14 23:43:08 +02:00
Fenhl
430ae503c7 Change all line endings to LF 2016-04-14 16:18:01 +00:00
spjspj
bd12d17d44 spjspj - Implement new form of draft in which you simulate opening a full booster box (36 boosters) and take one at a time. Known (to me at least) colloquially as 'Rich Man's Draft' as it requires you to buy a full booster box. 2016-04-14 22:48:54 +10:00
LevelX2
41ba4c9540 Some changes to logged data and a NPE prevention. 2016-04-14 08:28:28 +02:00
fireshoes
2778ae2381 Added Legendary Cube April 2016. 2016-04-06 22:41:15 -05:00
LevelX2
bcdde0a945 XMage version 1.4.10v0 2016-04-06 22:56:02 +02:00
LevelX2
74c310de3e Fixed some more possible exception bugs. 2016-04-06 20:45:33 +02:00
spjspj
e5ca1bd6d2 spjspj - Implement a 'Use the first available mana ability for a land mode'. 
This allows people to float mana more easily and to not have to get the popup forcing them to select which mana ability they would like to activate.
There's a new option in the menu system under the Mana Payment section which is set via pressing 'Alt' and the number '1' key (aka Alt+1) (and is unset by releasing Alt+1).
Or they can set it from the right click menu as well.
 2016-04-04 20:30:28 +10:00
LevelX2
fa5dd387b4 Added check to limit the number of waiting tables a player can create at the same time. 2016-03-26 10:42:02 +01:00
spjspj
81e5c2b50e spjspj - Fix with error message. 2016-03-07 00:13:31 +11:00
spjspj
2aceb3fcef And again. 2016-03-06 23:59:00 +11:00
spjspj
6116320591 spjspj - Make mistakes in using user-chat commands less visible to the whole chat 2016-03-06 22:46:13 +11:00
LevelX2
619856c8f5 Some minor changes. 2016-03-06 10:25:11 +01:00
LevelX2
3f57012c85 Merge origin/master 
Conflicts:
	Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
 2016-03-03 23:22:06 +01:00
rkfg
b9dc5036ef Assembly fix. 2016-02-26 21:05:21 +03:00
benjamin
d2fec6c61d Added Eternal format (Legacy without reserve list cards). Fixed Issues 1133 and 1521 (Pauper Deck legality check). 2016-02-24 21:33:10 -05:00
LevelX2
e9638bcc4d Release 1.4.9v0 2016-02-21 12:58:58 +01:00
LevelX2
1835671f3d Some more changes to GUI to better support high screen resolutions. 2016-02-14 13:41:43 +01:00
LevelX2
687ab7ec6b Added some tooltips to user table headers. History is shown in tournament player table now. Changed ratio column to numberic format. 2016-02-06 21:22:51 +01:00
LevelX2
d2eb6151f1 Fixed some possible exceptions. 2016-02-06 02:12:51 +01:00
LevelX2
81af372bc1 Fixed some problems with possible ConcurrentModificationExceptions and some minor changes. 2016-01-31 23:23:09 +01:00
Me Car
284c36b756 Add allowed quit ratio option to match option and tourney option. 2016-02-01 02:25:44 +09:00
Me Car
a33aa5d2df Re-add the getHistory method. 2016-01-31 23:59:45 +09:00
LevelX2
1945e8eaa6 Fix for UserManager build error. 2016-01-31 15:46:55 +01:00
LevelX2
75f5a17135 Merge pull request #1505 from menocar/user-pane 
Split History column into Matches and Tourneys columns.
 2016-01-31 12:49:00 +01:00
LevelX2
78ac6688ea Some tests and minor changes. 2016-01-31 09:51:23 +01:00
Me Car
574e3cfd36 Split History column into Matches and Tourneys column. 2016-01-30 16:01:04 +09:00
LevelX2
0a5a571141 Fixed a problem with the history chat command for user without matches. 2016-01-26 17:09:13 +01:00
LevelX2
dc04058b00 Added missing attributes to config.cml for release. 2016-01-25 20:20:50 +01:00
Me Car
240d548c90 Suggest user registration on login failures. 2016-01-25 21:27:57 +09:00
Me Car
665601b355 Fix HISTORY command. 2016-01-24 17:59:09 +09:00
Me Car
5029806baa Update user stats DB on every table completion. 2016-01-24 14:55:19 +09:00
LevelX2
e82d6481df changed command to show history from /info to /history (or /h). 2016-01-23 17:37:25 +01:00
LevelX2
e31b12325e Added "info [username]" command to get history for offline players. Remove user info column. 2016-01-23 16:59:15 +01:00
LevelX2
151e678e84 Changed history handling for user a bit. Added history to table waiting dialog and user avatar tooltip. 2016-01-23 13:37:34 +01:00
LevelX2
24dddd3e06 Changed that player history string of all players were recreated every time the player list is updated (every 2 seconds). 2016-01-23 12:33:12 +01:00
LevelX2
5981816a4b Switch to 1.4.8 for upcoming realease. 2016-01-22 22:33:58 +01:00
LevelX2
75edce2295 Changed that mailgun or smtp server can be used to send mails from server. 2016-01-22 17:47:05 +01:00
LevelX2
dcbe2da0e6 Changed that mailgun or smtp server can be used to send mails from server. 2016-01-22 17:46:57 +01:00
Me Car
9ca8342e34 Add MailClient that uses Java Mail API to send emails. Use it instead of Mailgun client. 2016-01-22 21:40:08 +09:00
LevelX2
c38b4b9b86 Some minor syntax formatting. 2016-01-21 16:40:46 +01:00
Me Car
8a5461d73b Cache UserStats to User. 2016-01-21 00:44:50 +09:00
Me Car
46e560bd94 Removed unuseful proto fields. Added a better pom.xml documentation. Removed an unuseful logging. 2016-01-20 14:39:11 +09:00
Me Car
550648ccbe Record game histories. Compute user stats and show them in the user panel. 2016-01-20 12:47:58 +09:00
LevelX2
90322d2846 Merge origin/master 2016-01-13 23:45:08 +01:00
LevelX2
45b8a254e6 Updated server start log info. 2016-01-13 23:44:16 +01:00
Me Car
4b25e32caf Do not proceed to password reset flow when authentication is not enabled. 2016-01-14 07:12:03 +09:00
Me Car
99929b9679 Do not do IP address based user identity check when authentication is activated. 2016-01-13 22:11:23 +09:00
Me Car
7d3a9d076d Use mailgun for sending emails. 2016-01-13 00:40:44 +09:00
LevelX2
300ac022cb Fixed problem with static Pattern object. 2016-01-12 00:57:59 +01:00
Me Car
746d034461 Implement a password reset flow. 2016-01-11 21:49:02 +09:00
Me Car
f99660a451 Add some password validation. 2016-01-11 11:15:01 +09:00
Me Car
8dd1e21dba Exit early for less indentation. 2016-01-11 10:20:38 +09:00
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
121f40c019 Prepared 1.4.7. 2016-01-10 22:13:59 +01: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
LevelX2
aadc253afa Merge pull request #1442 from menocar/password 
Add a password user authentication when connecting to servers.
 2016-01-06 23:31:25 +01:00
fireshoes
9a31402e9d Added Legacy Cube 2016. [OGW] Added additional 1/4 spoilers to mtg-card-data.txt.Added Bone Saw reprint, Boulder Salvo, and Overwhelming Denial. Fixed translation on Corrupted Crossroads and Eldrazi Obligator and activation cost on General Tazri. 2016-01-05 00:30:59 -06: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
LevelX2
207f486afc * Xmage 1.4.6v0 2015-12-13 19:47:04 +01:00
fireshoes
f8ba0da7e5 [OGW] Added Mina and Denn, Wildborn. [EXP] Added filterlands. [CUBE] Renamed Holiday Cubes to Vintage Cubes. Add Vintage Cube 2016. 2015-12-07 15:13:31 -06:00
LevelX2
8957128b13 * Renamed "Historical Standard" format to "Historical Type 2" and "Super Standard" to "Super Type 2". Added Chronicles to the set lists. 2015-11-25 17:29:23 +01:00
LevelX2
0d86e8e063 Xmage 1.4.5v0 2015-11-21 10:33:43 +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
fireshoes
6a86a19408 [C15] ImplementedFiery, Mystic, Verdant, and Wretched Confluences. Added Legendary Cube. 2015-11-09 14:09:39 -06: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
fireshoes
ff71654a5f Added Adam Styborski's Pauper Cube and Army of Allah card. 2015-10-22 15:24:23 -05:00
fireshoes
3203df54c5 Merge origin/master 2015-09-29 17:19:47 -05: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
fireshoes
192fa87e58 Corrected the card list for Legacy Cube 2015 and renamed to Legacy Cube March 2015. Added Legacy Cube September 2015. [BFZ] Updated mtg-cards-data.txt for 9/14 spoilers and correct some translations. Implemented Noyan Dar, Roil Shaper; Transgress the Mind; Crumble to Dust; From Beyond; Dragonmaster Outcast reprint; Endless One; and Sylvan Scrying reprint. 2015-09-15 00:18:53 -05:00
LevelX2
9a37bd28ad Xmage 1.4.4v0 2015-09-05 12:51:07 +02:00
fireshoes
84163dd356 Added Jim Davis's Cube 2015-09-03 17:12:15 -05: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
5dbc929367 Xmage 1.4.3v0 2015-08-06 23:11:36 +02:00
LevelX2
c98577cc6a Xmage 1.4.3v0 2015-08-06 22:18:01 +02:00
LevelX2
aa67721804 Changed config.xml according Historical/Super Standard Format. 2015-08-06 15:35:14 +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
benjamin
409edab4ec Added Historical and Super Standard Validators to default configs 2015-07-27 21:46:12 -04:00
glerman
1567c4efe9 Adding Chronozoa card impl 2015-07-15 22:05:59 +03: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
LevelX2
6e2b4793f8 Fixed wrong type name in config.xml 2015-07-07 07:55:16 +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
cd0cba6ec7 XMage Release 1.4.2v0 2015-07-04 01:28:19 +02:00
LevelX2
5ba94a7ec9 * Fixed exile and return back under owner control handling (e.g. Norin the Wary did not return from command zone when commander replacement effect was used). 2015-07-03 21:08:06 +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
ca9e52f99b Merge pull request #1052 from brodee/master 
code review comments for chaos/random booster draft:
 2015-06-24 06:56:45 +02:00
Brodee
ac0aa65aab code review comments for chaos/random booster draft: 
1. rename chaos booster draft to random booster draft
2. save packs selected in the user preferences
3. print "Random Boosters" in the player draft viewer during the draft
 2015-06-23 20:59:05 -07:00
LevelX2
0a3c081ded Merge pull request #1048 from brodee/master 
Chaos booster draft implementation
 2015-06-23 21:59:46 +02:00
fireshoes
f13c1a5794 Added Holiday Cube 2015 2015-06-23 00:50:14 -05:00
brodee
e3b84eaab5 chaos booster draft implementation first check-in 2015-06-22 21:55:43 -07: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
060a468d4b Update to release 1.4.1. 2015-06-14 02:43: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
fa847e8feb * Update to version 1.4.0v0. 2015-05-12 23:11:25 +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
89f7a542a3 * Some more fixes to the name Shadowmoor. 2015-05-04 11:12:47 +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
b4b8135e4c Some minor changes. 2015-03-14 22:38:15 +01:00
fireshoes
b1a88011ab [DTK] Updated mtg-cards-data.txt for 3/3 spoilers and added Dragon Fodder, Evolving Wilds, and Dragonlord's Servant. [CUBE] Added Legacy Cube 2015 2015-03-04 12:09:03 -06:00
JRHerlehy
07db858f34 Implement Tiny Leaders for XMage 
Initial implementation of Tiny Leaders for XMage
 2015-02-28 16:16:10 -08:00
LevelX2
6f6b35d40f Some minor changes. 2015-02-27 01:07:49 +01:00
LevelX2
79e9312893 * Fixed the annoying SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" on client start. Updated a lot of POM references. Fixed warnings of Test Project. Some changes to logging. 2015-02-20 13:58:13 +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
fireshoes
086f860396 Added Fate Reforged set, Valorous Stance FRF card, KTK Block Constructed option, added missing card to Holiday 2014 Cube 2014-12-21 19:57:23 -06: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
fireshoes
218e044804 Added Holiday Cube 2014 and some new cards 2014-12-12 13:58:03 -06: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
04ba280be1 * Cube - Added The Peasant's Toolbox cube. 2014-11-08 17:20:36 +01:00
LevelX2
d7f100b24b * Added "Duel Commander" format (fixes #436). 2014-11-08 01:33:29 +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
9b6bc80f34 Added MTGO Legacy Cube. 2014-11-03 22:31:13 +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
4bbc733496 * Cubes - Added cube from www.mtgcube.com. 2014-10-29 08:58:12 +01:00
LevelX2
473204d713 *Cubes - Added Ben's cube. 2014-10-29 01:38:04 +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
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