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

6448 commits

Author SHA1 Message Date
Zzooouhh
fc754372bd
Implemented Panglacial Wurm 2017-12-30 01:09:35 +01:00
Oleg Agafonov
e87db19b7d Tests: fixed NykthosShrineToNyx that broke dozens of other tests with mana choice 2017-12-29 17:10:07 +04:00
Zzooouhh
31648dbc0e
Changed PermanentImpl to Permanent 2017-12-29 05:31:55 +01:00
Oleg Agafonov
78b8d64649 Merge remote-tracking branch 'production/master' into production_master 2017-12-29 06:16:51 +04:00
Oleg Agafonov
af0c77a409 UI: added custom sorting in choice dialog 2017-12-29 06:11:10 +04:00
Zzooouhh
f93c55025e
Auras targetting tokens fix (fixes #4297) 2017-12-29 01:10:06 +01:00
Oleg Agafonov
35a950dc80 Merge remote-tracking branch 'production/master' into production_master 2017-12-29 04:03:45 +04:00
Oleg Agafonov
e4dfa5925b UI: added start selection value on choice dialog popup; 2017-12-28 22:38:18 +04:00
LevelX2
80f71027d6 Merge origin/master 2017-12-28 16:56:13 +01:00
LevelX2
f88a42dd74 Merge origin/master 2017-12-28 16:53:56 +01:00
Zzooouhh
c25eaa9446
Fixed one overlooked instance of lethalDamage 2017-12-28 16:53:52 +01:00
LevelX2
d808b15569 * Hollow One - Fixed counting of discarded/cycled cards if returned to hand during a turn. 2017-12-28 16:52:51 +01:00
Zzooouhh
f166bebe8c
Fixed lethal damage potentially dipping into negative values 
Example: in multiple multi-blocker creatures blocking the same creatures (if one of them assigns more than lethal to the first creature in its attackerOrder)
 2017-12-28 16:49:51 +01:00
LevelX2
6d17199129 * Toxin Sliver - Fixed that the damaged creature was not destroyed. 2017-12-28 15:57:31 +01:00
LevelX2
91efa42d0d Merge origin/master 2017-12-28 12:57:53 +01:00
LevelX2
d85637336e * Cabal Ritual, Gemstone Caverns, River of Tears - Fixed a problem that the tap for mana event was sent twice for theses lands (fixes #4288). 2017-12-28 12:57:16 +01:00
Oleg Agafonov
8a699bae81 Merge remote-tracking branch 'production/master' into production_master 2017-12-28 15:40:21 +04:00
Zzooouhh
cedfc5591b
Merge pull request #4293 from Zzooouhh/master 
Implemented Corrosion and Desolation
 2017-12-28 12:39:54 +01:00
Oleg Agafonov
101cb304fb Fixed typos 2017-12-28 15:39:00 +04:00
Oleg Agafonov
6afbcb638b Updated cards for new choice dialog 2017-12-28 04:25:17 +04:00
Oleg Agafonov
3bdd2ae8bb Fixed choice typos 2017-12-28 04:14:37 +04:00
Oleg Agafonov
7954031f41
Merge pull request #4283 from JayDi85/ui-choose-new 
Added new choose dialog
 2017-12-28 02:59:09 +04:00
Oleg Agafonov
68c6551188 Fixed cards with any color lands produce ability: 
* Fixed ManaOptions result (no more duplicated records with same options);
  * Fixed mana types searching (now mana search return {Any} type too);
  * Fixed cards: Fellwar Stone, Harvester Druid, Reflecting Pool (#4125), Sylvok Explorer, Exotic Orchard (#3374), Naga Vitalist;
 2017-12-28 02:15:49 +04:00
Oleg Agafonov
80b5026ec7 Search enabled by default 2017-12-27 06:42:27 +04:00
Oleg Agafonov
534e00e41f Updated choose color dialog: added mana value and ability source 2017-12-27 06:32:24 +04:00
Oleg Agafonov
75cec526dc Fixed magic "error switch" for unit tests 2017-12-27 06:26:05 +04:00
Zzooouhh
3de6f417dc
Combat.removeBlocker incorrectly ignored blockingGroups (Partial fix for #4172) 2017-12-26 22:29:54 +01:00
Zzooouhh
3a7b1454f8
Implemented Corrosion 2017-12-26 16:50:46 +01:00
LevelX2
8228cee30c * Some minor changes. 2017-12-26 10:59:28 +01:00
Oleg Agafonov
531b5bc569 Added auto enabled search for all pickup dialogs with many items; 2017-12-25 12:47:30 +04:00
Oleg Agafonov
749ca59ad6 Added new choose dialog (creature types and etc): 
* added incremental search;
 * added keyboard hotkeys (up/down for select, enter for choose);
 * added choose by mouse double click;
 * added source card name;
 * fixed cancel button on required choice (#4230);
 * fixed text sizes form messages (now it's auto size);
 2017-12-25 08:12:02 +04:00
LevelX2
cfadfe9942 * Fixed a problem that subtypes were still present (e.g. for spell cost reduction) for cards cast face down (fixes #4277). 2017-12-24 01:07:35 +01:00
LevelX2
6f8aec173d [RIX] Added 2 cards. 2017-12-24 00:36:56 +01:00
Zzooouhh
e6fa563919
Merge pull request #4225 from Zzooouhh/master 
Implemented cards, overflow check & other stuff
 2017-12-24 00:17:08 +01:00
Zzooouhh
688e0658b7
Moved overflow check method to CardUtil 2017-12-23 23:58:40 +01:00
Zzooouhh
c4334ef043
Moved overflow check method to CardUtil 2017-12-23 23:58:31 +01:00
Zzooouhh
88e421918e
CardUtil overflow 2017-12-23 23:19:33 +01:00
Zzooouhh
2bb4f07df2
CardUtil overflow 2017-12-23 23:17:53 +01:00
Zzooouhh
ab3128975a
Overflow check methods in CardUtil 2017-12-23 23:01:35 +01:00
LevelX2
3df4af2104 [RIX] Added Tetzimoc, Primal Death. 2017-12-23 19:27:47 +01:00
LevelX2
66acc1c1e8 [RIX] Added 6 cards. 2017-12-23 18:54:43 +01:00
spjspj
5af1355083
Merge pull request #4274 from spjspj/master 
Add The Big Idea
 2017-12-23 21:03:19 +10:00
LevelX2
ef34b3ca21 [RIX] Added Angrath's Ambusher and Angrath, Minotaur Pirate. 2017-12-23 11:30:12 +01:00
spjspj
f9896be537 Add The Big Idea (UST) 2017-12-23 18:32:20 +11:00
spjspj
118e05516a
Merge pull request #4273 from spjspj/master 
Slight fix
 2017-12-23 15:44:01 +10:00
spjspj
5272b88947 Slight fix 2017-12-23 16:43:10 +11:00
Zzooouhh
6fae8ef606
Merge branch 'master' into master 2017-12-22 23:17:20 +01:00
Oleg Agafonov
8624671a52 typos 2017-12-22 09:23:33 +04:00
Oleg Agafonov
39ca5a13f4 Added new set: Explorers of Ixalan (47 cards, 1 token) 2017-12-22 09:18:41 +04:00
LevelX2
43c732c751 [RIX] Added Vona's Hunger. 2017-12-21 17:08:24 +01:00
spjspj
856cb2b71d
Merge pull request #4267 from spjspj/master 
Add Arboria (LEG)
 2017-12-21 16:25:48 +10:00
spjspj
3055bac004 Add Arboria (LEG) 2017-12-21 17:07:08 +11:00
LevelX2
eecc322618 [RIX] Added Brass's Bounty. 2017-12-20 16:26:08 +01:00
spjspj
38272a6dde Add Arboria (LEG) 2017-12-21 01:08:55 +11:00
Zzooouhh
bf6939f45b
Included overflow check methods 2017-12-20 00:31:31 +01:00
Zzooouhh
40561e900a
Included overflow check methods 2017-12-20 00:29:36 +01:00
Zzooouhh
35bbe20b95
Included overflow check methods 2017-12-20 00:21:44 +01:00
Zzooouhh
29c9ce696d
Included overflow check methods 2017-12-20 00:20:27 +01:00
Zzooouhh
4a6ff5593e
More edits 2017-12-19 01:40:44 +01:00
Zzooouhh
a4ce4e4b17
Merge pull request #23 from magefree/master 
Merge https://github.com/magefree/mage
 2017-12-18 03:08:01 +01:00
Zzooouhh
860909408d
Minor improvement 2017-12-17 23:03:54 +01:00
Zzooouhh
aa7231bec0
Expanded DoUnlessTargetPlayerOrTargetsControllerPaysEffect 2017-12-17 19:41:22 +01:00
Zzooouhh
982c178921
Added DoUnlessTargetPlayerOrTargetsControllerPaysEffect 2017-12-17 14:46:24 +01:00
spjspj
578ea668bb Add Summon The Pack (modification - needs the creatures to be zombies (done) but not black) 2017-12-18 00:28:37 +11:00
spjspj
b17d35dff3 Add 1.25 UST cards 2017-12-16 18:04:26 +11:00
spjspj
667b2affdf Add 2 unstable cards. 2017-12-16 00:34:21 +11:00
spjspj
635c446148 Add 2 unstable cards. 2017-12-14 23:44:18 +11:00
spjspj
f39a0d4a77 Add 2 unstable cards. 2017-12-14 19:21:53 +11:00
spjspj
7645f10202 Add 2 unstable cards. 2017-12-14 10:14:48 +11:00
spjspj
7c855990c9 Add 1 unstable card. Fix dice roll (was only returning '0-(n-1)') 2017-12-12 00:08:37 +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
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
dce69c18dc + improved deck import from deckstats 2017-12-09 18:52:24 +04: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
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
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
dcce07cfdc
Implemented Butcher Orgg 2017-12-06 15:00:09 +01:00
LevelX2
8fac7a3dc1 XMage 1.4.26V9 2017-12-03 18:15:16 +01:00
Zzooouhh
7d72172c60
Included Echo counter type 2017-12-02 16:36:54 +01:00
LevelX2
b2e3201ea4 [RIX] Added some cards. Added some spoiler texts to mtg-cards-data.txt 2017-12-02 13:39:30 +01:00
Zzooouhh
659e3d7015
Merge branch 'master' into master 2017-11-26 21:17:27 +01:00
Zzooouhh
32ef8a5047
Small damage fix 2017-11-25 09:10:01 +01:00
Zzooouhh
200e5e07bf
Hollowhenge Spirit fix (partial fix for #4172) 2017-11-25 08:48:21 +01:00
Zzooouhh
b035c436d5
Another small fix 2017-11-25 08:35:18 +01:00
Zzooouhh
a7514fc671
Added mustBlockAllAttackers 2017-11-25 07:49:30 +01:00