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

17506 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
spjspj
04f9ff9f60 Merge pull request #2830 from spjspj/master 
Minor fix for Ankle Shanker
 2017-02-03 18:57:01 +11:00
spjspj
fc99e060bd Minor fix for Ankle Shanker 2017-02-03 18:55:50 +11:00
Galatolol
bd92e57050 Added 7 cards 2017-02-03 00:44:07 +01:00
elliott-king
dbcd3cb27d Updated Overabundance 2017-02-01 16:56:56 -05:00
elliott-king
7a2e0a0476 Added Overabundance from Invasion 2017-02-01 13:40:43 -05:00
Goudt
fb1370f198 Merge branch 'master' of https://github.com/magefree/mage 2017-01-31 22:02:04 +01:00
emerald000
03e228d875 Merge origin/master 2017-01-31 11:08:07 -05:00
emerald000
f4c9ac53db Added Battlefield Scrounger, Death Spark and Rasputin Dreamweaver. 2017-01-31 11:06:49 -05:00
LevelX2
96d2372a2b Added revolt test. 2017-01-31 17:06:17 +01:00
LevelX2
3968cdcce9 Added Glimpse of Nature test. 2017-01-31 16:33:37 +01:00