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

6753 commits

Author SHA1 Message Date
Evan Kranzler
240ac2c813 Implemented In Bolas's Clutches 2018-04-16 13:21:52 -04:00
spjspj
91cf3556d4
Merge pull request #4772 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-17 02:43:45 +10:00
spjspj
776928c76c Continuing implementation of Planechase. 2018-04-17 02:13:48 +10:00
LevelX2
5b6e3cd72e Merge origin/master 2018-04-15 21:54:46 +02:00
LevelX2
9d7b2c808e [DOM] Added five cards. 2018-04-15 21:54:03 +02:00
Evan Kranzler
50b5377a8e fixed mana pool errata 2018-04-15 14:30:01 -04:00
Evan Kranzler
ef33472ee5 fixed some tests and text 2018-04-15 13:50:48 -04:00
spjspj
0ffd895be9 Minor revert. 2018-04-15 20:58:04 +10:00
spjspj
b7b70c2aec
Merge pull request #4761 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-15 19:41:40 +10:00
spjspj
b45a409939 Continuing implementation of Planechase. 2018-04-15 19:40:15 +10:00
LevelX2
8facef4140 Merge origin/master 2018-04-15 11:34:25 +02:00
LevelX2
041ad9e036 [DOM] Added three cards. Some fixes to rule texts and some more minor fixes. 2018-04-15 11:33:57 +02:00
spjspj
2f966b7a2c
Merge pull request #4754 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-15 17:26:03 +10:00
Evan Kranzler
455e859e97 Implemented Ancient Animus 2018-04-14 21:21:34 -04:00
Evan Kranzler
62869362e2 fixed parley count including players out of range (fixes #4757) 2018-04-14 21:04:25 -04:00
theelk801
c9a6903253
Merge pull request #4753 from jpgunter/master 
Implement Multani, Yavimaya's Avatar
 2018-04-14 20:52:29 -04:00
Evan Kranzler
2252353592 fixed an accidental error 2018-04-14 18:48:47 -04:00
Evan Kranzler
d753cffb01 Implemented Mishra's Self Replicator 2018-04-14 17:23:35 -04:00
spjspj
a828050ae1 Continuing implementation of Planechase. 2018-04-14 23:09:37 +10:00
LevelX2
245a3c5202 [DOM] Added Saga ability and Fall of the Thran. 2018-04-14 14:30:20 +02:00
Michael Simons
d9d9da1152 Merge origin/master 2018-04-14 00:21:07 -04:00
Michael Simons
c5c2d13bd6 Added EquipLegendaryAbility (used by Blackblade Reforged) 2018-04-14 00:13:33 -04:00
Jimmy Gunter
37ebdaa6b7 Implement Multani, Yavimaya's Avatar 2018-04-13 19:02:15 -07:00
spjspj
4f8d58d198
Merge pull request #4749 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-14 11:09:40 +10:00
spjspj
611b48fd47 Continuing implementation of Planechase. 2018-04-14 10:47:49 +10:00
LevelX2
d83de60467 [DOM] Added 4 cards. 2018-04-13 23:53:35 +02:00
18ths
8cb26b1de6 Implemented Bestial Fury 2018-04-13 21:14:58 +02:00
spjspj
d97a3ebf04 Continuing implementation of Planechase. 2018-04-13 01:20:10 +10:00
spjspj
b5a7052697
Merge pull request #4747 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-12 23:37:31 +10:00
spjspj
3e092c2211 Continuing implementation of Planechase. 2018-04-12 21:03:53 +10:00
Justin Herlehy
45a22e85ab
[DOM] Implement 3 Cards 
Add: Academy Journeymage
Add: Adeliz, the Cinder Wind
Add: Befuddle
Update: Set file
Update: Knight Token
Update: Static Filter for Opponents Creatures
 2018-04-11 23:20:16 -07:00
spjspj
87d19c7d51 Continuing implementation of Planechase. 2018-04-12 11:51:28 +10:00
spjspj
c8b741f0bf Continuing implementation of Planechase. 2018-04-12 00:07:24 +10:00
spjspj
dbbc5f255c
Merge pull request #4741 from spjspj/master 
Beginning of implementation of Planechase.
 2018-04-11 09:31:39 +10:00
LevelX2
03f5b8c2da * Vindictive Lich - Fixed that it did only execute the first effect (fixes #4742). 2018-04-10 23:17:19 +02:00
spjspj
dabef80af2 Beginning of implementation of Planechase. 2018-04-10 23:41:37 +10:00
LevelX2
8bee825d5c
Merge pull request #4734 from spjspj/master 
Beginning of implementation of Planechase.
 2018-04-10 10:45:26 +02:00
spjspj
334cfbc9d0 Beginning of implementation of Planechase. 2018-04-09 23:28:39 +10:00
spjspj
57354d83bb Beginning of implementation of Planechase. 
10 or so initial planes that (mostly) have been tested, no phenomenons as yet and no modifying yet of chaos rolls.  Also no support for a user to be able to set if it is planechase (able to do so via the cheat button).
 2018-04-09 19:38:37 +10:00
Michael Simons
c38dacb879
Update LookLibraryAndPickControllerEffect to support random order return 
New Dominaria cards support looking in library and returning to bottom of library in random order.
 2018-04-08 22:09:43 -04:00
Justin Herlehy
702756b4e7 [DOM] Implement Legendary Sorceries 
Add: Target Any Target for damage spells
Add: Drudge Sentinel
Fix: Genesis Wave Filter
 2018-04-08 18:37:11 -07:00
spjspj
e932c139d9 Beginning of implementation of Planechase. 
10 or so initial planes that (mostly) have been tested, no phenomenons as yet and no modifying yet of chaos rolls.  Also no support for a user to be able to set if it is planechase (able to do so via the cheat button).
 2018-04-09 08:44:48 +10:00
igoudt
49ee8f9856 add 3 DOM cards, added a token, updated card text 2018-04-08 02:16:52 +02:00
JRHerlehy
db8af2d4f7 [DOM] Implement 3 Cards 
Add Grunn, the Lonely King
Add Naru Meha, Master Wizard
Add Verix Bladewing & Token
Fix Seal Away text
 2018-04-06 00:01:46 -07:00
JRHerlehy
01c273ad20 Code DeDupe 
Reorder Dominaria Set file to alphabetical to allow card gen script to execute as expected.
 2018-04-04 22:11:22 -07:00
igoudt
d828427b8f remove T type from OptionalAdditionalCostImpl. The class was of a type that extended itself. No idea how to interpret that. 2018-04-04 23:29:25 +02:00
Oleg Agafonov
f6b8d0fea6
Merge pull request #4707 from delftswa2018/feature/SOLID-fix-in-Token-classes 
SOLID violation fix in token classes
 2018-04-04 18:31:52 +04:00
Oleg Agafonov
da919d5301 Fixed Elves type 2018-04-04 06:12:39 +04:00
Christiaan
7885fe42a0 Fixed subtype of Elvish Impersonator 2018-04-03 16:31:42 +02:00
Marc Zwart
1053db617b fixed missing linebreaks 2018-04-03 14:31:59 +02:00
Marc Zwart
3e32287f00 fixed Token/TokenImpl imports and references 2018-04-03 14:05:41 +02:00
Marc Zwart
d4d8a04694 Extracted Token interface and renamed Token implementation to TokenImpl + renamed tests 2018-04-03 14:04:08 +02:00
Marc Zwart
12becca27d removed unused / bad code + fixed implementations of new tokens 2018-04-03 12:55:45 +02:00
Marc Zwart
03eb170a04 made permanent tokens from framework compliant with new abstract superclass 2018-04-02 17:47:04 +02:00
Marc Zwart
2d922cb6af marked Token class as abstract and removed abstracted copy method 2018-04-02 17:45:56 +02:00
LevelX2
1e2e53073c * Deep Analysis - Fixed that its flashback costs did not work with mana casting cost modification effects (fixes #4677). 2018-04-02 15:30:57 +02:00
L_J
6c98f4802e
Fix for Cabal Slaver 
Cabal Slaver's ability caused the damaging goblin's controller to discard
 2018-03-31 00:06:44 +00:00
Plopman
1466cc2a81 Fix Axelrod Gunnarson 2018-03-27 00:07:13 +02:00
Plopman
a33916f3f4 Add StaticFilters.FILTER_CONTROLLED_LAND_SHORT_TEXT 2018-03-27 00:04:13 +02:00
spjspj
1340f75c1e
Merge pull request #4658 from spjspj/master 
Karn, Scion of Urza (DOM)
 2018-03-25 09:04:49 +11:00
spjspj
4527f791aa Karn, Scion of Urza (DOM) 2018-03-25 01:44:23 +11:00
igoudt
c535b81bff changed some == to .equals() 2018-03-22 23:37:07 +01:00
igoudt
00f91391e9 Homarid Drake, reprints, and rewriting his or her to their 2018-03-22 16:52:26 +01:00
igoudt
03355aee37 Merge branch 'master' of https://github.com/magefree/mage 2018-03-22 14:45:28 +01:00
ArcadeMode
5ac975c52e Blocker and Critical level bugfixes throughout the project (#4648) 
* fixed https://sonarcloud.io/project/issues?id=org.xmage%3Amage-root&issues=AWIlv32RgrzAwlaaQ7rP&open=AWIlv32RgrzAwlaaQ7rP

* ensure closing of scanner if it was opened

* Refactored method in EmpyrialArchAngel to not always return same value.

* Refactored method in FalkenrathAristocrat to not always return same value.

* Refactored method in GilderBairn to not always return the same value.

* fixed left open resources, ensured quiet closing of the streams

* Refactored method in IceCave to not always return same value.

* Refactored method in KjeldoranRoyalGuard to not always return same value.

* Refactored method in LegionsInitiative to not always return same value.

* Refactored method in NaturesWill to not always return same value.

* added quiet closing method in new streamutils class, used to clean up the connectdialog

* Fix small typo

* added quiet closing to saveobjectutil

* closed resources in savegame method of gamecontroller

* properly close resources in loadGame method of GameReplay class

* further proper resource closing in ServerMessagesUtil

* fixed unclosed resources in copy method in mage framework Copier

* closed unclosed resources in copyCompressed method in Copier

* ensure closing of filewriter in manasymbols

* ensure proper closing of Stream in arcane UI

* ensure closing of datagram socket in arcane Util

* ensure resource closing in deckimport from clipboard

* ensure closing of plugin classloader

* ensured closing of zipinputstream resource

* ensure closing of fileoutputstream in ScryfallSymbolsSource

* ensure closing resources after finishing/canceling download of pictures

* remove commented code

* move locks to try block to ensure unlocking along all execution paths

* remove dangerous instance of double-checked locking

* removed dangerous instance of double checked locking in settingsmanager

* Removed dangerous instance of double-checked locking in ThemePluginImpl

* close resource which did not happen certainly

* close another stream

* ensure closing of inputstream
 2018-03-22 08:13:13 -05:00
igoudt
af83a34c64 added Academy Drake, Knight of Malice, Hexproof from White 2018-03-22 12:06:45 +01:00
igoudt
ad8b046b05 a list that is null is just strange, just use an empty List 2018-03-22 12:06:45 +01:00
igoudt
e205fef785 added a removeIf and streams 2018-03-22 12:06:45 +01:00
LevelX2
f56b2fb86c [ODY] Added Charmed Pendant. 2018-03-20 21:42:10 +01:00
LevelX2
48cfe249f7 * Fixed a problem that a gained "is all creature types" from continous effects were not propertly reset on permanents. 2018-03-20 13:39:48 +01:00
Chase
491a05b2df Fix Mana#containsAny to account for Any mana 2018-03-20 01:39:26 -07:00
spjspj
8ff4f81cea
Merge pull request #4640 from spjspj/master 
New M15 Rendering for Unstable lands
 2018-03-20 16:49:00 +11:00
spjspj
a368c93845 New M15 Rendering for Unstable lands 2018-03-20 16:12:43 +11:00
LevelX2
d29707bdea * Morph - Fixed that turning creatures face up didn't restore their subtypes (fixes #4566). 2018-03-18 19:37:25 +01:00
LevelX2
b073ce1c42 * Added to all toUpperCase/toLowerCase calls the Locale.ENGLISH to prevent problems with some languages (e.g. Turkish). Removed some unused import statements. (#4634). 2018-03-18 18:18:54 +01:00
LevelX2
03ebdc17d8
Merge pull request #4632 from CountAndromalius/master 
Corrected "Any TYPE among permanent types" handling
 2018-03-18 16:25:47 +01:00
igoudt
7344a15a9b remove comparator, use Comparator.comparing 2018-03-18 00:56:52 +01:00
igoudt
5736272dd6 add historic spell filter 2018-03-18 00:38:30 +01:00
igoudt
6a24de6e5a added Saga enchantment subtype and default method for isHistoric 2018-03-18 00:32:50 +01:00
igoudt
ddf568679f added 3 Dominari cards, benalish marshal, charge, knight of grace, added a new condition and a new ability 2018-03-18 00:22:03 +01:00
LevelX2
b046428f8c XMage 1.4.28V1 2018-03-17 23:59:34 +01:00
LevelX2
442130beb6 Some minor changes. 2018-03-17 23:40:36 +01:00
LevelX2
85b13b88c8 * Kindred Summons - Fixed that no creatures were put onto the battlefield. 2018-03-17 22:35:03 +01:00
Count Andromalius
240416146e Merge remote-tracking branch 'upstream/master' 2018-03-17 15:24:40 -03:00
LevelX2
7d1af66162 * Fixed Sacrific a creature text and filter handling. 2018-03-17 18:58:18 +01:00
Count Andromalius
86443d7cd4 Corrected error when handling colorless permanents on "Any type among [...] permanents" 
Also changed comment on AnyColorLandsProduce for clarity
 2018-03-17 11:35:50 -03:00
LevelX2
66bd5294e8 * Removed effect's ApplyEffectsAfter functionality. It's now always applied. 2018-03-17 13:43:31 +01:00
LevelX2
d9ede35857 * MIracle - Fixed a problem with miracle casting costs. 2018-03-17 12:35:40 +01:00
LevelX2
170ad083c7 * Fixed a problem of the AI that it could cast cards with flashback without paying the costs. 2018-03-17 01:51:25 +01:00
LevelX2
946503864a Merge origin/master 2018-03-16 20:12:08 +01:00
LevelX2
62db7ae72f * Skyshrout War Beast - Fixed wrong P/T calculation because of wrong land filter. 2018-03-16 20:11:10 +01:00
CountAndromalius
d7458c5e35 Implemented [DOM] Mox Amber (#4622) 2018-03-16 14:09:35 -05:00
LevelX2
b035d85f98 * Fixed a problem that triggered abilities that face down permanents got from other sourced did not trigger (fixes #4571). 2018-03-16 15:06:15 +01:00
LevelX2
fdd8cd0e09 * It That Betrays - Fixed that target handling of second triggered ability did not work correct (fixes #4568). 2018-03-16 15:04:31 +01:00
LevelX2
dbfb708e44 * It That Betrays - Fixed that target handling of second triggered ability did not work correct (fixes #4568). 2018-03-16 13:13:16 +01:00
Jeff
6e4d655ac1 - Fixed #4521 2018-03-15 07:59:20 -05:00
Oleg Agafonov
83a3de9a93 * UI: improved choose number dialog (fixed enter key, added more info colorized info for mana distribute dialog); 2018-03-15 00:14:04 +04:00
LevelX2
1e1e361c60 * Some minor changes to Casting of Bones and the used effect. 2018-03-13 22:57:27 +01:00
LevelX2
c8b1c6058b
Merge pull request #4613 from AMWJ/master 
Implemented card: Casting of Bones
 2018-03-13 22:19:38 +01:00
LevelX2
d101dc5a0e
Merge pull request #4617 from delftswa2018/hotfix/play-land-event 
Fire PLAY_LAND event only after replace check
 2018-03-13 22:14:05 +01:00