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

2695 commits

Author SHA1 Message Date
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
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
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
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
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
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