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

21297 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexsandro
558739d055 Fix merge old stuff again 2017-12-13 00:29:16 -02:00
Alexsandro
2103bfb74a Fix merge old stuff 2017-12-13 00:28:00 -02:00
Alexsandro
ae329fd81f Add a line to remove from grave to avoid duplicates 2017-12-13 00:19:22 -02:00
spjspj
d765b2b108
Merge pull request #4238 from spjspj/master 
Fix points for Aus 7pt Highlander
 2017-12-12 07:44:58 +10:00
spjspj
fe02e3fba3 Fix points for Aus 7pt Highlander 2017-12-12 01:02:51 +11:00
spjspj
bf911c6501
Merge pull request #4237 from spjspj/master 
Add 1 unstable card.  Fix dice roll (was only returning  '0-(n-1)')
 2017-12-11 23:29:02 +10:00
spjspj
7c855990c9 Add 1 unstable card. Fix dice roll (was only returning '0-(n-1)') 2017-12-12 00:08:37 +11:00
Oleg Agafonov
e0f64296f5 Merge remote-tracking branch 'production/master' into production_master 2017-12-11 04:02:06 +04:00
Oleg Agafonov
1eaf185755 Fixed #4236 (Forked Bold in DDP have wrong rarity) 2017-12-11 04:01:55 +04:00
spjspj
824a001042
Merge pull request #4234 from spjspj/master 
Adding in Roll Dice effect and two Unstable cards
 2017-12-11 07:11:21 +10:00
Oleg Agafonov
f39e4fd4ee - added card download for unstable set from scryfall; 
- changed client version from 9 to 10b;
 2017-12-10 17:43:37 +04:00
spjspj
89a45eaa4d Fix type. 2017-12-10 23:22:10 +11:00
spjspj
46cbaed493 Merge branch 'master' of https://github.com/spjspj/mage 2017-12-10 23:02:33 +11:00
spjspj
eb9f50e370 Crow Storm! 2017-12-10 23:01:55 +11:00
spjspj
537295bfcb
Merge branch 'master' into master 2017-12-10 21:57:30 +10:00
spjspj
f5d16a930f
Merge branch 'master' into master 2017-12-10 21:54:02 +10:00
spjspj
eca218881c Start adding in Dice Roll effects 2017-12-10 22:51:08 +11:00
spjspj
8e3daf54a9 Start adding in Dice Roll effects 2017-12-10 22:49:55 +11:00
Oleg Agafonov
f09a541282 - fixed test 2017-12-09 21:26:22 +04:00
Evan Kranzler
5b5c6bd7a7 Implemented Amateur Auteur 2017-12-09 11:31:14 -05:00
Evan Kranzler
6b7b8ba00a Implemented Target Minotaur 2017-12-09 11:31:12 -05:00
Oleg Agafonov
dce69c18dc + improved deck import from deckstats 2017-12-09 18:52:24 +04:00
spjspj
0ec6a66259
Merge pull request #4232 from spjspj/master 
Add in Unstable cards (possibly implementable ones at least)
 2017-12-09 17:33:00 +10:00
spjspj
6fa2f70ad1 Add in Unstable cards (possibly implementable ones at least) 2017-12-09 18:30:20 +11:00
Zzooouhh
b21ee39acf
Fix for Surveyor's Scope 
"X = 0" case didn't shuffle owner's library
 2017-12-08 12:44:43 +01:00
Oleg Agafonov
763594e579 type 2017-12-08 00:53:46 +04:00
Oleg Agafonov
5fc0393bc7 Deck editor: 
+ added warning messages dialog after load/import decks with errors (instead throw exception);
 + added loading cursors on import-load decks;
 - fixed null exception error on empty/error deck loading;
 2017-12-08 00:20:18 +04:00
Oleg Agafonov
1efc062f66 Decks importer: 
+ added support for new decklist text format from deckstats.net (see #4228);
  + added new checks to text format (too many empty lines, too big card number: more then 100);
  + fixed double window popup on cancel/close import from clipboard window;
 2017-12-07 23:14:22 +04:00
Oleg Agafonov
5b7ab0de7a typo 2017-12-07 08:41:59 +04:00
Oleg Agafonov
66a70dd116 - Fixed #4220 - card viewer raise error with alternative card numbers; 
- Fixed potential error on getCardsByRarity;
- Added inner checks for wrong booster max card numbers settings;
 2017-12-07 08:01:54 +04:00
Oleg Agafonov
6802ebc537 Fixed #4226 - wrong ability text in Drakestown Forgotten 2017-12-07 05:44:16 +04:00
Zzooouhh
d6a08fbdd7
NullPointerException fix 2017-12-07 01:01:52 +01:00
Zzooouhh
1955dc6d18
Cleaned up imports 2017-12-05 20:30:51 +01:00
Zzooouhh
7f531caef1
Added missing trample 2017-12-05 20:25:37 +01:00
spjspj
82508248a8
Merge pull request #4221 from spjspj/master 
Fix face images.
 2017-12-05 23:07:15 +10:00
spjspj
35aa92ac72 Fix face images. 2017-12-06 00:03:12 +11:00
LevelX2
82a9f97d0d Merge origin/master 2017-12-03 18:15:59 +01:00
LevelX2
8fac7a3dc1 XMage 1.4.26V9 2017-12-03 18:15:16 +01:00
Oleg Agafonov
56842373ce
Merge pull request #4217 from JayDi85/svg-download 
Added svg symbols download from scryfall
 2017-12-03 20:44:07 +04:00
LevelX2
ab8bcd92c2 * Some minor changes. 2017-12-03 17:39:00 +01:00
Oleg Agafonov
89fae4f33e Add svg symbols download from scryfall 2017-12-03 20:33:32 +04:00
LevelX2
26a45dd951 * Root Sliver - Fixed that the Sliver spells can't be countered did not work correctly. 2017-12-03 17:09:02 +01:00
LevelX2
b3a3e17aa2 [RIX] Activated Mythicspoiler as RIX image download source 2017-12-03 09:45:02 +01:00
Zzooouhh
e67a0d4338
Merge pull request #4216 from Zzooouhh/master 
Implemented Soul Echo
 2017-12-02 18:54:23 +01:00
Zzooouhh
bae778dade
Implemented Soul Echo 2017-12-02 18:37:29 +01:00
Zzooouhh
ea89bdb022
Implemented Soul Echo 2017-12-02 18:35:41 +01:00
Zzooouhh
6454033c5a
Merge pull request #22 from magefree/master 
Merge https://github.com/magefree/mage
 2017-12-02 18:34:34 +01:00
Zzooouhh
7d72172c60
Included Echo counter type 2017-12-02 16:36:54 +01:00
Zzooouhh
09e8b2d737
Implemented Banshee 2017-12-02 15:35:02 +01:00
Zzooouhh
2a72ce7ccf
Implemented Banshee 2017-12-02 15:34:19 +01:00