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

14067 commits

Author SHA1 Message Date
L_J
0e4af73cc9
Implemented Lim-Dûl's Hex 2018-03-25 01:50:26 +00:00
L_J
3a355669aa
Implemented Leshrac's Sigil 2018-03-25 01:49:05 +00:00
L_J
93d1d5b390
Implemented Monsoon 2018-03-25 01:48:10 +00:00
L_J
89d3284f1f
Implemented Drought 2018-03-25 00:13:14 +00:00
L_J
a37d1aa868
Implemented Drought 2018-03-25 00:12:59 +00: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
Jeff
a71c627fc7 - Added Cabal Shrine, Hint of Insanity, Mind Burst, and Traveling Plague. Odyssey set 100%. 2018-03-23 12:10:29 -05:00
Oleg Agafonov
eeaa40c945 [DOM] Renamed Fall into Oblivion to Cast Down 2018-03-23 11:15:41 +04:00
Oleg Agafonov
0eeada3264 [DOM] Fixed not working Fall into Oblivion 2018-03-23 11:10:52 +04:00
igoudt
c535b81bff changed some == to .equals() 2018-03-22 23:37:07 +01:00
Jeff
ffb4ea647f - Fixed Morality Shift. #4652 2018-03-22 16:35:33 -05:00
Jeff
802e9f99af - Added Cephalid Shrine. 2018-03-22 15:12:30 -05: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
spjspj
4382a4f247
Merge pull request #4649 from spjspj/master 
Song of Blood (VIS)
 2018-03-23 00:26:29 +11:00
spjspj
498a39126d Song of Blood (VIS) 2018-03-23 00:24:07 +11: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
Jeff
ec77cecbf6 - Removed unneeded spell copy checks 2018-03-22 08:07:40 -05:00
igoudt
af83a34c64 added Academy Drake, Knight of Malice, Hexproof from White 2018-03-22 12:06:45 +01:00
Jeff
270951bf89 - Added Dwarven Shrine. 2018-03-21 17:19:01 -05:00
Jeff
be67d61997 - Added Mad Dog. 2018-03-21 16:29:09 -05:00
igoudt
b6dbdf60d5 add Serra Disciple, change collector number Knight of Grace 2018-03-21 17:32:05 +01:00
igoudt
72879c44b9 fix comment and rename effect 2018-03-21 16:36:37 +01:00
LevelX2
9f2f7673c6 [ODY] Added Natuko Shrine and Rites of Spring. 2018-03-21 00:09:20 +01:00
LevelX2
f56b2fb86c [ODY] Added Charmed Pendant. 2018-03-20 21:42:10 +01:00
Jeff
cddb4af9e6 - Added Painbringer. 2018-03-20 10:21:12 -05:00
LevelX2
dcb3d5fb27 * Fixed a bug of Mizzixs Mastery that could lead to a endless loop. 2018-03-20 11:29:09 +01: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
Jeff
92b76b7c09 - Added Bamboozle. 2018-03-19 17:18:40 -05:00
Jeff
ab5fe47ce7 - Added Aven Shrine. 2018-03-19 14:56:31 -05:00
LevelX2
077d041623 Merge origin/master 2018-03-19 18:41:36 +01:00
LevelX2
ad215a054d * Unified spelling of Kongming, 'Sleeping Dragon' for all sets it is included. 2018-03-19 18:40:56 +01:00
Jeff
a71c16b033 - Added Tattoo Ward. 2018-03-19 11:38:14 -05:00
Jeff
b9c3f353e3 - Added requested card Verdant Succession. 2018-03-19 09:21:50 -05:00
igoudt
af130859e1 Add Invoke the Divine, Lyra Dawnbringer 2018-03-19 11:21:06 +01:00
LevelX2
de0333936a
Merge pull request #4636 from sinsedrix/card-implement 
Implemented card: Kaervek's Purge
 2018-03-18 23:41:37 +01:00
LevelX2
4afdcc860a * Alhammarret, High Arbiter - Fixed not working ability that prevents spell casting (fixes #4561). 2018-03-18 23:38:24 +01:00
Sinsedrix
54a96a7f4a Implemented card: Kaervek's Purge 
Updated: Builder's Bane
 2018-03-18 21:55:43 +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
LevelX2
ffa735366e Some code cleanup for using DevoidAbility. 2018-03-18 16:03:52 +01:00
igoudt
bd4b5f6300 add Jhoira Weatherlight Captain + tests 2018-03-18 11:55: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
442130beb6 Some minor changes. 2018-03-17 23:40:36 +01:00
LevelX2
711fa7dcec * Eye of the Stomr - some rework. 2018-03-17 23:40:15 +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
Jeff
8bc3efff07 - Added requested card Cytoshape. 2018-03-16 14:58:11 -05:00
LevelX2
73dcb3ff22 * Skyshrout War Beast - Fixed wrong P/T calculation because of wrong land filter. 2018-03-16 20:14:28 +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
925db89f31 * Cultivate - Fixed possible null pointer exception. 2018-03-16 18:24:29 +01: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
spjspj
cd21387659
Merge pull request #4624 from spjspj/master 
Add rendering for Expeditions
 2018-03-16 22:57:37 +11:00
spjspj
89d58bef5b Add rendering for Expeditions 
(With non-copyright background image)
 2018-03-16 22:49:21 +11:00
LevelX2
f7b5fabb77
Merge pull request #4619 from CountAndromalius/master 
Baloth Gorger + Jodah, Archmage Eternal
 2018-03-15 22:15:34 +01:00
LevelX2
db94287b20 * Pulmonic Sliver - Fixed that the put in the graveyard ability was not handled optional. 2018-03-15 17:28:45 +01:00
Jeff
05ae0c8a02 - Text change 2018-03-14 18:06:39 -05:00
Jeff
55164eda28 - Fixed Defiant Vanguard. It works with Cloudshift type effects now also. @4572 2018-03-14 17:57:04 -05:00
Jeff
9647083f60 - Fixed Sokenzan Renegade. #4614 2018-03-14 15:00:19 -05:00
Count Andromalius
311adbdf2b Baloth Gorger + Jodah 
First steps into DOM, implementing some cards shown in the official leak. Did not add into the set as we don't have official information on rarity yet.
 2018-03-14 00:16:23 -03:00
LevelX2
87f590f6b8 * Skirk Commando - Fixed triggered ability. 2018-03-13 23:19:36 +01:00
LevelX2
f0950518e9 Added Catalyst Stone. 2018-03-13 22:57:44 +01: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
537f7dd1ae * Dinosaur Hunter - Fixed wrong var name. 2018-03-13 16:52:37 +01:00
LevelX2
0885ed4058
Merge pull request #4605 from rscoates/patch-1 
Update DinosaurHunter.java
 2018-03-13 16:39:07 +01:00
AMWJ
f4fe276fb6 Merge branch 'master' of https://github.com/magefree/mage 2018-03-13 01:56:01 -04:00
Oleg Agafonov
b344ab12dc * Alliances (ALL) changes: 
- Changed card numbers to new style (scryfall like);
   - Gorilla Shaman, Storm Shaman - fixed wrong rarity;
 2018-03-13 09:13:01 +04:00
AMWJ
5793e9a9dd Merge branch 'master' of https://github.com/magefree/mage 2018-03-12 21:37:44 -04:00
AMWJ
3a441349ef * Corrected use of DrawDiscardOneOfThemEffect, rather than DrawDiscardControllerEffect in CastingOfBones. 2018-03-12 21:32:52 -04:00
AMWJ
a0f2311300 * Implemented Casting Of Bones (https://scryfall.com/card/cst/44b), and added it to Alliances set. 
* Refactored DrawDiscardOneOfThemEffect to be used in CastingOfBones, KrovikanSorcerer, and SoldeviSage.
 2018-03-12 19:50:52 -04:00
Plopman
9aba870aa5 Change place counters to put counters 2018-03-12 22:52:02 +01:00
LevelX2
f01cec68a1 * Curse of the Swine - Reworked card movement and token creation. 2018-03-12 17:02:49 +01:00
spjspj
a4485e92eb
Merge pull request #4611 from spjspj/master 
Add an 'add only full art land' option to the add land dialog.
 2018-03-13 01:04:16 +10:00
spjspj
7e919b9f39 Add an 'add only full art land' option to the add land dialog. 
Should give an error message when someone says only full art lands, but then chooses a set that has no full art lands.
 2018-03-13 00:38:43 +11:00
L_J
dc3e47e045
Brothers Yamazaki filter edit (fixes #4603) 2018-03-11 22:42:17 +00:00
Richard Coates
7099df246d
Update DinosaurHunter.java 2018-03-11 22:21:51 +01:00
LevelX2
c2a4890603 * Fixed that commander replacement effect was wrongly only applied once (903.9). Simplified some replacement effects that move objects to other zones. (fixes #4585). 2018-03-11 21:48:37 +01:00
LevelX2
2ebc0f2b83 * Dinosaur Hunter - Fixed implementation. 2018-03-11 17:16:40 +01:00
LevelX2
21dbf89a70 * Dinosaur Hunter - Fixed a bug caused by the triggered ability. 2018-03-11 08:53:24 +01:00
LevelX2
f05e459c12 * Skullmane Baku - Fixed not working unboost ability (fixes #4599). 2018-03-11 08:38:27 +01:00
LevelX2
fed2d1a259 XMage 1.4.28V0 2018-03-10 20:42:29 +01:00
LevelX2
0077484c3e * Gilt-Leaf Archdruid - Fixed that control handling was wrong (fixes #4596). 2018-03-10 20:11:39 +01:00
L_J
a2b0e5a39c
Implemented "can block landwalk as though it didn't have landwalk" and related cards 2018-03-10 11:52:25 +01:00
Jeff
823389a21a - Fixed Heat Shimmer. #4576 2018-03-09 15:34:55 -06:00
Jeff
dc5220df4f - Fixed Archwing Dragon. #4581 2018-03-09 15:15:11 -06:00
L_J
c6bff105c6
Hot Soup fix (#4574) 2018-03-09 20:43:05 +00:00
L_J
4e02921f42
Pandemonium fix 
Made the entering creature the source of the damage instead of Pandemonium itself
 2018-03-09 18:46:20 +00:00
L_J
9fa63b93ea
Fixed Dread (#4574) 2018-03-09 17:36:18 +00:00
spjspj
0c0e1804f1 Mox Lotus (UNH) 2018-03-09 23:58:05 +11:00
LevelX2
134c317b03 Merge origin/master 2018-03-08 23:48:49 +01:00
LevelX2
fcc5c75243 Fixed target pointer handling of No Mercy (#4574). 2018-03-08 23:48:15 +01:00