Commit graph

570 commits

Author SHA1 Message Date
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
brodee
e3b84eaab5 chaos booster draft implementation first check-in 2015-06-22 21:55:43 -07:00
LevelX2
78188d6f24 Removed dispay of card ID for looked at cards to prevent unfair use of card identity. 2015-06-22 15:31:15 +02:00
LevelX2
757b9ea99e * XMage Release 1.4.1v3 2015-06-20 13:14:06 +02:00
LevelX2
ca19cd95f2 Mage release 1.4.1v2 2015-06-15 08:25:13 +02:00
LevelX2
725e7c5454 Update version to 1.4.1v1 to fix the graphical UI problems on the client. 2015-06-14 14:53:57 +02:00
LevelX2
060a468d4b Update to release 1.4.1. 2015-06-14 02:43:16 +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
c27ef5ee97 * Started to fix color setting for cards (e.g. Painter's Serverant) #408 (not completely finished yet). 2015-06-10 01:24:38 +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
eb96b08dfa Release 1.4.0v2 2015-05-25 23:33:41 +02:00
LevelX2
76aa9c128d * Release 1.4.0v1 2015-05-24 14:50:24 +02:00
LevelX2
f5245ade01 * Game timer - Fixed that the timer count down was not shown while selecting the starting player and deciding for mulligan. 2015-05-20 23:27:00 +02:00
LevelX2
4054b6fc91 * Fixed that cards in graveyard did not show their id in tooltip. 2015-05-13 23:26:06 +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
69b381779b * Added a simple skill level to set and filter for tables. 2015-05-12 15:10:24 +02:00
LevelX2
5abcefa09e Minor changes to log and tooltip text generation. 2015-05-10 11:24:43 +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
LevelX2
9e8157827a * Fixed that face down exiled cards were revealed in player specific exile view window. 2015-05-02 12:19:09 +02:00
LevelX2
a47c0adfda Some minor fixes. 2015-04-21 00:09:29 +02:00
LevelX2
c2fb2de67a Fixed a bunch of NPE and other possible exceptions. 2015-04-20 23:37:28 +02:00
LevelX2
d245ce1ad2 * Fixed that card name text was covered by next card beneath if cards are displayed close together (library search). 2015-04-16 16:29:54 +02:00
LevelX2
4d7f1a05bf * Fixed that modes (if more than one was selected) did not resolve in the order they are written on the card but in order of selection by user. 2015-04-11 12:08:09 +02:00
LevelX2
0fb7cf8317 * Added a deck hash tag that's shown at the start of the game log to be able to identify a deck. 2015-04-11 00:47:54 +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
2723bf6cb7 * Fixed some problems with order selection of triggered abilities not showing the card images. 2015-04-04 14:11:49 +02:00
LevelX2
3d46dcc2b9 * Fixed a problem with the new faceDown state of cards handled in the game State. 2015-03-13 14:55:02 +01:00
betasteward
9ad8530dee moved faceDown property from Card to CardState 2015-03-12 22:09:12 -04:00
LevelX2
aad8edd8cc * Tiny Leader - The commander cast X times is shown now, you can use deck name "Sultai" as default commander for UBG, check that the commander card can't be again in the deck or sideboard, sideboard can also be empty now, sideboard may not include the commander. 2015-03-12 01:11:31 +01:00
LevelX2
84e2ecb8ef * Some fixes to cardState handling concerning card rules. 2015-03-11 21:03:42 +01:00
betasteward
fe2cd395a6 moved info from CardImpl to CardState and PermanentImpl + created InfoEffect for displaying rule info on Card 2015-03-10 14:57:55 -04:00
LevelX2
ecc3c8b1e4 * Daretti, Scrap Savant - Fixed a bug that the game is locked if multiple delayed triggered abilities from the emlem trigger. 2015-03-09 01:03:21 +01:00
LevelX2
e4d0c1045e Fixed a bug that counters on cards in the exile zone were not displayed. 2015-03-08 01:38:21 +01:00
LevelX2
e01301d6f6 * Fixed that counters on permanents were not shown. 2015-03-05 07:50:17 +01:00
betasteward
632573fc3e moved Watchers to Ability and moved Counters to CardState 2015-03-01 21:17:23 -05:00
LevelX2
0c73076895 * Added AlternateManaPaymentAbility interface and handling. 2015-02-20 02:15:22 +01:00
LevelX2
ea8446d097 * Added some error handling for connect to server action. 2015-02-07 18:15:11 +01:00
LevelX2
4e56e584b6 * Fixed that PriorityTimer was not canceled. Added gaeId to Timer name. 2015-02-05 22:43:51 +01:00
LevelX2
91fe62b396 Added a little spell cast during current turn counter (Storm) below the phase panel. 2015-02-03 17:31:40 +01:00
LevelX2
8d6c25b3e8 * Fixed handling of morphed cards in exile zone. 2015-01-31 12:45:54 +01:00
LevelX2
6ef8b4f976 * Reworked DB comparison between client and server. 2015-01-25 19:21:50 +01:00
LevelX2
3d55659568 * Fixed that permanets attached to non permanents (Enchant player and no curse / enchant card in graveyard) are shown wrongly attached to the first other permanent on the battlefield (fixes #632). 2015-01-24 23:21:00 +01:00
LevelX2
001e17a73e * Fixed handling of enlarged view for manifested and morphed cards. 2015-01-24 19:43:53 +01:00
LevelX2
9a61a66aab [FRF] Added Manifast Effect. 2014-12-30 20:37:22 +01:00
LevelX2
e4dbb3c9fc Some changes to framework functions, some minor changes to existing cards. 2014-12-20 18:17:12 +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
07b509684a * Fixed some handling problems with face down creatures (Ixidron). 2014-11-28 17:38:53 +01:00
LevelX2
1cdf2ab4b0 [C14] Added two planeswalker and 10 black cards. 2014-11-27 00:56:35 +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
a2484cc6d9 Added F10 to skip priority while the stack resolves. 2014-11-16 08:59:59 +01:00
LevelX2
9bdaef5b34 * Changed handling of missing deck object for player. 2014-11-05 01:06:45 +01:00
LevelX2
3645aa6488 Minor changes to table view of active tables. 2014-11-02 17:06:54 +01:00
LevelX2
39d2551996 * Some minor changes to match / tournament table view. 2014-11-02 12:11:51 +01:00
LevelX2
8426816b09 * Some changes to table and match view. 2014-11-01 14:24:23 +01:00
LevelX2
18d71a9377 * Added display of player order to the draft panel. Added tray info for next card to pick if the XMage window is not active. 2014-11-01 01:59:33 +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
b158ef4f3c * Added acustic an optical signals for use of skip buttons. 2014-10-30 23:43:32 +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
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
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
0d5326683c * Exile dialog - Fixed that cards from exile windows with mixed owners were not all shown in exile dialog. 2014-10-11 00:36:38 +02:00
LevelX2
c96153f544 * Somem minor formatting / changes. 2014-10-10 07:58:07 +02:00
LevelX2
581df41ae7 * Match - Fixed a bug during creation of game info that lets game worker die. Leading to open game workers. Stops staring new games if game thread limit is reached. 2014-10-09 00:50:35 +02:00
magenoxx
922e35ff1c Fixed NPE in tooltips for Emblem choose-trigger 2014-10-02 12:17:25 +04:00
LevelX2
845d3a7951 * Added handling to show all tournament games in tournament view. 2014-10-02 01:15:21 +02:00
LevelX2
8ac8d36c03 * Some connection handling changes. 2014-10-02 01:14:32 +02:00
LevelX2
8c9b97969e Added game duration to tournament match view. 2014-10-01 17:29:44 +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
2835a4e152 Some fixes to reconnect handling. 2014-09-28 15:45:15 +02:00
LevelX2
5275858cba * Some minor handling changes to client connect to server actions. 2014-09-27 11:23:18 +02:00
LevelX2
2c63d3bff8 * Client connect - Fixed that reconnect request was also shown if no successful connection was set up before. 2014-09-25 23:13:05 +02:00
LevelX2
341db7b01f * Morph Ability - Some fixes for displaying / handling morph cards/permanents. 2014-09-25 16:51:41 +02:00
LevelX2
f3ea64e27c * Changed handling of phases to stop to server based handling. 2014-09-25 00:33:58 +02:00
LevelX2
1e0e107868 Structures for skip phases handling on server side. 2014-09-24 17:47:23 +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
5c564906cd [KTK] Added TurnedFaceUpAllTriggeredAbility. Changed name of TurnedFaceUpTriggeredAbility. 2014-09-12 19:01:43 +02:00
LevelX2
f137f9c49c Fixed Morph handling, fixed that face down cards stay face down after zone change. 2014-09-10 00:18:03 +02:00
LevelX2
6e13b3ec14 Fixed a possible exception in MatchView. 2014-09-08 23:57:36 +02:00
LevelX2
c3c77e3974 * Server - Some changes to user / match / table handling. 2014-09-07 02:28:47 +02:00
LevelX2
d051aef63f Fixed a bug of handling of tournament sub tables if a user left. Some changes to match view. 2014-09-04 19:03:48 +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
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
e8cfb2231c Some minor changes. 2014-08-28 13:32:44 +02:00
magenoxx
78c0d76088 Reading db_log_jdbc_url from properties 2014-08-27 02:49:16 +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
magenoxx
3454b2db8a For Issue#524: added connect task timeout, reduced number of auto connection retries to one 2014-08-20 08:25:30 +04: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
magenoxx
13d80e72f1 Fixes #492 : Tarmogoyf p/t stats now also displayed in grave&exile zones 2014-08-11 13:55:07 +04:00
magenoxx
58e4c66af6 Fixes #492 : Tarmogoyf p/t stats are not displayed in hand 2014-08-11 11:10:27 +04:00
Dustin Conrad
5ed3027b9f fix null pointer when the generated deck is all artifacts. 2014-08-09 22:40:08 -04:00
LevelX2
49a23503a1 Some changes to logging. 2014-08-07 17:17:04 +02:00
magenoxx
53453243dc [UI] Exile dialog 2014-08-07 15:30:44 +04:00
magenoxx
bf7fe02a32 Issue#453: possibly correct fix for Commander abilities displayed twice 2014-07-30 22:43:18 +04:00
LevelX2
95dee0db0b Changed logging message to get more information which stack objects cause a problem and can't be shown. 2014-07-30 11:32:12 +02:00
LevelX2
ecc6295638 Added sound if player leaves table. Changed some sounds. 2014-07-26 14:59:42 +02:00
LevelX2
3a62115c3a Added icon for triggered and activated abilities on the stack to better distinct it from casting a card. 2014-07-23 17:23:49 +02:00
magenoxx
65a0c9fc79 [UI] Displaying creatures that can attack 2014-07-18 16:05:21 +04:00
magenoxx
60d04e2614 [UI] Showing choosable cards in dialog - Issue#456 2014-07-15 16:31:41 +04:00
LevelX2
12a2d020e7 * Changed handling of getting source object. Needed some change to adjust methods. 2014-07-14 09:02:06 +02:00
magenoxx
5fcc3b1ba8 [UI] Displaying playable cards in hand 2014-07-11 19:35:01 +04:00
magenoxx
2b76bbf2c6 Fixed Issue#438: Enchanted permanent can't be clicked because out of sight 2014-07-11 14:40:37 +04:00
magenoxx
f8a1b327b4 [UI] Order of cards in hand is changable 2014-07-11 10:49:00 +04:00
magenoxx
6d0d511323 [UI] Changing from card.mousePressed to card.mouseReleased. Shouldn't matter. 2014-07-10 11:00:18 +04:00
LevelX2
4e48fee679 * Changed message with XMage URL. 2014-06-29 13:36:11 +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
e57aee7fcb * Necropotence - Fixed that card name was shown as target for face down cards on stack or if player selects order of triggered effects. 2014-06-20 01:04:28 +02:00
LevelX2
b360bb1528 Removed redundant remove user from chat call and some formatting. 2014-06-16 07:48:15 +02:00
LevelX2
d244551e3b * Added Morph ability. 2014-06-09 17:53:55 +02:00
North
e43bc35c14 [refactor] removed generic parameter from Spell 2014-06-01 11:58:22 +03: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
North
2b8afe379a fixed auto reconnect feature 2014-05-28 08:35:10 +03:00
North
7e7a17e1d7 updated EntityManager to use H2 2014-05-28 07:57:58 +03:00
North
809714bc8c removed Storage interface (unused) 2014-05-28 07:57:25 +03: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
7ff932a91a Fixed a possible NPE bug in PermanentView. 2014-05-18 10:30:25 +02:00
LevelX2
d89970afde Some minor formatting. 2014-05-14 16:14:09 +02:00
LevelX2
2d109222a8 * Changed some links and messages. 2014-05-11 20:45:20 +02:00
LevelX2
866c65c496 Made head line connection info shorter, to have enough space if sreen size is small with new mem info. 2014-05-03 02:49:23 +02:00
LevelX2
3b3f136d34 Spells on the stack can now get counters. 2014-05-02 16:45:26 +02:00
LevelX2
13ac2d0103 Tournament panel - Showing the number of rounds now only if tournament is swiss style tournament. 2014-05-02 09:32:51 +02:00
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
LevelX2
6d039e4262 Tournament view some design changes and the remaining construction time and the round running time is shown. 2014-05-01 19:28:33 +02:00
LevelX2
57d1dc0f6d Some additional info to the game end window. 2014-05-01 19:27:26 +02:00
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
23e1f9196c Issue#424: Client now detects connection loss and asks for reconnecting 2014-04-28 22:02:29 +05:30
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
LevelX2
967cb8c1b5 [JOU] Added 1 card, some fixes, some formatting. 2014-04-17 08:40:12 +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
North
7f2a2ca0a3 removed dependency to trove4j (only used in DeckBuilder) 2014-04-05 21:55:35 +03:00
North
af345ac299 removed unused method from MageClient interface 2014-04-05 16:47:14 +03:00
LevelX2
253bdd5d5d Added simple preference setting to download the card images in the prefered language from magiccards.info. 2014-04-03 17:14:08 +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
c88eb2ead6 * Player types - If you connect to another MAGE server, the available player types are updated now correctly. Removed some redundant update of server information in client. 2014-03-24 14:57:55 +01:00
LevelX2
88aca77695 * Split cards - The images of split cards are now rotated in the enlarged image view (moueswheel up/down). 2014-03-13 00:20:37 +01:00
LevelX2
59d907c981 * Improved handling of enlarged images. Added mode to show other side of flip and transform cards. Added icon for copied cards and possibility to show enlarged original or copied card. 2014-03-06 21:51:51 +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