Commit graph

28913 commits

Author SHA1 Message Date
L_J
dd585c174f
Merge pull request #87 from magefree/master
Merge https://github.com/magefree/mage
2019-01-20 02:29:42 +01:00
Ingmar Goudt
5b38f4168f apply try-with for MtgJson 2019-01-19 23:18:16 +01:00
Ingmar Goudt
e7c729f11c Use autoclosable try-withs 2019-01-19 22:03:13 +01:00
Ingmar Goudt
50f28a2bf7 add some Java8 magic to the server 2019-01-19 09:31:50 +01:00
Jeff
9bea7c7df2 - Added Aggression and Wiitigo. 2019-01-18 17:29:58 -06:00
Evan Kranzler
3e1ce3d81f updated some text on Daretti, Ingenious Iconoclast 2019-01-18 14:29:01 -05:00
Jeff
fed062fe9a - Refactored Tidehollow Sculler. The cast exception issue. 2019-01-18 09:00:19 -06:00
Jeff
232781cc1f - Fixed #5510. Refactored As Foretold. 2019-01-18 08:26:20 -06:00
Oleg Agafonov
f223bdab31 Added new client-server incompatible checks:
* added strict mode (client and server versions must be same, see MAGE_VERSION_MINOR_PATCH_MUST_BE_SAME);
 * you must enable string mode after github code changes in serializeable classes (see #4459);
 * added client-side version checks;
 * added error message on wrong version disconnects.
2019-01-18 13:32:37 +04:00
Evan Kranzler
fa0e295932 updated Ajani's Pridemate to reflect recent errata 2019-01-17 17:40:15 -05:00
Evan Kranzler
e96c257634 fixed implementation of Xantcha, Sleeper Agent 2019-01-17 13:09:11 -05:00
Ingmar Goudt
dbdd9c00a3 Merge branch 'master' of https://github.com/magefree/mage 2019-01-17 18:22:19 +01:00
Ingmar Goudt
8a05db7fd8 small text fix 2019-01-17 18:22:07 +01:00
Evan Kranzler
908d8acc9f
Merge pull request #5532 from magefree/coinFlips
Added support for multiple copies of Krark's Thumb
2019-01-17 11:12:02 -05:00
Evan Kranzler
cbc814d38e some log message changes 2019-01-17 10:57:53 -05:00
Jeff
39d21f22e7 - removed a duplicate of Seraph in masters edition set 2019-01-17 09:34:01 -06:00
Evan Kranzler
837503d8f4 reworked coin doubling again for some reason 2019-01-17 10:32:02 -05:00
Jeff
9b782ec16c - Added Seraph and Chaos Lord 2019-01-17 09:09:49 -06:00
Evan Kranzler
3b47dce117 fixed Price of Fame not receiving cost reduction 2019-01-17 09:02:08 -05:00
Ingmar Goudt
7c2f55eda0 couple of sonar fixes 2019-01-17 12:03:22 +01:00
Oleg Agafonov
63fc53e0f0
Merge pull request #5533 from brodee/master
adding rna AI card ratings
2019-01-17 10:50:34 +04:00
brodee
ea9e2d55fc adding rna AI card ratings
adding rna AI card ratings
2019-01-16 22:47:51 -08:00
brodee
9851b4dc1d
Merge pull request #7 from magefree/master
pulling changes
2019-01-16 22:44:31 -08:00
Evan Kranzler
8ea074b4a3 fixed Plaguecrafter sacrifice text 2019-01-16 21:12:51 -05:00
Evan Kranzler
191e9903ba removed some vestigial commented code 2019-01-16 18:25:00 -05:00
Evan Kranzler
1144bf3b4f finished adding support for multiple copies of Krark's Thumb 2019-01-16 18:20:36 -05:00
Evan Kranzler
21d7bef21f fixed Domri, Chaos Bringer's emblem not triggering 2019-01-16 15:24:16 -05:00
Evan Kranzler
4736a608b1 Update Krark's Thumb 2019-01-16 15:23:01 -05:00
Evan Kranzler
b21f60bc0f
Merge pull request #5531 from magefree/master
merge
2019-01-16 15:12:30 -05:00
Evan Kranzler
74c1cbf6d9 begin fix for multiple copies of Krark's Thumb 2019-01-16 15:11:14 -05:00
Evan Kranzler
99633eb4d6 small change to Krark's Thumb 2019-01-16 14:52:42 -05:00
Oleg Agafonov
975cff93e3 Merge remote-tracking branch 'origin/master' 2019-01-16 21:04:00 +04:00
Oleg Agafonov
c0ef84b4dc Fixed deck file names for windows perl script compatible 2019-01-16 21:01:09 +04:00
Oleg Agafonov
14f66029f8 Missing v33 commit 2019-01-16 20:59:45 +04:00
Evan Kranzler
63fb5964d4
Merge pull request #5527 from magefree/coinFlips
Fixing coin flip implementation (WIP - Do Not Merge)
2019-01-16 11:44:01 -05:00
Evan Kranzler
264433aff7 fixed Sun Droplet only triggering if it had counters on it 2019-01-16 11:26:38 -05:00
Ingmar Goudt
32ecb5ceab replace his or her to their 2019-01-16 13:48:43 +01:00
Ingmar Goudt
bd0b1bffa4 minor rewrite of urborg syphon mage 2019-01-16 13:37:01 +01:00
Ingmar Goudt
fbd985b5b1 Merge branch 'master' of https://github.com/magefree/mage 2019-01-16 13:33:50 +01:00
Ingmar Goudt
a5f46b8816 Urborg Syphon Mage makes opponents lose life, rather than damaging them 2019-01-16 13:33:44 +01:00
Oleg Agafonov
45e0e1c3b2 UI: added beta and check online status buttons to connection dialog; 2019-01-16 13:26:53 +04:00
Evan Kranzler
b57e768bc9 fixed Lumbering Battlement not properly exiling cards 2019-01-16 00:47:46 -05:00
Oleg Agafonov
68177b9fe4 Fixed SacrificeTargetCost text 2019-01-16 05:52:19 +04:00
Evan Kranzler
335dab7160 fixed broken tests 2019-01-15 19:43:41 -05:00
Evan Kranzler
722e44ff2e fixed Bedazzle not dealing damage 2019-01-15 18:20:33 -05:00
Evan Kranzler
8d79d456bc updated Transguild Courier text 2019-01-15 18:16:15 -05:00
Evan Kranzler
2fa3ce912b fixed Cavalcade of Calamity not dealing damage 2019-01-15 18:16:01 -05:00
Evan Kranzler
b18778b1b7 fixed Biogenic Upgrade only targeting controlled creatures 2019-01-15 17:53:32 -05:00
Evan Kranzler
f8a5744208 fixed Domri, Chaos Bringer mana effect persisting through other turns 2019-01-15 17:53:07 -05:00
Evan Kranzler
c34f611279 updated Krark's Thumb, still doesn't work in multiples 2019-01-15 16:55:45 -05:00