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

3456 commits

Author SHA1 Message Date
Oleg Agafonov
c73183edd7 Additional line endings fixes for #6812 2020-07-09 22:30:47 +04:00
arcox
9c7982e8f6 Update *.sh and *.java files to use Unix line endings 2020-07-09 13:07:26 -04:00
Oleg Agafonov
6c3162f140 Optimized sql for deck editor 2020-07-09 03:08:44 +04:00
Oleg Agafonov
99ceeb5076 Tokens improves: 
* [M21] added tokens;
 * [M21] added tokens download support;
 * Fixed wrong images for some tokens (Angel, Beast, Bird, Cat, etc);
 2020-07-09 02:38:37 +04:00
18ths
13f7f2a035 Revert "removed some of unused dependencies" 
This reverts commit d6ad722266.
 2020-07-08 17:16:16 +02:00
Oleg Agafonov
fba4f24061
Merge pull request #6799 from magefree/unused_dependencies 
removed some of unused dependencies
 2020-07-07 21:08:58 +02:00
18ths
d6ad722266 removed some of unused dependencies 2020-07-07 20:11:45 +02:00
dependabot[bot]
17df993657
Bump jsoup from 1.11.3 to 1.13.1 
Bumps [jsoup](https://github.com/jhy/jsoup) from 1.11.3 to 1.13.1.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES)
- [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.11.3...jsoup-1.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-07 08:55:25 +00:00
Oleg Agafonov
e69a021c71 Fixed missing locale param in string operations (#4634) 2020-07-03 02:00:58 +04:00
LevelX2
84370ee5ab * Allow to addd hint texts to stack abilities. Swicthed to html text format for text box of stack abilites. 2020-07-02 00:53:46 +02:00
Oleg Agafonov
eaae0ce256 [JMP] added images download support 2020-06-30 08:32:35 +04:00
Oleg Agafonov
d5616a86f9
Merge pull request #6669 from hitch17/jumpstart-tournament-formats 
Add jumpstart swiss and elimination tournament formats.
 2020-06-30 06:29:33 +02:00
Oleg Agafonov
aeef4e1193 Fixed some tokens image 2020-06-25 09:52:54 +04:00
Oleg Agafonov
dea739ecb0
Merge pull request #6683 from gp66/fix-iko-tokens 
Fix iko tokens
 2020-06-25 07:35:17 +02:00
LevelX2
0b00ae8b9d
Merge pull request #6522 from emerald000/oldVersions 
UI: Add a button on the deck editor to change your cards to the oldest versions.
 2020-06-24 21:53:42 +02:00
18ths
40036271da
Implemented Allosaurus Shepherd and Blessed Sanctuary (#6711) 
* added allosaurus shepherd and blessed sanctuary

* fixed nonascii apostrophes

* added continuous effect dependency
 2020-06-24 10:17:32 -05:00
LevelX2
3d2c452e3f * Pick choice Dialog - Increased default window size. Window size is changable now by the user. 2020-06-21 11:31:43 +02:00
gp66
23cb5274f5 cat lifelink token 2020-06-20 14:11:31 -05:00
Oleg Agafonov
3f2a5fc362 Prepare new release 2020-06-20 11:36:13 +04:00
LevelX2
f6f5aa0473 * Fixed broken rarity sorting in card grid (fixes #6508). 2020-06-19 10:54:11 +02:00
John Hitchings
1695e6767d add jumpstart swiss and elimiation tournament formats. 2020-06-18 23:45:02 -07:00
LevelX2
0e81b8fd78 * Adding M21 to Scryfall Image support sets. 2020-06-16 10:43:26 +02:00
Oleg Agafonov
d9d7dd49ba Merge fix 2020-06-15 23:36:17 +04:00
LevelX2
3df7e84fe7 Merge origin/master 2020-06-15 21:12:32 +02:00
LevelX2
2788eab082 * Fixed card type displaying order (fixes #6055). 2020-06-15 21:11:54 +02:00
Oleg Agafonov
9df32a571b * Images: added embalm ability tokens and missed Insect token from Amonkhet (see #3201); 2020-06-15 22:57:29 +04:00
Oleg Agafonov
4006e9e909 * Images: fixed that some tokens uses wrong images of Elemental (#5834); 2020-06-15 21:30:23 +04:00
Oleg Agafonov
f2f1abd0f3 * Images: fixed wrong Wurm token image for some sets (#5604); 2020-06-15 20:59:53 +04:00
Oleg Agafonov
c2487aec7d [C20] tokens support and fixes: 
* Added tokens for C20;
* Added tokens images download for C20;
* Fixed that some tokens uses wrong images or images from wrong set (example: Elemental);
 2020-06-15 20:29:52 +04:00
Oleg Agafonov
2b21298377 * UI: fixed that tokens in M15 render mode did not use a variety of images (all same named tokens uses same image); 2020-06-15 20:21:30 +04:00
htrajan
a897df7c79
Implement 6 cmc pws (except Teferi) and rin (#6611) 
[M21] Implement 6 cmc pws (except Teferi) and rin
 2020-06-07 06:13:20 +04:00
LevelX2
1deb1106b0
Merge pull request #6568 from johnmeat/ComputerDefaultName 
Default unique name for AI.
 2020-05-26 23:00:26 +02:00
Oleg Agafonov
37f7389c17 * Images: fixed Star Wars download from grabbag images source; 2020-05-26 11:30:47 +04:00
johnm
adcd9d84c6 Single setPlayerName method. 2020-05-25 16:49:12 +01:00
johnm
9df5c9ba68 Default unique name for AI. 2020-05-24 13:52:48 +01:00
Oleg Agafonov
0be7d6579b * UI: split cards - fixed wrong card names in rules text and hints (#6549); 2020-05-18 08:24:17 +04:00
Oleg Agafonov
dcd6cf34f3
Merge pull request #6546 from johnmeat/RangeOfInfluence 
Default range of influence is now all players rather than one.
 2020-05-17 17:45:03 +02:00
johnm
937b7f72ee Default range of influence is now all players rather than one. 2020-05-17 14:35:41 +01:00
Oleg Agafonov
9424009721
Merge pull request #6394 from Craigacp/look-and-feel-fix 
Change the nimbus look and feel name (OpenJDK support)
 2020-05-10 09:44:28 +02:00
gp66
da1c9cc38e missing token images in thb and war 2020-05-07 12:34:47 -05:00
emerald000
75bc19d4a7 Add a button on the deck editor to change your cards to the oldest versions. 2020-05-05 01:24:34 -04:00
Oleg Agafonov
2739391b1d
Merge pull request #6510 from gp66/completed-suggestions-iko-tokens 
Completed suggestions iko tokens
 2020-05-03 20:10:11 +02:00
gp66
f3bde1dbab completed suggestions for IKO tokens 2020-05-03 12:52:51 -05:00
gp66
eba1980a9a added IKO tokens 2020-05-02 21:52:33 -05:00
SpeedProg
325d96f6db display ToolTipMarkTags in card renders in blue instead of leaving the closing </font> tag in the text 2020-05-01 17:47:00 +02:00
Tim Haering
17c40ead3c add import support for mtgjson deck files 2020-04-29 20:29:15 +02:00
Adam Pocock
26d94db661 Update Mage.Client, Mage.Server.Console, and AbilityPicker LaF to use the supported class name. 2020-04-25 14:02:14 -04:00
Oleg Agafonov
1468f89ce6 * Images: added scryfall download support for Mystery Booster set; 2020-04-19 10:14:58 +04:00
Oleg Agafonov
75d145c7e5 Images: added scryfall download for IKO and C20 sets 2020-04-19 01:49:34 +04:00
Evan Kranzler
8494e98693
Implemented Yorion, Sky Nomad (#6407) 
* Implemented Yorion, Sky Nomad

* Implemented Yorion, Sky Nomad (but for real this time)

* updated game creation to use the correct deck size for limited
 2020-04-16 08:10:18 -04:00
Oleg Agafonov
80b7f8493b UI: fixed font size in what's new button 2020-04-16 11:10:50 +04:00
Oleg Agafonov
ba46233dd1 UI: added euro server button; 2020-04-16 10:44:35 +04:00
Oleg Agafonov
79c5c7a6a5 Test framework improves (Monte Carlo AI): 
* Added support to test Monte Carlo AI (CardTestPlayerBaseWithMonteCarloAIHelps - any aiXXX commands);
* Added Quick Start button to test Monte Carlo AI games (MCTS);
 2020-04-14 20:09:36 +04:00
Emigara
a982d8c901
Added Snapdax please test (#6411) 
Co-authored-by: Blair <Blair@DESKTOP-JE2I3LO>
 2020-04-13 18:50:00 -04:00
Oleg Agafonov
6356457afa * Planechase: added images download for planes (tokens from Planechase Anthology); 2020-04-13 22:03:08 +04:00
Oleg Agafonov
39b56d525a * Planechase: fixed not working plane hint in game logs (now you can see popup with full plane description); 2020-04-13 21:55:27 +04:00
Oleg Agafonov
75334141d9 * Planechase: added two missing planes in set (The Zephyr Maze and Trail of the Mage-Rings); 2020-04-13 21:52:18 +04:00
emerald000
c3684a732b [IKO] Implement Companion and 2 companions 
Keruga, the Macrosage and Umori, the Collector
 2020-04-12 08:29:25 -04:00
Thomas Hess
62161212bb
ScryfallImageSupportCards: Re-added direct links for 8ED/9ED box set cards. 2020-03-25 21:40:56 +01:00
Thomas Hess
40fd976da6
GrabbagImageSource: Fixed approximate download file size. 
The new value is based on a finished download of the SWS set.
 2020-03-25 20:15:48 +01:00
Thomas Hess
80fc546314
ScryfallImageSupportCards: activated an implemented set. 2020-03-24 17:32:09 +01:00
Thomas Hess
fc3e8a3a6f
Removed PPRE from the GrabbagImageSource 2020-03-24 17:32:09 +01:00
Thomas Hess
1ec381fd3d
Updated the expected average file size. 
Value is based on the full Scryfall download of March 2020.
 2020-03-24 17:32:09 +01:00
Thomas Hess
46d0e91103
Further simplified the Scryfall image download code. 2020-03-24 17:32:08 +01:00
Thomas Hess
5a812a448f
Removed obsolete 6th Edition workarounds. 
Removed from the ScryfallImageSource and ScryfallImageSupportCards classes.
 2020-03-24 17:32:08 +01:00
Thomas Hess
7219d51572
Removed 6th Edition cards from Starter 2000 set. 
These are indistinguishable from regular 6ED cards and not listed on Scryfall.
 2020-03-24 17:32:08 +01:00
Thomas Hess
64e862276f
Removed collector number modulo 1000 hack from ScryfallImageSource.getFaceImageUrl() that was used for double-faced cards in Innistrad. 2020-03-24 17:32:07 +01:00
Thomas Hess
e4f545ff85
Removed date-stamped pre-release promos from the Prerelease Events (PPRE) set, 
that are not listed as part of this set on Scryfall. The removed cards were added
to the individual expansion’s promo sets before, so no printing is lost.
 2020-03-24 17:32:07 +01:00
Thomas Hess
69c5407d15
Removed Amonkhet cards from the Archenemy: Nicol Bolas set. 
- The Amonkhet cards are indistinguishable from the regular Amonkhet cards
- Simplified the ScryfallImageSource class by removing a special case.
 2020-03-24 17:32:07 +01:00
Thomas Hess
da98ac82ed
Aligned Guru Set code with Scryfall (GUR → PGRU). 2020-03-24 17:32:06 +01:00
Thomas Hess
3b150daf27
Started updating the image sources for the new set structure. 2020-03-24 17:32:06 +01:00
Thomas Hess
529552dd2c
Fixed set codes for the Duel Deck Anthology deck sets. 
The decks now use the set codes from Scryfall.
 2020-03-24 17:32:06 +01:00
Thomas Hess
f35d0fa994
Fixed set codes for the Duel Decks. 
The decks now use the set codes from Scryfall.
Also fixed the affected Duel Decks deck lists supplied with the client.
 2020-03-24 17:32:05 +01:00
Thomas Hess
71bdc431db
Aligned Grand Prix Promos set code with Scryfall. 
(GPX → PGPX)
 2020-03-24 17:31:57 +01:00
Thomas Hess
e0fb40abdf
Added the Hachette UK (PHUK) preconstructed deck set. 2020-03-24 17:31:56 +01:00
Thomas Hess
c74f42be81
Added the Junior APAC Series (PJAS) promotional set. 2020-03-24 17:31:56 +01:00
Thomas Hess
7fa1e9023d
Added the Gateway 2006 (PGTW) promotional set. 2020-03-24 17:31:56 +01:00
Thomas Hess
be87c306c4
Added the Two-Headed Giant Tournament (P2HG) promotional set. 2020-03-24 17:31:55 +01:00
Thomas Hess
db74a91b3c
Added the Junior Series Europe (PJSE) promotional set. 2020-03-24 17:31:55 +01:00
Thomas Hess
f374d74dc2
Add the Release Events (PREL) promotional set. 2020-03-24 17:31:55 +01:00
Thomas Hess
ba0d66c18b
Add the Vintage Championship (OVNT) promotional set. 2020-03-24 17:31:54 +01:00
Thomas Hess
443bc95a63
Split the Magic Player Rewards (MPRP) promotional set into the individual sets. 
- Removed Magic Player Rewards (MPRP)
- Added MPR sets 2001 (MPR), 2003-2011 (P03 - P11)
 2020-03-24 17:31:54 +01:00
Thomas Hess
8675c3eb11
Added the Magic Online Promos (PRM) promotional set. 2020-03-24 17:31:54 +01:00
Thomas Hess
048f80a9db
Added the Deckmasters (DKM) Box set. 2020-03-24 17:31:54 +01:00
Thomas Hess
6297650c3b
Split the Judge Gift Cards set (JP) into the individual sets as listed on Scryfall. 
- Removed the JP set.
- Added G02-G11, J12-J20
- Fixed all usages in the test code
- Updated the sample decks that used these cards.
  The deck lists now contain the updated references.
- Added all Judge Gift sets to the "bling" sets list
 2020-03-24 17:31:54 +01:00
Oleg Agafonov
35f19838dd
Merge pull request #6372 from allentiak/fix-interfaces 
fixup! program towards Interface rather than implementations
 2020-03-23 21:56:23 +01:00
Leandro Doctors
855a9cc427 fixup! program towards Interface rather than implementations 2020-03-22 20:42:11 -03:00
Meerkov
907d039da8
Update CallbackClientImpl.java 2020-03-22 10:19:16 -07:00
Thomas Hess
d628303f3a
Fix set code clash with the old PrereleaseEvents set and the new Pro Tour Collector set (PTC). 
Set the PrereleaseEvents code to PPRE, as listed on Scryfall.
 2020-03-19 11:09:48 +01:00
Thomas Hess
bced163e1e
Fixed Friday Night Magic cards used in sample decks. 2020-03-19 11:09:48 +01:00
Thomas Hess
12d1bd4bb4
Split the cummulative Friday Night Magic set into the individual sets. 
- Removed set FNMP
- Added sets F00 - F17 (F18 does not contain cards, only tokens)
 2020-03-19 11:09:48 +01:00
Thomas Hess
aab0b2e2fa
Split the cummulative Arena League set into the individual sets. 
- Removed set ARENA
- Added sets PARL, PAL99, PAL00, PAL01, PAL02, PAL03, PAL04, PAL05, PAL06
 2020-03-19 11:09:48 +01:00
Thomas Hess
2d68c60c31
Add the Pro Tour Collector Set (PTC) set. 2020-03-19 11:09:48 +01:00
Thomas Hess
c43877e382
Add the Beatdown Box Set (BTD) set. 2020-03-19 11:09:47 +01:00
Thomas Hess
2a1c98e58c
Add the Judge Gift Cards 2000 (G00) set. 2020-03-19 11:09:47 +01:00
Thomas Hess
b56882091e
Adjust European Land Program set abbreviation to match Scryfall. 2020-03-19 11:09:47 +01:00
Thomas Hess
95fc6c8ef2
Add the Battle Royale Box Set (BRB) set. 2020-03-19 11:09:47 +01:00
Thomas Hess
ed53f2f8ed
Add the Worlds (PWOR) set. 2020-03-19 11:09:47 +01:00
Thomas Hess
4d3e41fa35
Adjust Asia Pacific Land Program set abbreviation to match Scryfall. 2020-03-19 11:09:46 +01:00
Thomas Hess
cd9b75c0d9
Add the Portal Demo Game (PPOD) set. 2020-03-19 11:09:46 +01:00
Thomas Hess
8fdd3511b0
Add the HarperPrism Book Promos (PHPR) promotional set. 2020-03-19 11:09:46 +01:00
Thomas Hess
736f207801
Add the DragonCon (PDRC) promotional set. 2020-03-19 11:09:45 +01:00
Oleg Agafonov
cb8d4dc340 * Non creature tokens - fixed rollback errors in AI games (example: Food token, see #6331); 
Fixed other potentially NPE errors with rarity;
 2020-03-06 03:27:46 +04:00
Oleg Agafonov
a06cacb462 * UI: fixed that json logs can't be disabled without disable other logs in settings; 2020-02-28 21:09:41 +04:00
Oleg Agafonov
8ee1dd20d3 * UI: added preferences to enable or disable turn number and step info in game logs; 2020-02-28 21:04:37 +04:00
Oleg Agafonov
2e73f9d1c5 * UI: added turn number and step info in game logs 2020-02-28 20:27:07 +04:00
Oleg Agafonov
32d61f6a69 Fixed tests 2020-02-27 03:31:51 +04:00
Oleg Agafonov
f50bc8f36f * UI: ignore list improved: 
* Added support of usernames with spaces (#6305);
 * Increased max limit from 50 to 100;
 * Added list size info on connection or command usage;
 2020-02-27 02:05:16 +04:00
Oleg Agafonov
58d7a96031 * Game: improved fix command (more info and fixes); 
* Game: improved game startup message (more info about private messages and players stats);
 2020-02-21 12:10:54 +04:00
Ingmar Goudt
ae7919cd07 program towards Interface rather than implementations 2020-02-10 10:40:06 +01:00
Oleg Agafonov
2079065af3 * Server: added /pings chat command to show players and watchers ping info; 2020-01-31 22:30:31 +04:00
Oleg Agafonov
68326c8554 * UI: added card hints about active requirement effects (permanent must attack or must block); 2020-01-29 06:51:39 +04:00
Oleg Agafonov
ffdc884949 Logs cleanup (removed database logs) 2020-01-27 06:01:56 +04:00
Oleg Agafonov
1b3a5d625b * Other: fixed problem with too big mageclient.log file, now it will be clean after 10MB (log files rotation); 2020-01-26 16:34:04 +04:00
Oleg Agafonov
ab2fb29270 Code cleanup (removed unused log4j setting files, added extra info, samples and instructions, removed java logs) 2020-01-26 16:30:42 +04:00
Oleg Agafonov
b56587a383 Code cleanup (removed outdated client's config.properties settings) 2020-01-26 15:19:22 +04:00
Oleg Agafonov
7fcd4abcc8 Code cleanup 2020-01-22 10:59:57 +04:00
Oleg Agafonov
9ba249c543
Merge pull request #6211 from michaelrfarcasin/feature/freeform-unlimited-commander 
Add Freeform Unlimited Commander game type
 2020-01-22 06:57:43 +01:00
Oleg Agafonov
2f66e168ab * UI: improves double faces cards render: 
* Fixed that it doesn't update card image and text after transform button pressed (#6217);
 * Fixed that card lost selection and can't be selected again after transform button pressed;
 2020-01-22 09:43:26 +04:00
Oleg Agafonov
959374389b * UI: fixed that face down card displays without image (now it shows default card's back); 2020-01-22 00:50:10 +04:00
Oleg Agafonov
007d0d19b4 UI: connect button more visible 2020-01-22 00:45:46 +04:00
Oleg Agafonov
eaaa37db11 Card render testing dialog improves: 
* Added chooseable render testing (click by mouse on cards);
* Added column style render testing (many cards mode);
* Added tapped, face down and manifested render testing for permanents;
* CardView: fixed missing copy data (NPE for transformed cards);
* CardArea: added support to draw permanents;
* CardArea: added support of offsets between cards/columns;
 2020-01-22 00:44:25 +04:00
michaelrfarcasin
c3cb54f371 Add Freeform Unlimited Commander game type 
Currently there's no multiplayer format that allows players to cast
spells from the command zone and also allows any deck size.

This is a problem for players who want to test EDH Cube decks. These
decks:
- can have any size - often between 40 and 100 - with no standard
- can have cards outside the commander's color identity
- may break the singleton rule

Create a game and deck type to accommodate these types of decks.

Notable differences from Freeform Commander in addition to the above:
- Decks can have any number of cards in the maindeck or sideboard
- Sideboard cards can be any type
- There are no illegal expansions
- Games can have a minimum 2 players
 2020-01-20 22:47:27 -06:00
Oleg Agafonov
217517feee Additional to prev commit 2020-01-18 20:38:55 +04:00
Oleg Agafonov
2249bba1f1 * UI: fixed that some user defined hotkeys can be broken after last update; 2020-01-18 20:37:00 +04:00
Oleg Agafonov
17c7ea63ba Merge fix 2020-01-18 13:02:41 +04:00
Oleg Agafonov
7da62e13ec UI: changed ESC to BACKSPACE in choose dialog hotkeys (compatibility fixes); 2020-01-18 09:34:02 +04:00
Oleg Agafonov
ce60a9d75b * UI: choose ability to play improves (see 8add25fa12) 2020-01-18 08:02:31 +04:00
Oleg Agafonov
8add25fa12 * UI: choose modes dialog improves: 
* Added hotkeys to select options (1-9 for choice, SPACE/ENTER for done, ESC for cancel);
 * "Up to" modes choose dialog - added "done" button in dialog;
 * "Up to" modes choose dialog - fixed that user can't cancel if already selected one mode;
 * Added extra info about source object, selected and remaining modes to select, ability number for hotkey;
 * Fixed that mode choose dialog doesn't close on cancel (#6199);
 2020-01-18 06:30:44 +04:00
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