Commit graph

19031 commits

Author SHA1 Message Date
ingmargoudt
8d7582a7ef Merge pull request #2788 from bigzwine/master 2017-01-13 20:11:00 +01:00
bigzwine
4c9f9360e5 Fixed Foundry Assembler subtype. 2017-01-13 19:01:54 +02:00
LevelX2
450eba06e8 Merge pull request #2772 from ingmargoudt/master
replaced enum comparison from equals to ==
2017-01-13 17:26:50 +01:00
spjspj
bbf432673c Merge pull request #2786 from spjspj/master
spjspj - Add Quicksilver Elemental (MRD)
2017-01-14 02:16:00 +11:00
spjspj
156a14a123 spjspj - Add Quicksilver Elemental (MRD) 2017-01-14 02:15:23 +11:00
spjspj
ee98d08f63 Merge pull request #2785 from spjspj/master
spjspj - Add Auramancer's Guise (PLC)
2017-01-13 23:49:05 +11:00
spjspj
851f62e4d0 spjspj - Add Auramancer's Guise (PLC) 2017-01-13 23:47:40 +11:00
fireshoes
87f9875ad6 Fixed Cogwork Assembler subtype and that it could only target controlled artifacts. 2017-01-12 21:50:58 -06:00
fireshoes
1e7509a765 Fixed Goblin Chieftain missing haste ability for controlled goblins. Fixed missing basic lands from AER booster packs. 2017-01-12 14:10:25 -06:00
spjspj
a685c157bb Merge pull request #2782 from spjspj/master
spjspj - Add Atalya,Samite Master (INV)
2017-01-13 01:38:27 +11:00
spjspj
6455445295 spjspj - Add Atalya,Samite Master (INV) 2017-01-13 01:37:15 +11:00
spjspj
ef9e509562 spjspj - Add Atalya,Samite Master (INV) 2017-01-13 01:36:39 +11:00
spjspj
d5d88f92c3 Merge pull request #2781 from spjspj/master
spjspj - Add Apprentice Necromancer (UDS)
2017-01-13 00:20:09 +11:00
spjspj
888af7b09c spjspj - Add Apprentice Necromancer (UDS) 2017-01-13 00:15:58 +11:00
test
e18a429e92 * fixed the planeswalker search cards to work correctly with aven mindcensor like effects 2017-01-12 13:51:22 +01:00
Alexsandro
f5ddd77e5b Move NoAbilityPredicate to MuragandaPetroglyphs file 2017-01-12 09:45:35 -02:00
Alexsandro
03576ce11a Change operators for .equals() 2017-01-12 09:40:55 -02:00
fireshoes
8845319903 Updated Legacy Cube 2017 to match a change Wizards made. Fixed Asylum Visitor's missing LoseLifeEffect. Fixed Rishkar's GainedAbilityEffect to be only controlled creatures. 2017-01-12 00:12:15 -06:00
Galatolol
0b6e7fdb7d Added 4 cards 2017-01-11 20:35:50 +01:00
Alexsandro
1d91e04ac1 Add Hivestone tests 2017-01-11 14:08:34 -02:00
ingmargoudt
31a695a8d0 Merge pull request #2771 from sotovdev/fix11jan17
Hotfix (client don't compile) after pr 2762 merged to master
2017-01-11 10:19:26 +01:00
igoudt
ac8962cb29 replaced enum comparison from equals to == 2017-01-11 09:53:16 +01:00
vraskulin
cb1b507076 Hotfix (client don't compile) after pr 2762 merged to master
There is no ActionListener in import block, so mage-client in current state can't be compiled. Changed ActionListener  to lambda
2017-01-11 11:49:19 +03:00
LevelX2
1c4bf298eb Merge pull request #2762 from sotovdev/bigRefactoring
Big refactoring
2017-01-11 07:42:52 +01:00
LevelX2
17dbd996d2 Merge pull request #2760 from ingmargoudt/master
some rewrites to reference putIfAbsent
2017-01-11 07:36:12 +01:00
LevelX2
0e9b46bdc1 Merge pull request #2759 from sotovdev/master
We can't invoke equals method on object that can be null
2017-01-11 07:33:54 +01:00
fireshoes
76b28742cb Added Legacy Cube January 2017. Corrected the Legacy Cube Sept 2016 list. Fixed Wrangle's target filter. 2017-01-10 20:09:36 -06:00
LevelX2
f675575119 Rings of Brighthearth - Fixed possible NPE error. 2017-01-10 23:58:29 +01:00
LevelX2
a2b8891188 Fixed a NPE of Meld effect. 2017-01-10 23:54:42 +01:00
LevelX2
d55dd515f3 Some minor fixes and some tests. 2017-01-10 23:52:38 +01:00
fireshoes
c10c09a34e Fixed Monstrous Onslaught tooltip text and Daring Demolition target filter. 2017-01-10 09:57:07 -06:00
Alexsandro
4bf2137e9d Add hivestone test structure 2017-01-10 12:56:39 -02:00
Alexsandro
81954b92ea Change card text 2017-01-10 12:47:50 -02:00
Alexsandro
0a0878aba6 Create Hivestone card 2017-01-10 12:37:15 -02:00
Alexsandro
92cfe2403e Create cipher test for Muraganda Petroglyphs 2017-01-10 11:40:04 -02:00
Alexsandro
47b96e5411 Remove static placed by IDE 2017-01-10 11:17:09 -02:00
sotovdev
fe7aaedf1c Merge branch 'master' into bigRefactoring 2017-01-10 15:37:43 +03:00
spjspj
dc25c4fa3e Merge pull request #2767 from spjspj/master
Deck editor - Add a 'Bling my deck' button.
2017-01-10 23:25:17 +11:00
spjspj
a4275ab658 Deck editor - Add a 'Bling my deck' button. 2017-01-10 22:26:59 +11:00
fireshoes
8078e178e5 Fixed Tezzeret, Master of Metal gain control effect. Fixed Whir of Invention card type. 2017-01-09 15:42:43 -06:00
fireshoes
de3c6168d8 Updated Banned & Restricted lists. 2017-01-09 15:08:08 -06:00
vraskulin
46d369c8ed Big refactoring (server)
I used Intellij IDEA to automatically refactor code to achive 3 goals.
1) get rid of anonymouse classes, and replace the with lamba to get more readeable and clean code (like in TableWaitingDialog).
2) make effectively final  variables actually final to avoid inadvertent changes on it in further releases and keep objects as immutable, as possible.
3)  Get rid of unused imports (most of the changes) in whole project classes.
2017-01-09 19:47:03 +03:00
vraskulin
076840df53 Big refactoring
I used Intellij IDEA to automatically refactor code to achive 3 goals.
1) get rid of anonymouse classes, and replace the with lamba to get more readeable and clean code (like in TableWaitingDialog).
2) make effectively final  variables actually final to avoid inadvertent changes on it in further releases and keep objects as immutable, as possible.
3)  Get rid of unused imports (most of the changes) in whole project classes.
2017-01-09 19:16:53 +03:00
vraskulin
a9f2c8c407 Refactoring
We don't need to override basic methods to just call the basic method again.
2017-01-09 18:13:43 +03:00
vraskulin
b626bf6866 Properties can be final in these objects 2017-01-09 17:52:17 +03:00
ludwig.hirth
25e0dfa699 * Cogwork Assembler - Fixed wrong subtype. 2017-01-09 14:47:07 +01:00
vraskulin
33b9ec52b0 SQLException fixed
ERROR 2017-01-09 15:35:35,693 java.sql.SQLException: Cannot update class mage.cards.repository.ExpansionInfo because it doesn't have an id field =>[main] ExpansionRepository.update
2017-01-09 15:40:20 +03:00
Styxo
8693b50f4f Added generation code for the enchant keyword to the script 2017-01-09 13:27:02 +01:00
vraskulin
51e5640c8e We can't invoke equals method on object, that can be null, due it's lead to NPE 2017-01-09 15:17:59 +03:00
igoudt
316137b5e2 replaced various !contains -> put with putIfAbsent 2017-01-09 13:07:32 +01:00