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

21615 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Zzooouhh
a2840cd148
Doom Cannon fix 2017-12-07 22:49:18 +01:00
Zzooouhh
33cdada012
Callous Oppressor fix 2017-12-07 22:46:24 +01:00
Zzooouhh
887fec5301
Implemented Glyph of Life 2017-12-07 21:59:42 +01:00
Zzooouhh
73504fd3c1
Implemented Glyph of Life 2017-12-07 21:58:30 +01:00
Oleg Agafonov
763594e579 type 2017-12-08 00:53:46 +04:00
Zzooouhh
b16f50cd72
Entrails Feaster fixes 2017-12-07 21:28:42 +01: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
Zzooouhh
230233659b
Some naming changes, Butcher Orgg first strike fix 2017-12-07 11:13:27 +01: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
Oleg Agafonov
117514a0a9 Fixed #4226 - wrong ability text in Drakestown Forgotten 2017-12-07 05:32:00 +04:00
Zzooouhh
d8daec11d4
Fixed Butcher Orgg handling attackers/blockers leaving combat 2017-12-07 01:04:31 +01:00
Zzooouhh
d6a08fbdd7
NullPointerException fix 2017-12-07 01:01:52 +01:00
Zzooouhh
e1fdc3093a
Some other edits + small fix for Defensive Formation 2017-12-06 21:30:33 +01:00
Zzooouhh
5fec04935d
Optimization edit for assignDamageToBlockers 2017-12-06 20:31:54 +01:00
Zzooouhh
c6e69868fa
Test message cleanup 2017-12-06 19:50:06 +01:00
Zzooouhh
edd07d4f80
Implemented Butcher Orgg (the missing bits) 2017-12-06 19:46:13 +01:00
Zzooouhh
16513408fc
Cleanup #2 2017-12-06 17:05:30 +01:00
Zzooouhh
b48c37ea8f
Defensive Formation slight cleanup 2017-12-06 17:02:49 +01:00
Zzooouhh
47ef2a4ce4
Implemented Butcher Orgg (partially) 
Option to divide damage while being a blocker doesn't work for some reason
 2017-12-06 16:31:36 +01:00
Zzooouhh
c3747b353a
Implemented cards 2017-12-06 15:03:04 +01:00
Zzooouhh
0e60bcb7fa
Implemented Butcher Orgg 2017-12-06 15:00:27 +01:00
Zzooouhh
dcce07cfdc
Implemented Butcher Orgg 2017-12-06 15:00:09 +01:00
Zzooouhh
d1bed7a532
Implemented Shieldmage Elder 2017-12-06 14:58:07 +01:00
Zzooouhh
c98c638e17
Implemented Kamahl's Summons 2017-12-06 14:56:55 +01:00
Zzooouhh
a703e52939
Implemented Entrails Feaster 2017-12-06 14:55:54 +01:00
Zzooouhh
f7b747bcdb
Implemented Doom Cannon 2017-12-06 14:54:56 +01:00
Zzooouhh
cad645e1c5
Implemented Callous Oppressor 2017-12-06 14:54:14 +01:00