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
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
fireshoes
246469ee48
Fixed Judge Promo Mystic Confluence
2017-01-08 22:39:11 -06:00
LevelX2
0ec712fcd9
Added some additional logic to prevent the ExpansionRepository update errors.
2017-01-08 20:41:29 +01:00
LevelX2
ac9d525e75
* Nim Deathmantle - Fixed that all controlled creatures returned instead only owned creatures.
2017-01-08 18:46:41 +01:00
LevelX2
20c2f3dde8
* Hanweir Militia Captain - Fixed that the P/T setting ability of Westvale Cult Leader was applied to recast Hanweir Militia Captain.
2017-01-08 18:36:32 +01:00
LevelX2
77f64e3e16
Merge origin/master
2017-01-08 18:11:55 +01:00
LevelX2
eb6fe98fe7
* Felidar Guardian - Fixed that wrongly also Felidar Guardian itself could be selected as target.
2017-01-08 18:11:30 +01:00
Styxo
25f7e7bf2e
Merge origin/master
2017-01-08 15:53:24 +01:00
Styxo
f4530d66a9
* Defiant Salvager - fixed incorrect filter
2017-01-08 15:50:19 +01:00
LevelX2
a9e76069c1
* Caught in the Brights - Fixed that it triggered for all attacking vehicles not only controlled vehicles.
2017-01-08 13:13:07 +01:00
LevelX2
267aee43a5
* Implement of Ferocity - Fixed that the activated ability added the wrong counter type.
2017-01-08 13:07:03 +01:00
LevelX2
4697c16c3d
* Outland Boar - fixed wrong P/T of 3/3 to 4/4.
2017-01-08 10:47:18 +01:00
LevelX2
4dd023716e
* Added another general static filter class.
2017-01-08 10:35:46 +01:00
LevelX2
fa4cf8161d
* Added missing creature type "Servo" to the creature type list.
2017-01-08 10:16:08 +01:00
spjspj
eb3445b273
Merge pull request #2756 from spjspj/master
...
Chat Manager - Add [Card Name] for colour highlighting of implemented…
2017-01-08 17:14:38 +11:00
spjspj
4a5dc3c67d
Chat Manager - Add [Card Name] for colour highlighting of implemented cards
2017-01-08 17:05:51 +11:00
spjspj
fcffb6fa7f
Merge pull request #2755 from spjspj/master
...
Some Chat Manager updates
2017-01-08 11:58:25 +11:00
spjspj
0de89ca5b7
Some Chat Manager updates
2017-01-08 11:57:16 +11:00
LevelX2
ee203cf981
Xmage Release 1.4.20V0
2017-01-08 01:36:05 +01:00
LevelX2
13659e064c
Merge origin/master
2017-01-07 23:54:00 +01:00
LevelX2
a75e4f4fcb
Fixed that adding counters to players did not work correctly (e.g. Winding Constrictor).
2017-01-07 23:53:47 +01:00
LevelX2
e04e69f947
[AER] Fixed Baral Chief of Compliance triggered ability.
2017-01-07 23:52:55 +01:00
fireshoes
5b3c273da7
[AER] Fix some more card text.
2017-01-07 16:39:16 -06:00
LevelX2
491ab5fbb0
[AER] Fixed Daredevil Dragster.
2017-01-07 23:29:27 +01:00
LevelX2
9353c5aa9c
[AER] Some more minor fixes.
2017-01-07 22:22:17 +01:00
LevelX2
d519aa55c1
[AER] Fixed wrong revolt tool tips.
2017-01-07 21:58:34 +01:00
LevelX2
b358597bf4
[AER] Added the last missing cards. Some fixes.
2017-01-07 21:42:29 +01:00
LevelX2
32e55a7342
Merge origin/master
2017-01-07 20:03:29 +01:00
LevelX2
c7e149904b
[AER] Fixed some problems with revolt.
2017-01-07 20:03:03 +01:00
fireshoes
e42a1cd4c1
Merge origin/master
2017-01-07 12:27:08 -06:00
fireshoes
24d0353672
[AER] Edited some cards for text or other minor fixes.
2017-01-07 12:14:50 -06:00
LevelX2
2033095e3d
[AER] Added 4 cards.
2017-01-07 19:12:58 +01:00
spjspj
de77a2aa84
Merge pull request #2754 from spjspj/master
...
spjspj - Allow appending from the clipboard in deck editor
2017-01-08 01:02:47 +11:00
spjspj
7a8055172d
spjspj - Allow appending from the clipboard in deck editor
2017-01-08 01:02:01 +11:00
Styxo
9227c4615f
[AER] Added some of the missing cards
2017-01-07 13:51:02 +01:00
spjspj
155bdb8a87
Merge pull request #2753 from spjspj/master
...
spjspj - Add 1 card [AER]
2017-01-07 22:28:59 +11:00
spjspj
d6d431d4b1
spjspj - Add 1 card [AER]
2017-01-07 22:28:26 +11:00
spjspj
508cf7eeaa
Merge pull request #2752 from spjspj/master
...
spjspj - Add 3 cards [AER]
2017-01-07 18:38:59 +11:00
spjspj
f5f48f4833
spjspj - Add 3 cards [AER]
2017-01-07 18:37:22 +11:00
