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
22165 commits 2 branches 0 tags 782 MiB
Commit graph

6522 commits

Author SHA1 Message Date
LevelX2
f798a25b3b Added some mechanism that helps to prevent unintended changes to StaticFilters. 2018-01-12 15:27:52 +01:00
igoudt
267100d3d6 fix for #4402 2018-01-12 15:03:54 +01:00
Radoslaw Sypen
29a889b236 Merge branch 'master' of github.com:rsypen/mage into fix_tests_not_passing 2018-01-12 10:42:50 +01:00
Radoslaw Sypen
88527987cc Fixed ItThatBetrays and Barrin, Master Wizard broken effects, added new test for Emrakul's annihilator trigger 2018-01-12 10:33:11 +01:00
Zzooouhh
ca46a8872a
Moved PermanentInListPredicate to common predicates 2018-01-11 17:53:32 +00:00
spjspj
ab4490e476
Merge pull request #4398 from spjspj/master 
Add 5 cards  (UGL)
 2018-01-12 00:06:39 +11:00
spjspj
d9bcfa3f31 Add 5 cards (UGL) 2018-01-11 23:55:37 +11:00
spjspj
8a1619f9b4
Merge pull request #4396 from spjspj/master 
Add 3 cards  (UGL)
 2018-01-11 17:56:55 +11:00
spjspj
96e6a917b4 Add 3 cards (UGL) 2018-01-11 17:43:33 +11:00
LevelX2
4c9ed95662 Xmage 1.4.26V11d 2018-01-11 07:14:49 +01:00
LevelX2
2685d9f8b4 Fixed some possible null pointer exceptions (found in server log). Market Festival, Kindred Summons, Profane Processions, New Blood, Kindred Charge , Bishop of Binding, Metzal Tower of Triumph, Chrome Mox 2018-01-11 06:12:27 +01:00
Zzooouhh
a38ec84581
Removed slipped beta Blaze of Glory code 
in case it could break something, as it's still buggy
 2018-01-10 19:49:15 +00:00
Zzooouhh
8f9356533d
Fixed undoing individual blocker declarations for multi-blockers 
One more #4172 fix
 2018-01-10 19:44:48 +00:00
ciaccona007
470bb69a7e Implement Timmy, Power Gamer 2018-01-09 14:14:34 -08:00
ciaccona007
3e87a50b4d Implement Krazy Kow 2018-01-09 13:25:46 -08:00
ciaccona007
79c18d28e2 Implement Chicken Egg 2018-01-09 12:40:39 -08:00
LevelX2
fef0ef83ec xmage 1.4.26V11c 2018-01-08 22:59:35 +01:00
Zzooouhh
1109d2b246
Made Changeling take effect in all zones 
Still doesn't fix Path of Ancestry interaction of Dr. Julius Jumblemorph though
 2018-01-08 17:23:12 +00:00
SpikesCafe-google
645b4ac47b
Rename PermanentReflectionToken.java to PureReflectionToken.java 2018-01-07 20:59:00 -05:00
SpikesCafe-google
99b4b427f0
Create PermanentReflectionToken.java 2018-01-07 20:45:30 -05:00
igoudt
ec5b34be04 Merge branch 'master' of https://github.com/magefree/mage 2018-01-07 22:39:40 +01:00
igoudt
27ec3431ee rewrite with staticfilter 2018-01-07 22:39:31 +01:00
igoudt
6d16e41ec3 use some staticfilters, rewrite some lines to java8 streams 2018-01-07 22:38:54 +01:00
LevelX2
995c58e381 * Reckless Rage - Fixed damge dealing to the creatures. 2018-01-07 22:11:12 +01:00
LevelX2
86857e2e0f Merge origin/master 2018-01-07 18:05:23 +01:00
LevelX2
46bcad2ada Mage 1.4.26V11 2018-01-07 18:04:59 +01:00
Zzooouhh
9c77a5db7a
Added currency counter 2018-01-07 16:13:34 +00:00
LevelX2
0e119ffa01 [RIX] Fixed set card [RIX] Added 5 cards. 2018-01-07 13:29:40 +01:00
LevelX2
3480d47d11 [RIX] Added 7 cards. 2018-01-07 10:54:15 +01:00
LevelX2
15081f7d0e Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
 2018-01-07 02:41:49 +01:00
LevelX2
0f0b1d8330 [RIX] Added 8 cards. 2018-01-07 02:33:32 +01:00
Oleg Agafonov
70e99e185b Updated menace and explore abilities to show or hide description 2018-01-07 03:46:07 +04:00
LevelX2
5935221878 [RIX] Added 6 cards. 2018-01-06 23:47:54 +01:00
LevelX2
b4f9cbd15c [RIX] Added 5 cards. 2018-01-06 22:35:39 +01:00
LevelX2
4571ab8dce [RIX] Added 5 cards. 2018-01-06 21:34:15 +01:00
LevelX2
803df371f9 [RIX] Added 4 cards. 2018-01-06 18:42:03 +01:00
LevelX2
488622662a [RIX] Added Profane Procession, Tomb of the Dusk Rose, Twilight Prophet. 2018-01-06 17:24:00 +01:00
LevelX2
509648448e [RIX] Added 2 cards. 2018-01-06 13:31:50 +01:00
LevelX2
7189cb868f [RIX] Added 9 cards. 2018-01-06 12:40:25 +01:00
LevelX2
f95b0e6c0a Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
 2018-01-05 23:41:30 +01:00
LevelX2
f0494383fd [RIX] Added 4 cards. 2018-01-05 15:26:10 +01:00
Oleg Agafonov
bc75f82524 Fixed wrong ability texts with duplicated card name (see #4335) 2018-01-05 02:21:16 +04:00
LevelX2
145fe8ca15 [Rix] Added 5 cards. 2018-01-04 18:00:08 +01:00
Oleg Agafonov
56949414d1 Fixed wrong ability texts with duplicated card name (see #4335) 2018-01-04 20:48:41 +04:00
Oleg Agafonov
6b9db5eb17 [RIX] Added Deeproot Elite 2018-01-04 05:44:12 +04:00
Oleg Agafonov
3dda5712db AI: fixed not working choice with key-value dialogs, random refactor 2018-01-04 00:23:20 +04:00
LevelX2
547c7078bf [Rix] Added 6 cards. 2018-01-03 18:02:27 +01:00
LevelX2
32fb2507c3 Some rework to Framework. 2018-01-03 11:40:07 +01:00
Oleg Agafonov
1a252e61a2 Fixed #4311: deck editor can't load decks with cards cards from Masterpiece Series Amonkhet (MPS-AKH) 2018-01-03 09:10:39 +04:00
Oleg Agafonov
204a602b36 Added old decklist files compatibility loading (free to change card numbers, names and codes, see #4332) 2018-01-03 07:43:15 +04:00
LevelX2
02f6ce7639 Merge origin/master 2018-01-02 23:48:27 +01:00
LevelX2
bc490ef91a Added Spellweaver Volute. 2018-01-02 23:48:07 +01:00
LevelX2
7d026c699f [RIX] Added 3 cards. 2018-01-02 17:47:38 +01:00
LevelX2
70c08a2d81 * Victimize - Fixed that continuous effects of sacrificed permanent did not end before returning targets from graveyard (fixes #4315). 2018-01-02 15:01:58 +01:00
Zzooouhh
f201ec6fc0
Merge pull request #4326 from Zzooouhh/Zzooouhh-hml 
Implemented some Homelands cards
 2018-01-02 09:11:46 +01:00
Zzooouhh
497ebebc05
Implemented Broken Visage 2018-01-02 05:52:47 +01:00
Zzooouhh
bde116e201
Implemented Autumn Willow 2018-01-02 05:48:06 +01:00
Zzooouhh
aa10e2d336
Implemented Autumn Willow 2018-01-02 05:46:33 +01:00
Zzooouhh
49aa22079f
Added net counter 2018-01-01 19:09:08 +01:00
igoudt
54c585afd8 fixes #4317 2017-12-31 22:24:03 +01:00
LevelX2
d87ce66347 Added Even the Odds and reworked Feast of Blood's cast restriction. 2017-12-31 12:55:21 +01:00
LevelX2
519eae42fc * Fixed some problems with abilities that let permanents become artifact creatures but only added creature card type instead of artifact and creature card type (fixes #4290). 2017-12-31 11:31:58 +01:00
LevelX2
330c6f1393 XMage 1.4.26V10 2017-12-30 20:17:04 +01:00
LevelX2
e81f6c5e90 * Unearth - Fixed that a pahsed out creature were wrongly exiled by unearth. 2017-12-30 19:15:33 +01:00
LevelX2
529a38a96f Fixed some card download problems. 2017-12-30 18:36:03 +01:00
Zzooouhh
0f61bdeabd
Lot of progress on Panglacial Wurm quirks 2017-12-30 06:14:45 +01:00
Zzooouhh
1f5ab92e9d
Fix attempt 2017-12-30 03:15:17 +01:00
Zzooouhh
4c5dc3f839
Fix attempt 2017-12-30 03:09:56 +01:00
Zzooouhh
310764814f
Minor fix 2017-12-30 02:42:32 +01:00
Zzooouhh
c675f3b4d1
Cleanup, improvements etc. 2017-12-30 02:26:14 +01:00
Zzooouhh
818a005b59
Fixed double copypaste 2017-12-30 02:06:39 +01:00
Zzooouhh
d671c2a06c
Plenty of Panglacial Wurm fixes 2017-12-30 02:03:36 +01:00
Zzooouhh
549fb0fb22
Merge pull request #28 from Zzooouhh/Zzooouhh-csp-panglacialwurm 
Zzooouhh csp panglacialwurm
 2017-12-30 01:24:44 +01:00
Zzooouhh
5a1a6f7031
Implemented Panglacial Wurm (buggy!) 2017-12-30 01:23:52 +01:00
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