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

3292 commits

Author SHA1 Message Date
Oleg Agafonov
8b2bc064cd Fixed test and sample decks 2020-08-10 18:24:21 +04:00
Oleg Agafonov
6a897fa8f8 * Other: fixed sample decks to actual card numbers, fixed broken sample decks; 2020-08-08 23:13:30 +04:00
Oleg Agafonov
c5d7a3e9f9 * GUI: added auto-fix for deck files on usage (if deck contains wrong card numbers then it will be fixed and saved automaticity); 2020-08-08 21:27:20 +04:00
Oleg Agafonov
9652d83aec Fixed tests 2020-08-08 19:08:38 +04:00
Oleg Agafonov
712af3152a Images download: 
* Fixed broken direct links download;
* Fixed outdated card numbers in some sets;
* Fixed all non-downloadable images from scryfall source;
 2020-08-08 18:55:10 +04:00
Oleg Agafonov
66a8994318 Tests: added sets implementation statistics in test_checkMissingSets 2020-08-08 14:02:28 +04:00
Oleg Agafonov
735588cc0d Sets refactor: 
* Duels of the Planeswalkers Promos set split to multiple sets (scryfall style);
* Fixed Masterpiece Series sets name;
 2020-08-08 13:17:49 +04:00
Oleg Agafonov
7599acf1c8 Removed duplicated sets that was split into multiple (Champs, Game Day, Launch Party, Media Inserts, Super Series) 2020-08-08 11:00:07 +04:00
Oleg Agafonov
f746d4d8d2 Images download: 
* removed duplicated set (Clash Pack);
* added images download for Eighth Edition Box, Ninth Edition Box;
 2020-08-08 10:14:17 +04:00
Oleg Agafonov
450646ca5e * Images download: added threads settings in download dialog; 2020-08-07 12:41:17 +04:00
Oleg Agafonov
401d468494 Images download: decrease default images threads to 3 instead 10 (scryfall IP ban workaround for massive download) 2020-08-07 11:48:40 +04:00
Oleg Agafonov
3bf0f80033 Images download: fixed broken download dialog 2020-08-07 11:29:49 +04:00
Oleg Agafonov
2954bbaf04 Images download: removed outdated source mtgimage.com 2020-08-07 11:28:03 +04:00
Oleg Agafonov
ffd98d5c3c Merge fixed 2020-08-07 11:08:30 +04:00
Oleg Agafonov
9e6a348cb1
Merge branch 'master' into refactor_promo_sets 2020-08-07 02:48:40 +02:00
Oleg Agafonov
e95b9f145c GUI: deck legality improves: 
* Added partly valid status for deck legality panel (if all cards are fine but user must add more cards to complete, see #6854);
 * Improved legality errors sorting (important errors visible at the top now, e.g. commander's errors);
 2020-08-03 02:03:54 +04:00
Oleg Agafonov
309b3f5636 GUI: deck legality and themes improves: 
* Improved formats list in deck legality panel (#6854);
 * Added hide button to deck legality panel (#6854);
 * Fixed themes names and added theme info in startup logs;
 2020-08-03 00:07:13 +04:00
Oleg Agafonov
c9c1bc2b90 GUI: added info about combat arrows bug on re-connect 2020-08-02 14:22:59 +04:00
Oleg Agafonov
00411b4a9b * Regeneration abilities improved: 
* Fixed that regeneration shield isn't added to permanent on aura sacrifice cost (example: Stamina, Carapace, see #2221);
 * Fixed that regeneration shields accumulated in attached aura instead permanent (bug example: re-attached aura gives old shields to new permanent, see #6846);
 * Added card hint with regeneration shields amount (#6846);
 2020-08-02 14:01:58 +04:00
Oleg Agafonov
2b82785e4a * GUI: improved attackers draw (if attacker was blocked then arrow colorizes with gray color); 2020-08-01 22:32:33 +04:00
Oleg Agafonov
610baac6ab GUI: improved feedback needed sound notifications (plays only for inactive game or app, see #6853); 2020-07-31 20:00:36 +04:00
Oleg Agafonov
1045f352bc GUI: fix that cheat button shows for all players instead current user only (related to #5289); 2020-07-29 20:22:25 +04:00
Oleg Agafonov
8c5b2b6e01 Added comments for some dependency usage (#6799) 2020-07-28 05:30:31 +04:00
Oleg Agafonov
02aa3b333f Removed db-files from client distribution; 2020-07-28 04:56:33 +04:00
dependabot[bot]
62d563b11f
Bump prettytime from 4.0.2.Final to 4.0.5.Final 
Bumps [prettytime](https://github.com/ocpsoft/prettytime) from 4.0.2.Final to 4.0.5.Final.
- [Release notes](https://github.com/ocpsoft/prettytime/releases)
- [Changelog](https://github.com/ocpsoft/prettytime/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/ocpsoft/prettytime/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 09:47:56 +00:00
dependabot[bot]
7dc4d2eb79
Bump aws-java-sdk-s3 from 1.11.498 to 1.11.827 
Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.498 to 1.11.827.
- [Release notes](https://github.com/aws/aws-sdk-java/releases)
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.11.498...1.11.827)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-27 06:44:10 +00:00
Oleg Agafonov
857d888b76 GUI: fixed that deck validate from deck editor available in draft/sideboarding mode (#6854); 2020-07-25 15:39:43 +04:00
Oleg Agafonov
24aacaafe8 * GUI: fixed missing horizontal scrollbar in deck editor for small screens, fixed overlapped deck validate panel for small screens (#6881, #6854); 2020-07-25 15:27:17 +04:00
Oleg Agafonov
e07dd273f2 * GUI: fixed that deck editor doesn't restore settings after games (cards list hides after draft/sideboarding, see #4350); 2020-07-25 13:29:51 +04:00
Oleg Agafonov
5585e1d878 GUI: deck editor improves: 
* Fixed broken DeckArea form (form/java files synced);
* Improved panel sizes and scrolls fixes (small screens support, see #6881);
 2020-07-25 12:12:05 +04:00
LevelX2
881f727ec7 * Fixed visibility of buttons with empty text (fixes #6841). 2020-07-20 11:12:33 +02:00
18ths
99d5eafc8a
GUI enchancements (themes, sound notification, deck validation) (#6755) 
GUI enchancements (themes, sound notification, deck validation)
 2020-07-17 19:15:02 +02:00
Oleg Agafonov
656e4304ae * Images: fixed images download of special or promo cards without english version (example: Mysterious Egg, see #6829); 2020-07-11 06:35:55 +04:00
Oleg Agafonov
ac0bb713d7 * GUI: fixed auto-generated names for AI in new tournament dialog; 2020-07-10 17:57:56 +04:00
Oleg Agafonov
c4f028ffa0 Prepare new release 2020-07-10 16:50:38 +04:00
Oleg Agafonov
c011ff92ad GUI: fixed that jumpstart tournament don't show up in the tables list (#6816); 2020-07-10 11:51:26 +04:00
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