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

17516 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Goudt
b36583356c Merge branch 'master' of https://github.com/magefree/mage 2017-02-04 22:16:40 +01:00
LevelX2
a3a6760f4a * Declaration in Stone - Fixed some problems with moving permanents to exile and etb trigger timing. 2017-02-04 19:56:50 +01:00
LevelX2
b3200f8e37 * Earthcraft - Fixed that only wrongly only controlled land could be targeted to untapped. 2017-02-04 19:18:32 +01:00
LevelX2
ce3f3dc639 * Death Rattle - Fixed that wrongly also green creatures could be targeted and were destroyed. 2017-02-04 18:13:39 +01:00
LevelX2
cdd147ee61 * Tezzeret the Schemer - Fixed that the -2 ability boost value was wrongly continuously changed with the number of controlled artifacts. 2017-02-04 18:10:05 +01:00
LevelX2
1d404ee57f Fixed a problem that the TAPPED_FOR_MANA event was not always send (fixed #2826). 2017-02-04 17:56:04 +01:00
LevelX2
2a6978197c Merge pull request #2827 from elliott-king/master 
Overabundance added
 2017-02-04 17:20:36 +01:00
LevelX2
40a9ccb102 Merge pull request #2829 from Galatolol/master 
Added 7 cards
 2017-02-04 14:33:54 +01:00
LevelX2
5212c3c7dd Fixed an Optional<> bug of GameController. 2017-02-04 14:27:03 +01:00
LevelX2
0dacf2a6fa * Fixed that the cascade converted mana costs comparison did not work correctly with split spells. 2017-02-04 14:26:17 +01:00
LevelX2
227143aacf * Entwine - Fixed that for spells cast without mana costs entwine could wrongly be used for free. 2017-02-04 14:24:30 +01:00
LevelX2
6beb23dbb3 * Overwhelming Stampede - Fixed that given Trample ability did not only last until end of turn. 2017-02-03 21:58:10 +01:00
LevelX2
067b72dcce * Added test. 2017-02-03 21:36:33 +01:00
LevelX2
2a3e38f845 * Fixed a bug that prevented rollback request window to appear. 2017-02-03 21:00:49 +01:00
LevelX2
a5299e3a30 * Fixed a bug that card art of cards with multiple arts (e.g. FEM) were not displayed during game play. 2017-02-03 20:45:47 +01:00