Commit graph

17835 commits

Author SHA1 Message Date
ingmargoudt
a32a02b688 Merge pull request #2901 from ingmargoudt/master
change enum equals to ==
2017-03-01 15:38:42 +01:00
ingmargoudt
d01aed42ed change enum equals to == 2017-03-01 15:05:44 +01:00
spjspj
82841c16c6 Merge pull request #2900 from spjspj/master
Refactor color restriction in edh...
2017-03-01 09:12:23 +11:00
spjspj
4681232d18 Refactor color restriction in edh... 2017-03-01 09:11:29 +11:00
spjspj
18b6279f2e Merge pull request #2899 from spjspj/master
Refactor color restriction in edh. Change to look at commander color identity.
2017-03-01 08:58:59 +11:00
spjspj
faee8fb298 Refactor color restriction in edh. Change to look at commander color identity. 2017-03-01 08:56:52 +11:00
spjspj
b8b6ddcc69 Boros Guildgate 2017-03-01 08:27:39 +11:00
fireshoes
4fdf89193d Added 2/28/17 MM3 reprints. 2017-02-28 13:12:35 -06:00
Achilles
c4737f11d0 - Fix for issue #2885 2017-02-28 10:25:10 -06:00
ingmargoudt
df64713cbf Merge pull request #2897 from kubikrubikvkube/master
Minor improvements - string+= creation changed to StringBuilder w initial value
2017-02-28 15:21:02 +01:00
vraskulin
0bc9cf91a8 Minor improvements - StringBuilder now have initial value 2017-02-28 15:26:07 +03:00
ingmargoudt
aa01db1432 Merge pull request #2896 from kubikrubikvkube/master
Inner classes should be static. It reduces memory usage and gives perfomance boost + DeckImporter rollback
2017-02-28 12:24:19 +01:00
vraskulin
11dc1e10f1 Few lambda's and removed explicit type from creating lists and hashmaps 2017-02-28 13:46:57 +03:00
vraskulin
0a3c95dde5 Inner classes should be static. It reduces memory usage and gives perfomance boost + DeckImporter rollback 2017-02-28 12:40:12 +03:00
vraskulin
04973ea5aa Checking String for emptiness with .lenght() is preferable since 1.6 2017-02-28 11:46:51 +03:00
vraskulin
ad7d3c8078 equals "" should be replaced with isEmpty 2017-02-28 11:45:15 +03:00
ingmargoudt
030444c178 Merge pull request #2895 from kubikrubikvkube/master
Redundant StringBuilder creation.
2017-02-28 09:41:43 +01:00
vraskulin
3600d03e2c StringBuilder in a class field may cause memory leaks, it's not GCed, so it's a better way to store all errors just in string field 2017-02-28 11:37:31 +03:00
vraskulin
eb58391fe2 Redundant StringBuilder creation. 2017-02-28 11:07:40 +03:00
fireshoes
3799fe1c8a Added MM3 reprints. 2017-02-27 11:41:14 -06:00
ingmargoudt
afbf5ce2b6 Merge pull request #2891 from kubikrubikvkube/master
Nulls to optional. Also there was bug with AetherChaser
2017-02-27 17:51:35 +01:00
Jeff
79983fbe26 - Extra check to verify a player is in game. 2017-02-27 08:41:07 -06:00
vraskulin
498c8cf60c Made utility classes final to explicitly forbid it's inheritance 2017-02-27 17:03:38 +03:00
vraskulin
f309717616 Merge remote-tracking branch 'fork/master' 2017-02-27 16:33:47 +03:00
vraskulin
af3986df46 All final strings became static - it will give a little perfomance boost, due to not instantiating same string every time 2017-02-27 16:33:32 +03:00
spjspj
aec46f366b Merge pull request #2894 from spjspj/master
Allow limiting a colour in edh
2017-02-27 23:35:57 +11:00
spjspj
5365f9cac5 Allow limiting a colour in edh 2017-02-27 23:33:58 +11:00
Plopman
781ba84a74 Fix #2890 Unified Will text 2017-02-26 21:20:23 +01:00
Galatolol
4435773f06 Added 3 cards 2017-02-26 15:13:28 +01:00
doncarton
5eaaa67d1e Nulls to optional. Also there was bug with AetherChaser "you may pay" was not set to optional 2017-02-26 15:15:54 +03:00
doncarton
a46848791c Variable name more readeable 2017-02-26 14:36:34 +03:00
LevelX2
1101e80bfc Merge pull request #2886 from vereena42/master
Adding some cards
2017-02-26 09:51:28 +01:00
LevelX2
d4415e2eff Merge pull request #2887 from aastrand/ignorelist
Add client-side user ignore list
2017-02-26 09:49:43 +01:00
LevelX2
f06ee144f7 * Fixed AddCardTypeSourceEffect with limited duration and object reference was applied on wrong objects (fixes failing crew test). 2017-02-25 12:05:43 +01:00
Jeff
624e69ecb6 - Text fix for Essence Flux 2017-02-24 11:48:03 -06:00
ingmargoudt
5ace1a9620 Merge pull request #2888 from goesta/BouncingACrewedVehicleTestFix
Fixed BouncingACrewedVehicle test
2017-02-23 11:29:13 +01:00
Goesta
e9d103b70e Fixed BouncingACrewedVehicle test 2017-02-22 23:25:15 +01:00
vereena42
877560d57b Fix 2017-02-22 22:58:07 +01:00
Anders Åstrand
f68460603a Add client-side user ignore list
This commit adds a client-side per-server ignore list.
* Whispers and talk from an ignored user is hidden
* Ignored users cannot join your tables
* Ignored users tables are hidden
2017-02-22 22:16:09 +01:00
vereena42
c969283057 Adding some cards 2017-02-21 20:30:41 +01:00
Eric McVicker
19fec8ee2a Merge pull request #2881 from JOAC69/master
Removed duplicate CardInfos in ExpansionSets
2017-02-19 22:13:55 -06:00
JOAC69
8800286824 Removed duplicate CardInfos in ExpansionSets 2017-02-19 22:10:21 -06:00
ingmargoudt
48a1fe8602 Merge pull request #2880 from ingmargoudt/master
put the writing of equipped and enchanted in the attachmenttype
2017-02-19 23:59:25 +01:00
ingmargoudt
d0fa00f3af put the writing of equipped and enchanted in the attachmenttype 2017-02-19 23:58:32 +01:00
Achilles
0372eb12e2 - Little fix for a watcher used for Ephara, God of the Polis. 2017-02-19 16:42:32 -06:00
ingmargoudt
2d4c1f9b06 Merge pull request #2879 from ingmargoudt/master
enum comparisons, return empty set rather than null
2017-02-19 23:40:30 +01:00
ingmargoudt
972ed6a3f2 changed enum comparison to ==.
isDependentTo returns empty set rather than null
2017-02-19 23:38:47 +01:00
ingmargoudt
297203dab5 Merge branch 'master' of https://github.com/magefree/mage 2017-02-19 23:36:10 +01:00
Achilles
899732c403 - Added Menacing Ogre 2017-02-19 15:04:48 -06:00
ingmargoudt
ed5ba74093 Merge branch 'master' of https://github.com/magefree/mage 2017-02-19 20:53:02 +01:00