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

2653 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
rikimaru1234321
64f3bf3534
Merge branch 'master' into master 2019-11-08 08:29:36 +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
2838437dd8 Added us server 2019-09-10 00:12:37 +04:00
USER
5777de5187 2019-08-26 12:52:54 +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
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
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