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

21369 commits

This branch
This branch
All branches
Author SHA1 Message Date
spjspj
e3a61e2c0b Add 1 UST cards 2017-12-16 23:48:22 +11:00
spjspj
b790c03b67 Add 1 UST cards 2017-12-16 22:29:55 +11:00
spjspj
b52d1d64b0 Add 1.25 UST cards 2017-12-16 20:05:05 +11:00
spjspj
b17d35dff3 Add 1.25 UST cards 2017-12-16 18:04:26 +11:00
Oleg Agafonov
be628dab1d Merge remote-tracking branch 'production/master' into production_master 2017-12-16 03:46:09 +04:00
Oleg Agafonov
d066715693 Fixed #4253 (Scythe Specter throw NPE error on 0 cards in opponent hand) 2017-12-16 03:45:38 +04:00
spjspj
2a810e898f
Merge pull request #4251 from spjspj/master 
Add UST cards
 2017-12-16 09:22:38 +10:00
Oleg Agafonov
7a42ea416b Fixed #4252 (errors on paths with $ symbol) 2017-12-16 03:19:32 +04:00
spjspj
667b2affdf Add 2 unstable cards. 2017-12-16 00:34:21 +11:00
spjspj
18b77741df Fix 1 UST card 2017-12-15 23:23:17 +11:00
spjspj
f4cc88bf2a Storm Crow 2017-12-15 22:04:42 +11:00
spjspj
aa40235626 Add 1 unstable cards. 2017-12-15 22:03:35 +11:00
spjspj
8f0da1edc3
Merge pull request #4249 from spjspj/master 
Add 3 unstable cards.
 2017-12-14 23:09:37 +10:00
spjspj
635c446148 Add 2 unstable cards. 2017-12-14 23:44:18 +11:00
spjspj
5ee1c5d2bd
Merge pull request #4247 from spjspj/master 
Add 4 unstable cards.
 2017-12-14 20:20:54 +10:00
spjspj
f39a0d4a77 Add 2 unstable cards. 2017-12-14 19:21:53 +11:00
spjspj
6c643fdbd7 Add 2 unstable cards. 2017-12-14 16:44:42 +11:00
spjspj
1ac47ef82c
Merge pull request #4240 from spjspj/master 
Add 2 unstable cards.
 2017-12-14 11:51:21 +10:00
spjspj
7645f10202 Add 2 unstable cards. 2017-12-14 10:14:48 +11:00
Alexsandro
79086188c2 Change Minion reflector to do the same as FlameshadowConjuring 2017-12-13 20:58:03 -02:00
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
6c02186f2c Add 2 unstable cards. 2017-12-13 09:07:01 +11: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