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

3277 commits

Author SHA1 Message Date
Oleg Agafonov
d08e54f6fc Missing commit for tokens from bc899e7ea5 2020-01-16 21:23:59 +04:00
Oleg Agafonov
bc899e7ea5 Added THB tokens 2020-01-16 18:51:20 +04:00
Oleg Agafonov
4c55fe701e UI: fixed rare error with game end dialog; 2020-01-14 18:21:45 +04:00
Evan Kranzler
972f3acbf8 removed references to CELD 2020-01-12 09:45:15 -05:00
LevelX2
fe2e9389f2 * Some minor code clear up. 2020-01-10 15:52:47 +01:00
Oleg Agafonov
b366a83a45 Prepare new release 2020-01-09 08:55:26 +04:00
Oleg Agafonov
339c419d4b * UI: multiple improves for adventure/split cards: 
* Split cards shows left and right mana cost (in deck editor, hand, etc);
 * Adventure cards shows adventure and normal cost (in deck editor, hand, etc);
 * Adventure cards shows adventure spell name in deck editor's list;
 * Fixed missing loading cursor in deck editor searching;
 2020-01-07 11:49:55 +04:00
Evan Kranzler
688be783aa refactored all usages of CardTypePredicate to match the new implementation 2020-01-06 13:18:17 -05:00
Oleg Agafonov
3ce1296886 * UI: fixed that RTR cards doesn't shows in deck editor's pioneer format filter; 2020-01-05 01:35:40 +04:00
Oleg Agafonov
862fe69b53 * Adventure cards - improved game logs (card hint works with adventure spell now, added original card info to cast's log); 2020-01-02 14:48:28 +04:00
Oleg Agafonov
5e5b4713ea * Adventure cards - fixed wrong card name on the stack in image render mode; 2020-01-02 05:55:44 +04:00
Oleg Agafonov
50195e8f35 * AI: fixed that computer can't target cards on battlefield if it contains tokens; 2020-01-02 04:46:20 +04:00
spjspj
5b40ca867e
Merge pull request #6110 from spjspj/master 
Add an information format for deck
 2020-01-01 17:48:37 +08:00
Oleg Agafonov
0faecb2fb6 Server: fixed missing data compress for some server's responses; 2019-12-31 04:11:23 +04:00
Oleg Agafonov
335f046357 Server improves: 
* improved /fix command to support disconnected/freezed players;
 * added chat messages about connection problem with opponents (checks players status every minute);
 * reduced timeout before remove disconnected player from waiting game dialog (from 4 to 2 minutes);
 * reduced timeout between client's pings (from 60 secs to 20 secs);
 2019-12-31 03:23:10 +04:00
spjspj
844500accf Add an information format for deck 2019-12-23 01:12:31 +11:00
Oleg Agafonov
d26fde8dbc Prepare new release 2019-12-21 18:23:15 +04:00
Oleg Agafonov
cde9957f54 * UI: added playable card marks in look-at windows; 2019-12-18 22:44:42 +04:00
LevelX2
6470fc85ef Fixed some bad layout of random booster draft tornament dialog. 2019-12-17 21:16:32 +01:00
Oleg Agafonov
1557f02b02 [THB] Added images download 2019-12-14 21:16:11 +04:00
Oleg Agafonov
9748136723 Fixed dates 2019-12-07 21:55:45 +04:00
ssouders412
50bd6cbc32
More pronoun fixes 2019-12-06 15:17:44 -05:00
ssouders412
2d3247d732
Updated pronouns to reflect current rules and oracle text 
Replaced all instances of "her or she", "him or her", and "his or her", with "they", "them", and "their", or sometimes "that player". Updated verbs where appropriate.
 2019-12-06 14:29:36 -05:00
Oleg Agafonov
7469d59eee Prepare new release 2019-11-30 01:32:54 +04:00
Oleg Agafonov
c02069114d Little fixes 2019-11-30 00:23:51 +04:00
Oleg Agafonov
236cb46125 Additional token fixes for #6032: 
- fixed wrong Elemental token images in BFZ's cards (Omnath, Locus of Rage and Seed Guardian);
 - fixed wrong Elemental token image in OGW's cards (Chandra Flamecaller);
 - removed unnecessary tokens from AKH, HOU and EMN (card duplicates);
 - fixed missing Goblin token in DOM;
 - fixed missing Bird Illusion token in GRN;
 - fixed same Zombie token in C19;
 2019-11-28 23:42:39 +04:00
Oleg Agafonov
fc08491ad6
Merge pull request #6032 from rikimaru1234321/master 
Add Commander 2019 Token
 2019-11-28 20:30:21 +01:00
Gösta
23f04efc44 Added C19 decks 2019-11-16 00:35:19 +01:00
rikimaru1234321
64f3bf3534
Merge branch 'master' into master 2019-11-08 08:29:36 +08:00
rikimaru1234321
c7994db966
Add files via upload 2019-11-07 20:18:58 +08:00
rikimaru1234321
933ec3c877
Add files via upload 2019-11-07 20:16:35 +08:00
Oleg Agafonov
4ab598a7c9 Fixed missing code in Pioneer format 2019-11-05 22:29:22 +04:00
Evan Kranzler
b49bf569ce added Pioneer format 2019-10-21 21:46:37 -04:00
acosta
35a4f1a2fd Add Centurion banlist 2019-10-16 10:44:59 +02:00
Oleg Agafonov
4dbc1aac3a * Images: added support to download Throne of Eldraine collector cards; 2019-09-30 23:06:32 +04:00
Oleg Agafonov
9d2d318a6c [ELD] added tokens 2019-09-27 22:50:18 +04:00
Oleg Agafonov
a74fb36053 * UI: fixed error in card viewer while viewing pages with tokens; 2019-09-27 22:32:44 +04:00
Oleg Agafonov
f719503a89 Prepare new release 2019-09-27 21:19:03 +04:00
Oleg Agafonov
8dc6e152af Prepare next release 2019-09-10 00:33:47 +04:00
Oleg Agafonov
2838437dd8 Added us server 2019-09-10 00:12:37 +04:00
USER
17da473c29 Merge origin/master 2019-08-26 19:06:07 +08:00
USER
6ac8e9e788 2019-08-26 12:54:23 +08:00
USER
5777de5187 2019-08-26 12:52:54 +08:00
rikimaru1234321
46243a126d
Update card-pictures-tok.txt 2019-08-25 19:07:46 +08:00
rikimaru1234321
6ffa65afa2
Add files via upload 2019-08-24 08:48:39 +08:00
rikimaru1234321
eecae92fe2
Add files via upload 2019-08-23 17:22:31 +08:00
rikimaru1234321
0f12632249
Add files via upload 2019-08-23 16:09:30 +08:00
rikimaru1234321
6df9c54ce4
Add files via upload 
Add Commander 2018 Token
 2019-08-23 10:08:46 +08:00
Oleg Agafonov
79b5d31782 * Images: added download support for Masterpiece Series Amonkhet ( 
Amonkhet Invocations);
 2019-08-18 12:28:20 +04:00
Oleg Agafonov
1510de1df8 * Added new set: MagicFest 2019 (PF19); 2019-08-05 12:12:46 +04:00
Oleg Agafonov
745fa002bc * Added new set: M20 Promo Packs (PPP1); 2019-08-05 12:10:59 +04:00
Oleg Agafonov
f576e4e9ce * Added new set: Signature Spellbook: Jace (SS1); 2019-08-05 12:03:27 +04:00
Oleg Agafonov
dedaa74da3 * Added new set: Signature Spellbook: Gideon (SS2); 2019-08-05 12:00:22 +04:00
Oleg Agafonov
f98f4237b1 * Added new set: Core Set 2020 Promos (PM20); 2019-08-05 11:55:35 +04:00
Oleg Agafonov
d5b972aab2 * Added new set: San Diego Comic-Con 2019 (PS19); 2019-08-05 11:41:44 +04:00
Oleg Agafonov
f19cb4076a [ELD] added images download 2019-08-05 11:36:09 +04:00
Oleg Agafonov
253085f3c3 [C19] added images download 2019-08-05 11:34:55 +04:00
Oleg Agafonov
847a10a73c Fixed country name 2019-07-24 20:18:57 +04:00
Ingmar Goudt
eb0cfc94f8 change some size() comparisons, to isEmpty() 2019-07-14 20:53:23 +02:00
Ingmar Goudt
5ba206111a add missing Override annotations 2019-07-14 20:28:48 +02:00
Oleg Agafonov
d6d67b78db * Added London mulligan as default mulligan type for all games (except Canadian Highlander); 2019-07-13 18:46:41 +04:00
Oleg Agafonov
bce01ce053 Sonar's fixes 2019-07-06 13:09:27 +04:00
Oleg Agafonov
8b0586fa03
Merge pull request #5863 from paulward24/master 
HashMap is not thread safe.  The existing synchronized(map) is too small, should be extended to cover the surrounding code.
 2019-06-30 18:47:31 +02:00
Oleg Agafonov
9c2714da53 * Images: added tokens from Modern Horizons (MH1); 2019-06-30 20:26:16 +04:00
Oleg Agafonov
4148a572cf [M20] added tokens 2019-06-30 19:53:48 +04:00
Oleg Agafonov
716b929877 Prepare new release 2019-06-30 18:33:29 +04:00
Oleg Agafonov
efbd36963d * UI: improves for player's panel: 
* added cards count for commander zone icon;
 * added colorized text for non empty mana pool;
 * added colorized text for playable/chooseable cards in grave/exile/command zones;
 2019-06-30 18:25:33 +04:00
Oleg Agafonov
f6123037ec * UI: added playable/activatable cards highlight in all zone and windows (mana abilities, commander, graveyard, revealed, etc); 2019-06-28 03:30:57 +04:00
Adrian Nistor
ebb2fe458b HashMap is not thread safe. The existing synchronzed(map) is too small, should be extended to cover the surrounding code. 2019-06-25 21:02:45 +00:00
Oleg Agafonov
994769e825
Merge pull request #5861 from rafaeldamasceno/fix-gatherer-sets 
Fix set symbols in gatherer
 2019-06-24 01:12:58 +02:00
rafaeldamasceno
a6f09e5e60 Fix set symbols in gatherer 2019-06-23 19:54:58 +01:00
Oleg Agafonov
b559460f77 [M20] added images download from scryfall 2019-06-23 19:08:23 +04:00
Oleg Agafonov
d0638e71af Fixed symbols and images download from wizards; 2019-06-23 18:56:25 +04:00
rafaeldamasceno
74b396d7d4 Force Scryfall URL enconding 2019-06-08 01:29:29 +01:00
Oleg Agafonov
55bc61000a Prepare new release 2019-06-06 23:03:38 +04:00
Oleg Agafonov
77e92d9186 * Fixed that snow lands can be added in draft and sealed modes (#5831); 2019-06-06 22:50:16 +04:00
Oleg Agafonov
12be28483f
Merge pull request #5805 from hitch17/mtga-deck-import 
Support for importing mtga decks.
 2019-05-30 19:08:04 +02:00
Rafael Damasceno
e76ce35467 Fix #5821 by finding in preferred set 2019-05-29 08:40:21 +01:00
Oleg Agafonov
84e0764bd4 Fixed that images download doesn't start again after too many errors; 2019-05-29 07:53:40 +04:00
Rafael Damasceno
628a7d6faa Delete extra newlines 2019-05-28 21:33:33 +01:00
Rafael Damasceno
dd929ad622 Finish meld fix, add S00 lands 2019-05-28 21:30:51 +01:00
Rafael Damasceno
286391738c Remove BFZ and OGW art variations as they're fixed upstream 2019-05-28 15:56:13 +01:00
Rafael Damasceno
6dbaa9f7cc Merge branch 'master' into scryfall-improvements 2019-05-28 15:43:03 +01:00
Rafael Damasceno
fe14ddb9e9 Delete extra newline 2019-05-28 15:23:19 +01:00
Rafael Damasceno
325ce708a1 Restore deleted method 2019-05-28 15:22:45 +01:00
Rafael Damasceno
6581df34fb Update direct links, add Spined Wurm 2019-05-28 15:20:29 +01:00
Rafael Damasceno
97938859ad Fix 6ED, E001. Connect to API using proxy 2019-05-28 15:03:06 +01:00
Rafael Damasceno
580975143c Add art variation cards 2019-05-28 15:01:06 +01:00
Rafael Damasceno
40586096c1 Remove GPX card and RNA lands direct links 2019-05-28 14:59:31 +01:00
Oleg Agafonov
9a9b304fd5 * UI: improved hand request dialog (users can ask your hand once per game, reset it by re-activate button); 2019-05-28 13:46:29 +04:00
Rafael Damasceno
d579b4b016 Better test if Card object from Scryfall has faces 2019-05-27 23:33:13 +01:00
Rafael Damasceno
2637a29a53 Refactor URL fetching, exclude front face 2019-05-27 21:35:31 +01:00
Oleg Agafonov
8ca5a3ec2e UI: added filter button for oathbreaker format 2019-05-27 18:17:34 +04:00
Oleg Agafonov
07cf5201ba * Added new game mode: Oathbreaker (#5678); 2019-05-27 16:17:15 +04:00
Rafael Damasceno
20253f6fb8 Merge branch 'master' into scryfall-improvements 2019-05-27 11:41:08 +01:00
Oleg Agafonov
adb666587b Refactor images download for #5814 2019-05-27 10:19:47 +04:00
Rafael Damasceno
879a3d6c71 Implement double faced cards URL from Scryfall 2019-05-27 00:19:15 +01:00
Oleg Agafonov
7844291632 * Added new set M19 Gift Pack (G18) with 5 new cards (#5779); 2019-05-24 15:30:25 +04:00
John Hitchings
6e0e3899b8 Merge branch 'master' into mtga-deck-import 2019-05-19 13:28:27 -07:00
Oleg Agafonov
f1e204408f Fixed umlaut 2019-05-19 22:51:18 +04:00
John Hitchings
b62d4fd20d Support for importing mtga decks. 2019-05-19 11:18:09 -07:00
Oleg Agafonov
0043257042 Disable power of war server button; 2019-05-19 11:40:58 +04:00
Oleg Agafonov
639c4fab13 Improved card render modes dialog (emblems and planes support); 2019-05-14 15:14:40 +04:00
Oleg Agafonov
fb3762a9dd
Merge pull request #5798 from hitch17/emblem-pt-npe-fix 
fix NPE when trying to draw PT on an emblem.
 2019-05-14 12:28:28 +02:00
John Hitchings
e63ba29427 fix NPE when trying to draw PT on an emblem. 2019-05-13 22:51:30 -07:00
Oleg Agafonov
bf20e7d656 Test button fix 2019-05-13 13:30:18 +04:00
Oleg Agafonov
8448afc709 Test framework: added commander games support (quick start button, "commander" command to put card as commander); 2019-05-13 13:20:41 +04:00
Oleg Agafonov
24b221ff34 Test framework: added default test deck (no more test.dck file required to start test game); 2019-05-13 10:47:53 +04:00
Oleg Agafonov
9b53c75a6a Fixed vehicle PT draws in image render mode; 2019-05-11 17:38:01 +04:00
Oleg Agafonov
5c69c66122 Removed beleron copyrighted font, fixed PT centering in mtgo render mode; 2019-05-11 16:32:35 +04:00
Oleg Agafonov
9518306016 * UI: added auto-size of PT box in mtgo render mode (large values are now visible); 2019-05-11 14:55:55 +04:00
Oleg Agafonov
5c48803ef9 * UI: improved cards appearance: 
* added colorized PT values (boosted is green, unboosted is red);
  * added toughness with damage calcs (damaged is red);
  * image render: now title and PT texts are readable/big in small cards;
  * mtgo render: improved image quality (less pixelated now);
  * mtgo render: improved PT font (bold now);
 2019-05-10 10:01:51 +04:00
Oleg Agafonov
c45f64bdec UI: improved card render test dialog (added render mode and size choose); 2019-05-06 23:16:58 +04:00
Oleg Agafonov
051c3c4ac0 UI: added test card render modes dialog (available from debug menu); 2019-05-06 20:15:39 +04:00
Oleg Agafonov
1648b84d88 Fixed missing developers list in about form; 2019-05-05 15:48:31 +04:00
Oleg Agafonov
060ebe655e * Added new game type: Freeform Commander Two Player Duel (#5771) 2019-04-30 16:35:24 +04:00
Oleg Agafonov
cb59442103
Merge pull request #5756 from mooretc2/freeform-commander-fix 
Freeform commander fix
 2019-04-28 20:23:23 +02:00
Oleg Agafonov
f238118c87 UI: removed outdated options, improved; 2019-04-27 12:22:19 +04:00
mooretc2
a05df82f75 Adding missing return 2019-04-24 17:10:31 -07:00
mooretc2
be62669e4b Fixing issue with Freeform Commander deck type 2019-04-24 16:52:50 -07:00
Oleg Agafonov
43ebdf9e94 Fixed NPE error on new systems; 2019-04-24 18:03:53 +04:00
Oleg Agafonov
bbf1c1343a Prepare release 1.4.35 2019-04-23 23:32:54 +04:00
Oleg Agafonov
c6d32bd33d [WAR] added tokens images 2019-04-23 23:32:09 +04:00
Oleg Agafonov
d1e2fc860d * UI: fixed that cards from Masterpiece Series don't draw selectable frames (#5505); 2019-04-23 13:47:50 +04:00
Oleg Agafonov
ba1c6de2cd * UI: fixed that sideboarding load side cards without user's sorting; 2019-04-20 06:41:16 +04:00
Oleg Agafonov
3fa97d47c6 Improved timeout updates for slow server 2019-04-19 18:19:02 +04:00
Oleg Agafonov
c95f14f64c * UI: fixed that server messages and tables list is not refresh after re-connect (#4194); 2019-04-19 17:37:26 +04:00
Oleg Agafonov
bd06d3df51
Merge pull request #5711 from hitch17/draft-log-deck-importer 
Ability to import draft logs as decks.
 2019-04-13 05:23:33 +02:00
Oleg Agafonov
ee2741c7a7 * UI: fixed non closeable card popup hints, fixed memory leaks (#4983, #2803); 2019-04-12 17:55:25 +04:00
Oleg Agafonov
fe9c3fbae8 Fixed bloated connection errors in logs; 
Fixed that data update tasks runs after disconnect;
 2019-04-12 15:38:33 +04:00
Oleg Agafonov
f81142459d * UI: fixed wrong server reconnect on multiple apps runs (#5495); 2019-04-12 12:15:48 +04:00
John Hitchings
61d40902ab Ability to import draft logs as decks. 2019-04-11 22:27:21 -07:00
Oleg Agafonov
5a0f01c14a * UI: improved connects and disconnects processing: 
* fixed app freeze on broken server;
 * fixed app freeze on cancel button clicks;
 * fixed wrong still connected dialogs on app close or connect;
 * fixed missing wrong versions message;
 * improved error logs and messages.
 2019-04-11 12:14:18 +04:00
Oleg Agafonov
d2ab867e99 * UI: fixed non random packs richman mode (#5672); 2019-04-08 20:48:52 +04:00
Oleg Agafonov
7a556ea58f * UI: added save/load packs list in random/richman mode (#5672); 2019-04-08 20:15:34 +04:00
Oleg Agafonov
d249b14c3c * UI: fixed empty packs pool by default in random/richmen mode; 2019-04-08 19:07:23 +04:00
Thomas Winwood
788a1be01e Fix nonbasic land counting in singleton mode 2019-04-07 06:14:14 +01:00
Oleg Agafonov
10234d508f * UI: added CTRL/SHIFT/ALT supports for hotkeys (#2042); 2019-04-06 07:32:44 +04:00
Oleg Agafonov
11b254e5f7 * UI: added F12 hotkey to go in or out from game chat (can be changed in preferences); 2019-04-06 04:01:06 +04:00
Oleg Agafonov
1dbf5ba183 * UI: improved hotkeys: 
* added support for characters keys (no more skip hits in chat or search windows while typing, #4676);
  * fixed that user can activate skip button in choose dialogs;
  * fixed that mouse clicks outside from chat fields can't reset the focus;
 2019-04-06 01:02:47 +04:00
Oleg Agafonov
fc88357eab [WAR] - added images download from scryfall; 2019-04-03 13:03:51 +04:00
Oleg Agafonov
6c3b48b2a7 [WAR] - added token image; 2019-04-03 13:02:21 +04:00
Oleg Agafonov
c6e262b0ed Refactor: fixed duplicated class name 2019-04-03 13:00:24 +04:00
Oleg Agafonov
3ca57533b5 Fixed wrong class package, pom config and broken code (visual studio code compatibility) 2019-04-03 02:45:52 +04:00
Oleg Agafonov
b7e68f3e0a * Fixed client crush on old systems without JavaFX supports like MacOS 10.9; 2019-04-02 08:20:48 +04:00
Oleg Agafonov
65bb9b2161 Prepare new release 1.4.34 2019-03-29 18:31:00 +04:00
Oleg Agafonov
f8b9e3d408 Added more game mode and deck type combinations for commander; 2019-03-29 18:30:17 +04:00
Oleg Agafonov
ff640a942e UI: improved skips and stops for declare blocker step: 
* added options to STOP skip on any or zero blockers available;
 * added auto-stop before declare blockers step (e.g. user can cast instants and crew abilities);
 2019-03-29 18:10:00 +04:00
Oleg Agafonov
6606b586a4 UI: added what's new button to message of the day panel and connection dialog; 2019-03-29 10:41:49 +04:00
Oleg Agafonov
ad9ba216f2 UI: news page saves cookies for analytics; 2019-03-29 09:26:26 +04:00
Oleg Agafonov
7c8ba650a2 UI: news page shown only on new posts available; 2019-03-29 02:08:17 +04:00
Oleg Agafonov
16efc350b4 * UI: fixed graveyard and other cards window size (removed unnecessary scrolls, #5659); 2019-03-28 21:41:20 +04:00
Oleg Agafonov
01adbcf96f Refactor 2019-03-28 17:09:23 +04:00
Oleg Agafonov
771fac97ef * UI: fixed choose cards dialog size (removed unnecessary scrolls); 2019-03-28 17:06:03 +04:00
Oleg Agafonov
0e6dbb4eed * UI: improved and fixed possible targets highlighting: 
* added blockers highlighting on declare blockers step;
   * fixed that blocker targets highlights all attackers instead real;
   * fixed wrong attackers draw in images render mode;
 2019-03-28 09:29:15 +04:00
Oleg Agafonov
c58b28f94f UI: fixed rare error with wrong dialog position after multiple popups (#4318); 2019-03-28 09:19:16 +04:00
Oleg Agafonov
14f90bfc77 UI: added debug tool to test modal/non-modal dialog system (available from debug menu); 2019-03-28 09:12:17 +04:00
Oleg Agafonov
79c6626085 UI: added debug menu for developers (use -debug param in clients's command line to activate debug menu); 2019-03-28 09:11:09 +04:00
Oleg Agafonov
d45e63d946 * UI: added "what's new" page dialog with latest news (auto-loads on startup or from about dialog); 2019-03-28 09:05:46 +04:00
Oleg Agafonov
70f41c7807 Little fixes 2019-03-23 15:44:55 +04:00
Oleg Agafonov
66403cbdbb UI: improved add lands dialog (centered window, hotkeys to close/add); 2019-03-23 15:43:34 +04:00
Oleg Agafonov
1942cd0dec * UI: added save/load/reset game settings for new tourney dialog; 2019-03-23 15:08:05 +04:00
Oleg Agafonov
1b79827b2d * UI: added save/load/reset game settings for new table dialog; 
Fixed that edh power level don't saves;
 2019-03-23 06:54:17 +04:00
Oleg Agafonov
42658d5cff UI: added mulligan option to new tournament dialog, added mulligan type saving; 2019-03-23 05:49:21 +04:00
Oleg Agafonov
b925977efd Fixed new table/tournament dialogs compatibility with NetBeans editor; 2019-03-23 05:07:05 +04:00
Oleg Agafonov
3330680e81
Merge pull request #5644 from hitch17/additional-mulligan-support-5600 
Additional mulligan support #5600
 2019-03-22 22:48:18 +01:00
Oleg Agafonov
270ec615af Sync old changes 2019-03-22 21:51:26 +04:00
Oleg Agafonov
dc0da80d82 * UI: added deck export to clipboard (#4243); 2019-03-22 20:14:24 +04:00
Oleg Agafonov
4fde77b05e * UI: added paste button to import from clipboard dialog; 2019-03-22 18:22:07 +04:00
Oleg Agafonov
e471fc9888 UI: improved import from clipboard dialog and fixed compatibility with NetBeans; 2019-03-22 08:04:28 +04:00
Oleg Agafonov
04cb20f46a UI: improved deck editor exports: 
* added deck export to files (#4243);
 * fixed wrong card sorting in deck files after save (#3719);
 2019-03-21 19:17:41 +04:00
Oleg Agafonov
8b5993805a * UI: improved deck editor buttons and dialogs, prepared for export; 2019-03-21 05:20:57 +04:00
Oleg Agafonov
b848bbfb65 Fixed broken Deck Editor form -- now it's possible to load and edit by NetBeans 2019-03-21 00:11:17 +04:00
John Hitchings
47c9aab877 Merge branch 'master' into additional-mulligan-support-5600 2019-03-19 23:39:39 -07:00
Oleg Agafonov
a50884f31d * Images - fixed token images source from tokens.mtg.onl 2019-03-19 23:20:17 +04:00
John Hitchings
4a232b148c Add mulligan options to NewTableDialog, passing mulligan information to games. 2019-03-19 06:08:12 -07:00
Oleg Agafonov
7140a41445
Merge pull request #5636 from hitch17/deck-exporters 
Refactor Sets.saveDeck into a deck exporter series of classes.
 2019-03-19 03:32:54 +01:00
Ingmar Goudt
bcf02e692c rewrite to immutable list builder 2019-03-18 16:28:00 +01:00
Ingmar Goudt
72c8c267a1 move Google Guava to mage-root pom in dependencyManagement, so other modules can use it 2019-03-18 15:48:35 +01:00
Oleg Agafonov
2a0d2d125b * UI: fixed error message window for long text (auto-size), improved wrong version message; 2019-03-18 09:00:27 +04:00
John Hitchings
0ea73b19df Refactor Sets.saveDeck into a deck exporter series of classes. 2019-03-17 14:58:05 -07:00
Oleg Agafonov
bf2861c309 * UI: improved skip buttons and preferences: 
* added new setting for STACK skip button: stops on full empty stack (default) or on new objects added;
 * added new dynamic hints for skip buttons to see current settings and modes;
 * fixed that some skip buttons not de-activated after goal was achieved;
 * fixed wrong default render mode for cards, MTGO must be default (#4409);
 2019-03-17 04:38:31 +04:00
Oleg Agafonov
b6f075c505 * UI: added drag & drop text to deck editor (like drag & drop deck file); 2019-03-13 04:21:31 +04:00
Oleg Agafonov
a74d236ced Added hint about "/FIX" command in game's welcome message; 2019-03-11 21:23:09 +04:00
Oleg Agafonov
1ad6dc9976
Merge pull request #5626 from hitch17/more-forgiving-button-presses 
Simulate JButton behavior while still preserving check for BUTTON1
 2019-03-11 17:39:52 +01:00
John Hitchings
5c01b38ed6 Rename pressing to tinting. Change to behavior when leaving the rect will remove the tint (would stop tinting only when button released). 2019-03-10 23:12:48 -07:00
John Hitchings
11b93d0771 Simulate JButton behavior while still preserving check for BUTTON1 using MouseAdapter. Add a slight tint when button is pressing, but not pressed. 2019-03-10 23:02:13 -07:00
Ingmar Goudt
7a5920322d sonar cleanup in Sessionhandler 2019-03-10 22:04:27 +01:00
Oleg Agafonov
d8bee36892 * Multiple choosing abilities - added de-selection (click on selected permanent to de-select it); 2019-03-10 15:36:53 +04:00
Oleg Agafonov
b45864070c * UI: added possible targets highlighting in targets pickup dialogs; 2019-03-10 02:12:52 +04:00
Oleg Agafonov
e08fe53672
Merge pull request #5612 from hitch17/dnd-deck-lists 
Ability to drag-and-drop decklists onto DeckEditorPanel in deck editor.
 2019-03-08 01:03:07 +01:00
Ingmar Goudt
ee3f592186 fix some bugs from Sonar 06032019 2019-03-06 23:01:05 +01:00
Oleg Agafonov
e68b79336a Typo fix 2019-03-06 14:06:47 +04:00
Ingmar Goudt
553d263526 add missing diamond operators 2019-03-04 11:57:53 +01:00
Ingmar Goudt
45f665eb1d Sonar cleanups 03032019 2019-03-04 10:43:20 +01:00
Oleg Agafonov
e30eecead3 Refactor set's legality, Modern Horizons now available for modern formats; 2019-03-04 04:49:49 +04:00
Oleg Agafonov
106a5d94b2 MH1: added images downloads for Modern Horizons to scryfall; 2019-03-04 02:09:00 +04:00
John Hitchings
13efdd5b0b Ability to drag-and-drop decklists onto DeckEditorPanel in deck editor. 2019-03-03 13:48:51 -08:00
Ingmar Goudt
8319fbf9ad replace public fields with encapsulation 2019-03-03 09:51:14 +01:00
spjspj
caf26c2b7b Fix saving skill level for new table dialog of 'T1', 'T2' 2019-03-02 22:24:44 +11:00
Oleg Agafonov
38293e4659 * Improved network performance (traffic reduced from lobby by 60%); 2019-03-01 19:40:39 +04:00
Oleg Agafonov
f788af1f6a * Improved connection performance on new release, no more empty cards on startup; 2019-03-01 18:55:20 +04:00
Ingmar Goudt
be37d58dac fix compile 2019-02-26 10:56:39 +01:00
Ingmar Goudt
a64e31e697 sonar fixed 25022019 2019-02-26 09:20:15 +01:00
John Hitchings
f76efb2b65 Merge branch 'master' into migrate-google-collections-to-guava 2019-02-22 22:43:23 -08:00
Ingmar Goudt
3359c1f3f1 sonar 220219, criticals 2019-02-22 12:06:11 +01:00
Ingmar Goudt
056226d83c Sonar fixes 19022019 2019-02-19 21:51:45 +01:00
Ingmar Goudt
872eea7326 small cleanups in DragCardGrid 2019-02-18 21:32:20 +01:00
Oleg Agafonov
8cf681dff2 Updated libraries to latest versions and code compatibility fixes; 2019-02-17 16:12:57 +04:00
Oleg Agafonov
971a98061d Fixed SQL errors on non escaped symbols in usernames/emails/passwords; 2019-02-17 16:09:00 +04:00
Oleg Agafonov
9ef888c634 UI: symbols download fixes: 
* fixed that mana symbols don't refresh after download finisged (#5592, no more xmage restarts);
 * fixed that window don't close after download finished;
 2019-02-17 15:54:52 +04:00
Oleg Agafonov
232d37ec9b Typo 2019-02-16 01:02:44 +04:00
Ingmar Goudt
f2c64629a5 couple of Sonar fixes 2019-02-15 13:31:10 +01:00
Ingmar Goudt
c8a4e7a46b update JSoup, added test for Polluted Bonds, remove explicit parent groupId from poms 2019-02-11 15:03:18 +01:00
Ingmar Goudt
ff6dd3626f Client: use Rarity enum rather than a String 2019-02-11 14:14:36 +01:00
John Hitchings
b18efe2fbf Migrate from older version of google collections to guava. Required migration from MapMaker to CacheBuilder. See: https://github.com/google/guava/wiki/MapMakerMigration 2019-02-10 10:13:05 -08:00
Oleg Agafonov
067b0d75b5 UI: added premodern filter to tables list (#5301); 2019-02-09 21:08:22 +04:00
Oleg Agafonov
ff00d3c482 UI: added deck editor sets update on server connection (on new release); 2019-02-09 19:13:18 +04:00
Oleg Agafonov
264d81305e UI: added card viewer update on server connection (on new release); 2019-02-09 18:08:15 +04:00
Oleg Agafonov
f58fb8d07b Added new set Ravnica Allegiance Guild Kits (GK2) with 16 cards (scryfall download) 2019-02-09 16:53:42 +04:00
Oleg Agafonov
00ad61b6bd Added new Mythic Edition (MED) set (16 cards, scryfall download) 2019-02-09 16:45:27 +04:00
Oleg Agafonov
c29b68f030 Disabled cards rating and classes preloading on startup (lags problem); 2019-02-09 16:09:07 +04:00
Oleg Agafonov
c52a3c8a48
Merge pull request #5580 from magefree/5497-dynamic-hints-for-cards 
UI: Add dynamic hints for cards
 2019-02-09 14:44:42 +04:00
Oleg Agafonov
f341d35ece Hints: disable card hints in m15 render mode; 2019-02-09 12:00:24 +04:00
Oleg Agafonov
1b32793388 Added restrict effect hints to permanents; 2019-02-08 03:08:28 +04:00
Oleg Agafonov
806112c43a UI: fixed missing svg symbols (13, 14 and Q) 2019-02-07 01:28:31 +04:00
Oleg Agafonov
043a7af086 Added condition hints with good/bad icons for cards 2019-02-05 13:05:10 +04:00
Oleg Agafonov
b36465e5c9 Refactor: removed unused custom set filters in SubType requests; 2019-02-04 00:53:51 +04:00
Oleg Agafonov
c7ccc332d5 UI: tables with free seats always shows on top of the games list; 2019-02-01 20:56:27 +04:00
Oleg Agafonov
e2bc691f0b UI: fixed wrong icons alignment in main menu with big fonts 2019-02-01 19:10:21 +04:00
Oleg Agafonov
0697cbe24c UI: added draft rating column to deck editor 2019-02-01 18:57:24 +04:00
Oleg Agafonov
0c8fdfcaf2 UI: added draft rating info in card viewer 2019-02-01 18:32:22 +04:00
Oleg Agafonov
7eba755666 Refactor card ratings, fixed rare error exception "comparison method violates its general contract" (different ratings in same card); 2019-02-01 17:41:29 +04:00
Oleg Agafonov
3739325000 UI: fixed that chat messages history was editable; 2019-01-26 19:31:12 +04:00
Oleg Agafonov
e4ca6749c0 * UI: added free seats colorozing in tables list (green color on free seats to joins) 2019-01-26 01:20:43 +04:00
Oleg Agafonov
481b5f04ea Fixed NPE error/freeze on broken server connection 2019-01-25 10:41:50 +04:00
Oleg Agafonov
a6f851dc33 * Fixed broken svg symbols download 2019-01-23 19:02:30 +04:00
Oleg Agafonov
dd09de7a09 UI: fixed row selecting in tables list 2019-01-22 23:00:23 +04:00
Oleg Agafonov
4349ec881e UI: fixed cell hints for sorted cols; 2019-01-22 20:51:41 +04:00
Oleg Agafonov
cfff0f8116 * UI: added game name and seats number columns to tables list; 2019-01-22 18:32:27 +04:00
Oleg Agafonov
12b8c12d74 Fixed NPE 2019-01-22 16:01:05 +04:00
Oleg Agafonov
8f80d2d5b1 * UI: table selection is no longer reset after lobby refresh; 2019-01-22 15:49:16 +04:00
Oleg Agafonov
0833f8b914 * UI: added cell hints to current and finished tables; 2019-01-22 14:16:56 +04:00
Oleg Agafonov
91a3328907 * UI: added cell hints to player's list in lobby, fixed header hints; 2019-01-21 01:10:01 +04:00
Oleg Agafonov
72c9370d98 Images: improved error messages, added cancel after too many errors; 2019-01-20 17:30:53 +04:00
Ingmar Goudt
e7c729f11c Use autoclosable try-withs 2019-01-19 22:03:13 +01:00
Oleg Agafonov
f223bdab31 Added new client-server incompatible checks: 
* added strict mode (client and server versions must be same, see MAGE_VERSION_MINOR_PATCH_MUST_BE_SAME);
 * you must enable string mode after github code changes in serializeable classes (see #4459);
 * added client-side version checks;
 * added error message on wrong version disconnects.
 2019-01-18 13:32:37 +04:00
Oleg Agafonov
c0ef84b4dc Fixed deck file names for windows perl script compatible 2019-01-16 21:01:09 +04:00
Oleg Agafonov
14f66029f8 Missing v33 commit 2019-01-16 20:59:45 +04:00
Oleg Agafonov
45e0e1c3b2 UI: added beta and check online status buttons to connection dialog; 2019-01-16 13:26:53 +04:00