Commit graph

516 commits

Author SHA1 Message Date
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
LevelX2
13d39326e0 Added Elves vs. Goblins, Jace vs. Chandra, Divine vs. Demonic and Garruk vs. Liliana as sets and the already implemented cards fo this sets. 2014-02-25 03:06:17 +01:00
LevelX2
8549f72010 * Reduced created JBoss OneWay Threads on Client from 100 to 10. Some formatting. 2014-02-21 15:03:24 +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
2b2594d993 * Tournament - Show players of tournament sorted by their tournament points. 2014-02-20 15:03:14 +01:00
LevelX2
e40b44ed79 * Tables - Added the possibility to show the tournament panel for finished tournaments. 2014-02-20 12:10:15 +01:00
LevelX2
1f3687cc86 Switched to binary/source format java 1.7. 2014-02-18 17:35:32 +01:00
LevelX2
4e5de2b7f9 * Tournament handling - Finished pairing are updated now to tournament players list immediately. 2014-02-17 00:41:40 +01:00
LevelX2
6646aaf5b2 Client memory need - Removed some unneeded references. 2014-02-13 17:12:02 +01:00
LevelX2
ee76ccfee4 Added option that AbilityPicker is forced to show if ability or spell has no or only tap cost (not finished yet). 2014-02-12 17:18:06 +01:00
LevelX2
d4592b2ee2 * Simplified version info handling. 2014-02-11 19:36:05 +01:00
LevelX2
40c25fae34 Fixed some bugs in table handling. Fixed that matches were not set to finished yet, if players left match during sideboarding phase. 2014-02-07 02:04:14 +01:00
LevelX2
bf4ccf185c Some minor formatting. 2014-02-03 17:47:12 +01:00
LevelX2
9c5d5208b9 Some updates to pom dependency. 2014-02-03 17:46:19 +01:00
LevelX2
dda33f86a4 Removed more memory leaks in game and editor panes and panels of client. 2014-02-01 18:15:42 +01:00
LevelX2
1f8555447d Removed mana leaks for deck editor and draft panels. 2014-02-01 03:26:27 +01:00
LevelX2
ad71ec6aad Set Version 1.3.0. 2014-01-25 15:55:39 +01:00
LevelX2
e892d4388d * Draft shows now cards to draft in optimized size. Added some elements to cardPanel only if needed. Removed some legacy code about foiled card display. 2014-01-15 01:45:07 +01:00
LevelX2
e490d6af61 Added cubes for Sealed and Daft Tournaments. Added a simple Swiss like tournament format. 2014-01-10 19:58:55 +01:00
LevelX2
c0323c168c Added user info text that user can set. Addd chat whisper command. Some minor changes to chat. Impoved display of user list. 2014-01-09 13:26:25 +01:00
LevelX2
e9dd478848 Remove an memory leak on client if connecting multiple times to servers. 2014-01-09 13:23:57 +01:00
LevelX2
d3ba92ed17 Updated version of jboss.remoting and jobiss-common-core. 2014-01-09 13:18:30 +01:00
LevelX2
a1ba324dba * Token images - added possibility to set a original set for the token to get the correct token image if it does not exist for the card itself. Fixed a lot of not found token images. Some more have to be corrected. 2013-12-27 16:43:58 +01:00
LevelX2
0ad2d040b1 [C13] Added Azorius Herald, Oloro, Ageless Ascetic and Kingming 'Sleeping Dragon'. Sime fixes to commander handling. 2013-11-25 07:28:56 +01:00
LevelX2
77ac99b03f Added AtTheBeginningOfNextUpkeepDelayedTriggeredAbility, fixed ability picker giving not always text back for spell ability. 2013-11-17 08:33:53 +01:00
LevelX2
33c6bf1385 Ability picker shows now the name of the object instead of {this] in ability text.. 2013-11-06 14:32:50 +01:00
LevelX2
d094f291aa Pushed version to 1.2.0dev. 2013-10-26 13:01:31 +02:00
LevelX2
c22a75a6c3 * PopUp Menus -Added F2/F3/F4/F9 to menu. Set correct popup menu for watcher. 2013-10-19 18:40:20 +02:00
LevelX2
b005e7b03f * Deck generator - Fixed a bug that during the generation cards with multiple colored mana symbols of the same color were unintended rated higher. So all generated decks tend to include more or nearly only cards with double or tripple colored mana symbols ignoring all other cards. 2013-10-13 01:59:11 +02:00
LevelX2
a26b8947d0 * Showing used sets also for finished tournaments, showing start time of match or tournament in table view creation time column as the match or tournament is started. 2013-10-09 17:10:19 +02:00
LevelX2
e2532a9b11 Improvements player cancels or leaves match or tournament. Draft can replace human player by draft bot if human leaves. 2013-10-03 22:42:16 +02:00
LevelX2
0468fe7299 Show info in card tooltip of permanents if controller not equal owner. 2013-09-23 14:58:21 +02:00
LevelX2
fea6b0633a * Deck generator - Fixed a bug that the selection of mana lands did favor the overall most needed land too much. 2013-09-19 17:04:12 +02:00
LevelX2
182839d41a Added some new sound files (PlayerLost, PlayerWon, PlayerSubmittedDeck, PlayerLeft). 2013-08-31 19:00:38 +02:00
LevelX2
ae697db2d8 * Fixed possible NPE in CardView (fixes #278). 2013-08-28 16:23:04 +02:00
LevelX2
7cf2b0cc97 Fixed a bug that player names of finished matches were no longer shown in the list of fnished matches. 2013-08-23 14:35:59 +02:00
LevelX2
ae44981cfa Added a game end dialog, that shows the result of the finished game. 2013-08-07 16:50:25 +02:00
LevelX2
c3ea17bab8 Cleanup in DeckBuilder. 2013-08-04 17:52:48 +02:00
LevelX2
78dc712944 Allow to generate 40 or 60 cars decks. 2013-07-30 13:42:20 +02:00
LevelX2
7d0cf3cd8c Set version to 1.1.0 dev. 2013-07-21 22:52:25 +02:00
LevelX2
6098aa1d7c Handling of players that cancel tournament improved. 2013-07-19 14:05:56 +02:00
LevelX2
85b8edf630 Improved player quits / leaves mage handling for tournaments (not perfect yet, will more improve it). 2013-07-18 17:40:06 +02:00
Plopman
e6847a472d [Commander] Display Commander in client 2013-07-17 20:35:52 +02:00
Plopman
930e70fbbb [Commander] Added CommanderView 2013-07-17 20:33:58 +02:00
Plopman
f64aa7e6ae [Commander] Added CommandObjectView and change EmblemView (implements commandObjectView) 2013-07-17 20:33:25 +02:00
LevelX2
9838dea551 Added possibility to show tournament panel and watch tournament games (if allowed at tournament start) for spectators . 2013-07-16 17:39:02 +02:00
LevelX2
bc9dca4d8a Fixed some handling to possible NPEs. 2013-07-15 00:53:30 +02:00
LevelX2
a3e041e364 Cleaned up PhaseManager. 2013-07-07 18:18:40 +02:00
LevelX2
f540e78045 Fixed some display problems with emblems and there abilities on the stack. 2013-07-05 18:49:42 +02:00
LevelX2
42dc0d142c Improved Emblem handling. Added a MageObjectType to CardView (in progress). 2013-07-05 15:29:55 +02:00
North
96ff08dc9a Merge branch 'decouple-client'
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
2013-07-03 21:42:40 +03:00
LevelX2
7b260c960b Added a quit match option. FFA game gets no more killed if host left mage or quitted match. 2013-07-02 22:15:49 +02:00
North
5809e7783b added auto-update of database on connect 2013-07-02 22:29:35 +03:00
North
5e3970a0e0 added method for updating cards database 2013-07-02 22:29:06 +03:00
LevelX2
35433e55b8 Show match time value in table view. 2013-07-02 17:02:03 +02:00
North
e4ea8adf94 added method for updating expansions database 2013-07-02 00:32:25 +03:00
North
d541779d66 Removed embedded server from Session 2013-07-01 23:58:29 +03:00
LevelX2
06163d6ac5 Adding Player state to TournamentPlayer and TournamentPanel. 2013-07-01 17:11:44 +02:00
LevelX2
17c893799f Added a close button, tournament header infos, name in window item and movable divider bars to the tournament panel. 2013-06-29 22:30:43 +02:00
LevelX2
853810ce45 Added support for casting modal spells or activating modal abilities with more than one mode to choose. 2013-06-22 19:35:22 +02:00
LevelX2
738efcc47f Added option to select time limit (also none) on match or tournament creation. 2013-06-21 21:34:06 +02:00
magenoxx
7c187a1d2a Fixes for timers. 2013-06-20 15:50:06 +04:00
magenoxx
6532aaffdf Timers on client side. Refactored. 2013-06-20 00:17:06 +04:00
magenoxx
42dd9d81b4 Timers (In progress) 2013-06-19 17:12:31 +04:00
LevelX2
95a12028e6 Added small icon for tokens on token permanents. Token copied from permanents (Giant Adephage) show now the image of the permanent. 2013-06-17 17:00:17 +02:00
LevelX2
5216eddb71 In the card info (tooltip) tokens have now the work "Token" written below the expansion symbol. Some code cleaning concering handling of counters. 2013-06-17 13:59:23 +02:00
North
0bb110be45 [refactor] moved enums from Constants class 2013-06-16 12:28:10 +03:00
LevelX2
84df0f2c43 * Added tournament options for adjustable construction time and free mulligans
* Added duel options for free mulligans
2013-06-14 23:45:30 +02:00
LevelX2
3dbdba32e9 * Number of wins can be set for tournaments. * Current score of running matches is shown in the table list. 2013-06-10 16:25:31 +02:00
LevelX2
dec8f24c68 * The list of completed matches and tournaments shows now also columns with start and end time. 2013-06-10 14:12:24 +02:00
LevelX2
aef53bc4ce * The list of open tables shows now the codes of boosters selected for sealed or draft tournaments in the deck type column. 2013-06-10 12:38:38 +02:00
LevelX2
dbd59f1b5c Support selection of triggered abilities from cards on the stack. 2013-06-03 21:46:56 +02:00
LevelX2
31da9dcdfd [minor] Some formatting, remove unused code, changes to logging. 2013-05-19 08:29:38 +02:00
LevelX2
5336d4c0f9 Pushed version to 1.0.3 dev. 2013-05-12 16:00:25 +02:00
LevelX2
6b38cd5b18 Mage Version 1.0.2 2013-05-11 23:06:30 +02:00
LevelX2
101194acf7 Many changes to split cards handling (showing arrows and log text for fused spells., handling protection and other things correctly). 2013-05-11 20:11:58 +02:00
LevelX2
b352217e17 Some improvements to split card handling. Better display of tooltip of split cards, also added handling if not cast from hand. 2013-05-09 21:26:15 +02:00
LevelX2
b6ddaabe44 Show user name in title bar of MAGE. Clear table chat after disconnect. Remove user from chat after disconnect. Some tweaking about the messages if a user disconnected/session expired. 2013-04-29 17:18:43 +02:00
LevelX2
f644ffe041 Changed color of frame of avatar for active player to green again. Checked that a player of a game can't also watch his own game. Added a match score to the start of the game log. Changed the color of the Turn [X] message. Tips and join messages during a game are displayed in the chat panel instead the game log panel. Display of the player name when hovering over the avatar is more vertical centered. 2013-04-07 21:29:27 +02:00
magenoxx
97acebacdd Pumped version to 1.0.2.dev 2013-04-01 16:00:30 +04:00
magenoxx
143f0f76e7 Fixed #180 : Paying additional cost of Mana Leak or Spell Rupture isn't handled correct 2013-04-01 14:24:56 +04:00
LevelX2
c88093d699 The table list of current matches / tournaments shows now all names of players. 2013-03-31 20:13:04 +02:00
magenoxx
29b84e0d92 Closed #169: Make it possible to untap lands 2013-03-29 20:35:16 +04:00
magenoxx
05191e8793 Closed #168 : Enhance priority hot keys 2013-03-29 17:18:12 +04:00
LevelX2
402f7fffd9 Tournaments status is updated now and if tournament finished, it's moved to the lower finished matches view. 2013-03-27 22:31:15 +01:00
LevelX2
12a01788e6 Added a new column to the table list showing the number of wins for matches and number of used / total seats for tournaments. 2013-03-26 17:18:43 +01:00
LevelX2
a76d3ac16e Added a "-" sign between the player names in the tournament match view. 2013-03-26 15:34:39 +01:00
LevelX2
d8961a7a82 [minor] formatting 2013-03-26 13:43:24 +01:00
North
a7a565bb8f [minor] access modifer order 2013-03-10 14:53:02 +02:00
LevelX2
ec546a5ae6 Merge branch 'master' of https://github.com/magefree/mage.git 2013-03-10 13:46:02 +01:00
North
2b7471df3f [minor] removed unused imports 2013-03-10 14:17:55 +02:00
LevelX2
aa0290fd32 Set Version to 1.0.1 2013-03-10 11:40:56 +01:00
North
01eee3995c [refactor] replaced JDBC implementation of logging with OrmLite 2013-03-10 11:05:03 +02:00
LevelX2
dc131fa8dd Changes to show name and number of counter on a card. 2013-03-04 00:03:21 +01:00
North
b5e4d9e795 removed unused classes 2013-03-02 18:02:06 +02:00
magenoxx
5577d5b3a8 Changed version from 0.10.1 to 1.0.0 2013-02-26 14:11:00 +04:00
magenoxx
7f6d730975 Fixed Issue#125: Show source/reason of triggering abilites 2013-02-22 22:54:43 +04:00
LevelX2
5f3a8eb360 Changed logic of adding basic lands in deck generation and the add land function in limited deck editor to use lands from the sets of the cards in the decks. Added missing attributes to set definitions. 2013-02-03 16:54:03 +01:00
magenoxx
2c652770fb Fixed Issue#122: Check of deck and game type during creating a new table doesn't show a qualified error message 2013-01-21 21:14:22 +04:00
magenoxx
55f40d2e9d Implemented Issue#73: Enchant Player enchantments - show enchanted player 2013-01-14 18:57:13 +04:00
magenoxx
17b8619b3e Implemented Issue#106: Display emblems of players 2013-01-14 18:16:12 +04:00
magenoxx
78e1bb99d9 Fixed Issue#45: Textbox for tooltip is sometimes too small to show all the text 2013-01-07 18:02:45 +04:00
magenoxx
b9554ac31a Fixed EntityManager not setting arguments. Added class for calculating and displaying statistics. 2013-01-07 16:06:18 +04:00
Loki
aa31ef23d3 bump version to 0.10.1 2012-12-28 12:48:26 +13:00