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

16750 commits

This branch
This branch
All branches
Author SHA1 Message Date
drmDev
ad0dde4501 server logging for nulls 2016-04-14 10:49:08 -04:00
LevelX2
b415d5e116 * Olivia Voldaren - Fixed some wrong tooltip wording (fixes #1868). 2016-04-14 16:29:52 +02:00
LevelX2
ce3c26ab4b * Some minor changes / fixes. 2016-04-14 16:00:56 +02:00
drmDev
bee12d709c Various NPE fixes based on server log 2016-04-14 09:55:13 -04:00
spjspj
ebbbc1daf1 Merge pull request #1872 from spjspj/master 
spjspj - Implement new form of draft in which you simulate opening a …
 2016-04-14 22:59:04 +10:00
spjspj
bd12d17d44 spjspj - Implement new form of draft in which you simulate opening a full booster box (36 boosters) and take one at a time. Known (to me at least) colloquially as 'Rich Man's Draft' as it requires you to buy a full booster box. 2016-04-14 22:48:54 +10:00
Derek M
35b6cff367 Merge pull request #1871 from fenhl/wall-of-shards 
Fix “an opponent gains life” costs worded as optional
 2016-04-14 08:18:24 -04:00
Derek M
b564bf1760 Merge pull request #1867 from fenhl/heliod-god-of-the-sun 
Fix Heliod's token-generating ability not saying “token”
 2016-04-14 08:17:57 -04:00
Derek M
2018047aa1 Merge pull request #1866 from fenhl/fix-death-trigger-text 
Fix DiesCreatureTriggeredAbility tooltip text
 2016-04-14 08:17:49 -04:00
Derek M
a6dc3d330a Merge pull request #1862 from fenhl/magus-of-the-future 
Fix wording of Magus of the Future ability tooltip
 2016-04-14 08:17:30 -04:00
Fenhl
eca6ccd6bd Fix “an opponent gains life” costs worded as optional 2016-04-14 11:09:38 +00:00
Fenhl
4906790e32 Fix Heliod's token-generating ability not saying “token” 2016-04-14 10:52:39 +00:00
Fenhl
503c041976 Fix DiesCreatureTriggeredAbility tooltip text 2016-04-14 10:41:24 +00:00
LevelX2
41ba4c9540 Some changes to logged data and a NPE prevention. 2016-04-14 08:28:28 +02:00
Derek M
3e4c9dc645 Merge pull request #1864 from drmDev/master 
Merge and InduceParanoia impl
 2016-04-13 18:00:01 -04:00
drmDev
270b9bb5a9 Merge and InduceParanoia impl 2016-04-13 17:59:06 -04:00
Derek M
29a2b1712f Merge pull request #1861 from fenhl/stone-seeder-hierophant 
Fix Stone-Seeder Hierophant triggering on other players' lands
 2016-04-13 13:51:47 -04:00
Fenhl
72f32e782c Fix Stone-Seeder Hierophant triggering on other players' lands 2016-04-13 17:51:17 +00:00
Fenhl
f42ea89930 Fix wording of Magus of the Future ability tooltip 2016-04-13 16:09:12 +00:00
Derek M
90dbd4edc0 Merge pull request #1854 from fenhl/patch-1 
Update card count in readme
 2016-04-12 17:49:55 -04:00
Marco-Marin
a356cd1649 Merge pull request #1835 from Marco-Marin/master 
First ever card after incorporating the Testing Process: Dwarven Catapult.
Tested from scratch (tho it worked the 1st time, so maybe most previous ones were not too shabby either :))
Also using this to test my learning of new Git CLI commands: "add ." and "add -u" seemed to do the trick.

PS: Nevermind the Oubliette changes, I'm doing a 'poor man's' versioning system to make sure my builds are working. ^_^
 2016-04-12 16:38:05 -03:00
MarcoMarin
a02f6a3c3a Testing Git commands with card: Dwarven Catapult 2016-04-12 16:27:47 -03:00
Derek M
5a5175355b Merge pull request #1856 from drmDev/master 
updated files for set Welcome Deck 2016. still need update java
 2016-04-12 14:11:28 -04:00
drmDev
c9ed58de86 updated files for set Welcome Deck 2016. still need update java 2016-04-12 14:10:54 -04:00
Derek M
66263e155b Merge pull request #1852 from fenhl/packs-disdain 
Implement Pack's Disdain
 2016-04-12 13:16:53 -04:00
Fenhl
74b5e85a3e Fix continuous effect creation in Pack's Disdain 2016-04-12 16:57:28 +00:00
Fenhl
a5f6fb0d47 Update card count in readme 
I counted the unique cards using [http://ct-magefree.rhcloud.com/cards](http://ct-magefree.rhcloud.com/cards) and the total cards by counting the files in Mage.Sets. The exact numbers are 15699 and 26000 respectively.

Shadowmoor, the regular set that immediately preceded Eventide, is 100% implemented according to the tracking tool, so I changed the relevant part of the readme.
 2016-04-12 16:13:04 +00:00
Derek M
267d19f71c Merge pull request #1853 from fenhl/canopy-crawler 
Fix activated ability of Canopy Crawler
 2016-04-12 11:12:40 -04:00
Fenhl
5d341af554 Fix activated ability of Canopy Crawler 2016-04-12 13:50:32 +00:00
Fenhl
899122a170 Implement Pack's Disdain 2016-04-12 13:45:45 +00:00
Derek M
c3acf201ce Merge pull request #1851 from drmDev/master 
Tunnel Vision implemented
 2016-04-12 09:10:13 -04:00
drmDev
d707e03807 Tunnel Vision implemented 2016-04-12 09:09:49 -04:00
Derek M
9c202a2902 Merge pull request #1850 from halljared/master 
Fixes #1836
 2016-04-12 08:18:15 -04:00
Jared Hall
3f2611de76 Fixes #1836 2016-04-12 08:16:15 -04:00
spjspj
9365b36387 Merge pull request #1849 from spjspj/master 
spjspj - Implement Kill Switch (NMS) -
 2016-04-12 11:38:42 +10:00
spjspj
bc44851b62 spjspj - Implement Kill Switch (NMS) - 
Implemented using a new type of condition 'SourceTappedBeforeUntapStepCondition'
 2016-04-12 11:29:55 +10:00
Derek M
262de17d17 Merge pull request #1847 from drmDev/master 
Earthbind implementation
 2016-04-11 19:55:49 -04:00
drmDev
d735c4e41b Earthbind implementation 2016-04-11 19:55:18 -04:00
Derek M
6775c9bc97 Merge pull request #1846 from drmDev/master 
Champion bug fixes
 2016-04-11 17:07:15 -04:00
drmDev
f2d5462c97 Champion bug fixes 2016-04-11 17:06:14 -04:00
MarcoMarin
7149ecd2dd oubliette difference is blocking me from pulls from origin2 2016-04-11 17:26:32 -03:00
MarcoMarin
318c18fb34 oubliette difference is blocking me from pulls from origin 2016-04-11 17:24:31 -03:00
MarcoMarin
d045d16a20 Oubliette: 
Fixed tooltip(s), and I believe the Auras now come back (modified from working card, so should work).

1st stab at trying to get those Counters back. Not very confident tho, further testing required.
 2016-04-11 16:20:50 -03:00
MarcoMarin
013c506fac Oubliette: 
Fixed tooltip(s), and I believe the Auras now come back (modified from working card, so should work).

1st stab at trying to get those Counters back. Not very confident tho, further testing required.
 2016-04-11 15:01:01 -03:00
Derek M
90507f4c55 Merge pull request #1844 from drmDev/master 
SilentSkimmer and PyreHound bug fixes
 2016-04-11 11:42:18 -04:00
drmDev
57a992649e SilentSkimmer and PyreHound bug fixes 2016-04-11 11:41:55 -04:00
MarcoMarin
7505365425 Merge remote-tracking branch 'upstream/master' 2016-04-11 12:10:34 -03:00
LevelX2
2f4232476e * Changing some Target inheritance to fix AI Target handling (e.g. Loaming Shaman). 2016-04-11 17:00:28 +02:00
Derek M
4403f919a1 Merge pull request #1839 from drmDev/master 
WeirdingWood fix. Gloom and VolcanicEruption impl
 2016-04-10 11:19:53 -04:00
drmDev
b0c0ca351c WeirdingWood fix. Gloom and VolcanicEruption impl 2016-04-10 11:19:06 -04:00