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

17681 commits

This branch
This branch
All branches
Author SHA1 Message Date
ingmargoudt
20b24e3360 Merge pull request #2846 from kubikrubikvkube/master 
Singleton object should not have map with values that can't be GCed
 2017-02-11 20:43:32 +01:00
Goudt
fa67eab914 Merge branch 'master' of https://github.com/magefree/mage 2017-02-11 20:38:20 +01:00
Goesta
a21128932b Added Test for Kalastria Healer 2017-02-11 20:18:46 +01:00
spjspj
d30e959f43 Merge pull request #2854 from spjspj/master 
Implement Parallax Nexus
 2017-02-11 20:13:32 +11:00
spjspj
9b8f1b3d5c Implement Parallax Nexus (NEM) 2017-02-11 20:11:17 +11:00
LevelX2
b316b5b0a0 Merge pull request #2852 from goesta/GontisMachinationsFix 
Changed GontisMachinations effect from damage to loseLife
 2017-02-11 08:34:18 +01:00
Goesta
197259929e Changed GontisMachinations effect from damage to loseLife 2017-02-11 03:11:32 +01:00
Jeff
fc3ecdf8d0 - Added Auratouched Mage and test suite. 2017-02-10 10:15:56 -06:00
spjspj
4f13d89849 In testmode, ok to not send an email. 2017-02-11 01:26:52 +11:00
spjspj
a897f2d91e Merge pull request #2851 from spjspj/master 
Update some edh power levels
 2017-02-11 00:53:46 +11:00
spjspj
dfbdc058cf Update some edh power levels 2017-02-11 00:52:58 +11:00
Jeff
1e82f0750a Fixed FlashbackTest and made modifications to CascadeAbility allowing it to pass its test suite. 2017-02-09 10:20:21 -06:00
vraskulin
f99cd21275 Mostly code format fixes. 2017-02-09 18:30:31 +03:00
vraskulin
7cf4ca3cae Can be isEmpty 2017-02-09 17:44:14 +03:00
vraskulin
433b08238f We're gonna use standart parameterised constructor, instead of addAll method. 2017-02-09 17:42:05 +03:00
vraskulin
192110cd68 There is no need to call simple getter from the same class. 2017-02-09 17:40:51 +03:00
spjspj
e18695489f Merge pull request #2849 from spjspj/master 
Modify userId string
 2017-02-09 19:42:29 +11:00
spjspj
0edd01c293 Modify userId string 2017-02-09 19:41:24 +11:00
spjspj
0ff7ff686d Merge pull request #2848 from spjspj/master 
Allow lands with AnyColorManaAbility to be have automatic payments done
 2017-02-09 18:26:14 +11:00
spjspj
a08816123c Allow lands with AnyColorManaAbility to be have automatic payments done 2017-02-09 18:20:51 +11:00
vraskulin
12820b54d4 Singleton object should not have map with values that can't be GCed 2017-02-08 19:50:57 +03:00
LevelX2
166c6a3590 * Sunforger - Fixed activated unattach ability. 2017-02-06 22:55:52 +01:00
LevelX2
b6a66f1aba Fixed syntax error of cascadeAbility. 2017-02-06 22:02:44 +01:00
LevelX2
b8cc0120cb Merge origin/master 2017-02-06 21:21:16 +01:00
LevelX2
1dbd24cde6 Fixed a null pointer error in user. 2017-02-06 21:20:55 +01:00
spjspj
a10fab9e34 Merge pull request #2843 from spjspj/master 
Add New Frontiers [ODY]
 2017-02-06 23:42:20 +11:00
spjspj
1ce40e7d31 Add New Frontiers [ODY] 2017-02-06 23:41:32 +11:00
ingmargoudt
d3fbd60c68 Merge pull request #2817 from kubikrubikvkube/master 
Removed outdated "main" method that prints few sanitized lines
 2017-02-06 13:07:43 +01:00
vraskulin
1e64ecfe07 Merge remote-tracking branch 'fork/master' 2017-02-06 14:36:24 +03:00
vraskulin
076045d862 Fixed merge conflict 2017-02-06 14:36:09 +03:00
vraskulin
0557b5e89c list.size > 0 changed to !list.isEmpty 
We care about if it's empty or not, not about it's size
 2017-02-06 14:32:51 +03:00
vraskulin
f60ebfbb1f All 1-character strings converted to primitives 
"b" + "r" now changed to 'b' + 'w'.  It's more straight-forward, and may cause perfomance improvements - character primitives allocation is faster and less expensive than string creation.
 2017-02-06 14:32:51 +03:00
vraskulin
31589778ca Try/finally refactored to try with resources 2017-02-06 14:32:11 +03:00
vraskulin
d8c4e60138 Removed outdated "main" method that prints few sanitized lines 2017-02-06 14:32:11 +03:00
kubikrubikvkube
6a114ac902 Merge branch 'master' into master 2017-02-06 14:29:59 +03:00
LevelX2
0595d8a549 * Silvergill Douser - Fixed counting of Merfolk and Faeries to wrongly not taking tribal non creature permanets into account. 2017-02-06 10:05:00 +01:00
LevelX2
afd42f330b * Declaration in Stone - Fixed that the target permanent was not exiled (fixes #2839). 2017-02-06 10:00:52 +01:00
Goudt
a4993b6f9d Merge branch 'master' of https://github.com/magefree/mage 2017-02-05 16:28:09 +01:00
LevelX2
b3597d64a0 Merge origin/master 2017-02-05 13:54:24 +01:00
LevelX2
b86acbe0da Some minor fixes. 2017-02-05 13:53:36 +01:00
spjspj
82ae76dbb8 Merge pull request #2838 from spjspj/master 
Add Canadian Highlander Deck/Game implementation.
 2017-02-05 23:34:21 +11:00
spjspj
2bfa83df19 Add Canadian Highlander Deck/Game implementation. 2017-02-05 23:33:28 +11:00
Goudt
c89eb89c04 Merge branch 'master' of https://github.com/magefree/mage 2017-02-05 13:27:23 +01:00
spjspj
72f4778506 Merge pull request #2837 from spjspj/master 
Add Canadian Highlander Deck/Game implementation.
 2017-02-05 23:25:53 +11:00
spjspj
c98bf163be Add Canadian Highlander Deck/Game implementation. Also implements the double-mulligan-on-6,5,4,3,2,1 rule. 2017-02-05 23:23:51 +11:00
LevelX2
d71ebdcea9 Merge origin/master 2017-02-05 11:41:20 +01:00
LevelX2
3525e46514 XMage 1.4.21V2 2017-02-05 11:39:43 +01:00
spjspj
9fe53e52c2 Merge pull request #2836 from spjspj/master 
Add field for server console
 2017-02-05 14:54:28 +11:00
spjspj
fa97e4647e Add field for server console 2017-02-05 14:11:05 +11:00
LevelX2
ff6d79829e * Fixed a bug that damage was wrongly still assigned to players during combat that already left the game. 2017-02-04 23:56:03 +01:00