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

16618 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
447b7e459f Merge pull request #2606 from MTGfan/master 
Jade Statue
 2016-11-19 11:07:27 +01:00
LevelX2
054d3a2f9b Sanguine Praetor - some minor clean up. 2016-11-19 11:04:55 +01:00
LevelX2
3f576b3a1c Merge pull request #2607 from spinlock-x/sanguine_praetor 
Implement Sanguine Praetor
 2016-11-19 10:59:57 +01:00
LevelX2
1ea333fac4 Merge pull request #2608 from use/fix-siege-gang-commander 
Fix - enable Siege-Gang Commander to sacrifice Boggart Shenanigans
 2016-11-19 10:57:04 +01:00
LevelX2
85c9a53bb0 Merge origin/master 2016-11-19 10:54:30 +01:00
LevelX2
807782efea Added the Basque flag. 2016-11-19 10:53:43 +01:00
Will Hall
d4c523c8af Fix - enable Siege-Gang Commander to sacrifice Boggart Shenanigans 2016-11-19 00:20:02 -08:00
Pete Rossi
f6a425a640 Implement Sanguine Praetor 2016-11-18 23:07:28 -08:00
MTGfan
2ae50d81fd Jade Statue 2016-11-19 00:14:23 -05:00
Samuel Sandeen
0996a4d549 Merge pull request #2604 from use/fix-2576 
Fix for #2576: Heritage Druid should be able to tap Prowess of the Fair
 2016-11-18 20:22:10 -05:00
Samuel Sandeen
7d26f35bc8 Merge pull request #2582 from MTGfan/master 
Correction to Protean Hydra code and add Gaea's Liege
 2016-11-18 20:20:54 -05:00
Will Hall
2312a29d72 Fix for #2576: Heritage Druid should be able to tap Prowess of the Fair 2016-11-18 15:48:24 -08:00
LevelX2
e6093c67da Merge origin/master 2016-11-18 17:01:56 +01:00
Samuel Sandeen
8c36ab3e85 Merge pull request #2603 from HCrescent/master 
Added Mortuary
 2016-11-18 06:53:06 -05:00
HCrescent
67395a8e09 Added Mortuary 2016-11-17 22:25:18 -06:00
spjspj
9a4d5ca15e Merge pull request #2597 from spjspj/master 
spjspj - Force stop and stop skip for when there's potential attackers
 2016-11-18 00:16:25 +11:00
spjspj
d7b1ae68ed spjspj - Sorcery count was double 2016-11-18 00:14:59 +11:00
MTGfan
9c80ca143b updated Gaea's Liege, removed unused import on Protean Hydra, corrected Rock Hydra line to have {this} instead of Rock Hydra. 2016-11-16 22:39:49 -05:00
Jason Larabell
98c6619343 Merge remote-tracking branch 'upstream/master' 2016-11-16 22:34:18 -05:00
Samuel Sandeen
a14e19f1c0 Merge pull request #2599 from HCrescent/master 
Added Lifeline
 2016-11-16 07:17:10 -05:00
HCrescent
03ee51bcbf Added Lifeline 2016-11-15 21:24:12 -06:00
Samuel Sandeen
402cbfa5fa Merge pull request #2595 from JRHerlehy/master 
Implement Metamorphose
 2016-11-15 19:59:10 -05:00
JRHerlehy
6d8b37b2ac Add controll != null check. 
Added recommended changes.
 2016-11-15 10:18:53 -08:00
LevelX2
4e38494278 Merge pull request #2596 from spinlock-x/chimeric_egg 
Implement Chimeric Egg
 2016-11-15 16:36:23 +01:00
spjspj
47874a7f03 spjspj - Force stop and stop skip for when there's potential attackers 2016-11-15 23:20:51 +11:00
Styxo
e4323529d6 Added Jodah's Avenger, Spellshift and Venarian Glimmer 2016-11-15 12:20:26 +01:00
JRHerlehy
17705ea302 Rareity Fix 
Fixed incorrect rareity assigned to CoP: Artifacts in Fifth Dawn from
Common to Uncommon
 2016-11-14 23:56:46 -08:00
Pete Rossi
d129dbc746 Implement Chimeric Egg 2016-11-14 23:42:11 -08:00
JRHerlehy
493a43cf93 Implement Metamorphose 
Implement Metamorphose from Scourge
 2016-11-14 21:12:15 -08:00
Samuel Sandeen
43c49ad1cf Merge pull request #2593 from Dilnu/master 
Fix the Commander Predicate which was written incorrectly. This fixes Bastion Protector
 2016-11-13 20:07:33 -05:00
Dilnu
c37b782b75 Fix the Commander Predicate which was written incorrectly. This fixes Bastion Protector. 2016-11-13 20:05:52 -05:00
LevelX2
cd61bf48d1 Added a test. 2016-11-13 22:29:26 +01:00
spjspj
12f0462300 Merge pull request #2591 from spjspj/master 
Slight fix - SidarKondoOfJamuraa
 2016-11-13 23:44:32 +11:00
spjspj
4210796281 Slight fix - SidarKondoOfJamuraa 2016-11-13 23:41:58 +11:00
spjspj
fa75859b0d Merge pull request #2590 from spjspj/master 
Add 'xmage.de', 'woogerworks', 'localhost' buttons to connection dial…
 2016-11-13 23:00:42 +11:00
spjspj
a2b3d8825e Add 'xmage.de', 'woogerworks', 'localhost' buttons to connection dialog to fill in appropriate password/username 2016-11-13 22:59:32 +11:00
LevelX2
92a04be280 * Warp World - Fixed a bug caused by removing cards from library. 2016-11-12 17:32:57 +01:00
spjspj
2c88fcff49 Merge pull request #2587 from spjspj/master 
Fix spam filter on per user basis
 2016-11-12 22:41:45 +11:00
spjspj
af725f8a6e Fix spam filter on a per-user basis and implement rudimentary swear guard. 2016-11-12 22:39:18 +11:00
spjspj
08ffbb7d3c Fix spam filter on a per-user basis and implement rudimentary swear guard. 2016-11-12 22:37:18 +11:00
LevelX2
a7d564f8b5 Merge origin/master 2016-11-12 09:38:04 +01:00
LevelX2
44f7b1b13c * Selvala, Explorer Returned - Fixed that the life gaining effect did not work. 2016-11-12 09:37:41 +01:00
spjspj
f0aad053aa Merge pull request #2586 from spjspj/master 
spjspj - Make test mode of server not care about password
 2016-11-12 19:06:05 +11:00
LevelX2
67d4ecafbe Fixed CommanderPredicate (fixed e.g. problem with Bastion Protector). 2016-11-12 09:05:22 +01:00
LevelX2
c84d7ef49b Rite of the Raging Storm - Fixed bug that tokens were not doubled if the token was created by an effect controlled from other players (fixes #2584). 2016-11-12 09:00:09 +01:00
LevelX2
7cd105b951 Rite of the Raging Storm - Fixed some minor bugs (fixes #2584). 2016-11-12 08:45:43 +01:00
spjspj
8a8ca87c8d spjspj - Make test mode of server not care about password 2016-11-12 18:13:28 +11:00
MTGfan
abb8e58fa0 Merge remote-tracking branch 'upstream/master' 2016-11-11 19:26:47 -05:00
MTGfan
a1f3486890 Gaea's Liege 2016-11-11 19:22:53 -05:00
spjspj
17d7796325 Merge pull request #2583 from spjspj/master 
spjspj - Eye of Singularity (VIS)
 2016-11-12 10:02:44 +11:00