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

16698 commits

This branch
This branch
All branches
Author SHA1 Message Date
spjspj
3b99acfb89 Merge pull request #2562 from spjspj/master 
spjspj - Ikra Shidiqi, the Usurper (C16)
 2016-11-05 23:14:52 +11:00
spjspj
23332a5954 spjspj - Ikra Shidiqi, the Usurper (C16) 2016-11-05 23:14:06 +11:00
spjspj
2d3f9fb4f2 Merge pull request #2561 from spjspj/master 
spjspj - Grip of Phyresis (C16)
 2016-11-05 22:45:51 +11:00
spjspj
a423e87c98 spjspj - Grip of Phyresis (Made germ token public) (C16) 2016-11-05 22:44:25 +11:00
spjspj
e362dea7e6 spjspj - Grip of Phyresis (C16) 2016-11-05 22:43:21 +11:00
LevelX2
e4e76c159b Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/cards/t/TanaTheBloodsower.java
	Mage.Sets/src/mage/cards/t/ThrasiosTritonHero.java
 2016-11-05 11:55:24 +01:00
LevelX2
43043eba8e [C16] Added 7 cards. 2016-11-05 11:50:15 +01:00
spjspj
24f42a2ada Merge pull request #2560 from spjspj/master 
spjspj - Tana and Thrasios (C16)
 2016-11-05 20:22:32 +11:00
spjspj
c4e69540b9 spjspj - Tana and Thrasios (C16) 2016-11-05 20:21:44 +11:00
LevelX2
a8aa484b64 Merge origin/master 2016-11-05 10:17:43 +01:00
LevelX2
2c7d6e788d * Workaround test for cards db bug. 2016-11-05 10:17:17 +01:00
spjspj
38e42bb9c1 Merge pull request #2559 from spjspj/master 
spjspj - Kynaios and Tiros of Meletis (C16)
 2016-11-05 18:58:39 +11:00
spjspj
257386f6a3 spjspj - Kynaios and Tiros of Meletis (C16) 2016-11-05 18:57:48 +11:00
spjspj
a47480a1ce Merge pull request #2558 from spjspj/master 
spjspj - Stonehoof Chieftain (C16)
 2016-11-04 22:53:19 +11:00
spjspj
5c63069522 spjspj - Stonehoof Chieftain (C16) 2016-11-04 22:52:00 +11:00
Styxo
734393c49d [C16] Added Kraum, Ludevic's Opus and Ishai, Ojutai Dragonspeaker 2016-11-04 12:28:18 +01:00
LevelX2
b4284761a6 * Villainous Wealth - Fixed possible endless loop. 2016-11-04 00:29:28 +01:00
LevelX2
917d6500fa * Mistbind Clique - Fixed that the tap ability was wrongly triggered as Mistbind Clique left the battlefield. 2016-11-03 23:16:45 +01:00
LevelX2
a4e1c7aefd Merge origin/master 2016-11-03 22:38:14 +01:00
LevelX2
d2561c1752 * Fixed a problem with triggered mana abilities. Fixed a problem that AI did not always select the needed mana color. Fixed a problem with Reflecting Pool not taking triggered mana abilities into account. 2016-11-03 22:37:54 +01:00
LevelX2
f07408f995 * Flagbearer - Fixed a bug that game could be locked if a spell could only target your own creatures. 2016-11-03 19:04:55 +01:00
fireshoes
a5cb9ff037 Added Peregrine Drake to the Pauper banlist. 2016-11-03 10:19:22 -05:00
fireshoes
7741981533 Merge origin/master 2016-11-03 10:13:11 -05:00
spjspj
b37554300c Merge pull request #2556 from spjspj/master 
spjspj - Evolutionary Escalation (C16)
 2016-11-03 23:05:50 +11:00
spjspj
17476523dd spjspj - Evolutionary Escalation (C16) 2016-11-03 22:56:35 +11:00
spjspj
55b561cebf Merge pull request #2553 from wendelscardua/fix-lack-of-abilities 
Fix lack of abilities
 2016-11-03 18:06:40 +11:00
spjspj
5a6a51b93d Merge pull request #2555 from spjspj/master 
spjspj - Fix for mtg-cards-data (C16)
 2016-11-03 18:05:38 +11:00
spjspj
b9c26ff8da spjspj - Fix for mtg-cards-data (C16) 2016-11-03 18:04:02 +11:00
emerald000
57e0dcde5d Merge origin/master 2016-11-03 02:34:27 -04:00
emerald000
4e5dc69d11 [C16] Added Benefactor's Draught. 2016-11-03 02:34:11 -04:00
spjspj
fb78c021b4 Merge pull request #2554 from spjspj/master 
spjspj - Charging Cinderhorn (C16)
 2016-11-03 17:22:15 +11:00
spjspj
e931db2261 spjspj - Charging Cinderhorn (C16) 2016-11-03 17:19:07 +11:00
Wendel Scardua
25e9fbfc57 Fix Expendable Troops 2016-11-03 01:00:02 -02:00
Wendel Scardua
35312bf798 Fix Phyrexian Broodlings 2016-11-03 00:55:48 -02:00
fireshoes
c85d71049a Merge origin/master 2016-11-02 10:26:02 -05:00
fireshoes
667472229f Merge 2016-11-02 10:24:51 -05:00
spjspj
62ceaa9e33 Merge pull request #2550 from spjspj/master 
spjspj - Goblin Spymaster (C16)
 2016-11-03 00:41:51 +11:00
spjspj
11eeabd7be spjspj - Goblin Spymaster (C16) 2016-11-03 00:40:09 +11:00
spjspj
f4ea9fa9b0 Merge pull request #2549 from spjspj/master 
spjspj - Bruse Tarl (C16)
 2016-11-02 23:03:58 +11:00
spjspj
9f8255fbf3 spjspj - BruseTarl Boring Herder (C16) 2016-11-02 23:02:54 +11:00
spjspj
55a018de95 spjspj - BruseTarl Boring Herder (C16) 2016-11-02 23:00:00 +11:00
Styxo
cfd801e166 [C16] Added Treacherous Terrain 2016-11-02 11:24:45 +01:00
Neil Gentleman
843466b6ad AudioManager: a bit of cleanup 2016-11-01 21:28:44 -07:00
Neil Gentleman
366e8e281d MageClip: copy whole input file 
not just whatever the first read returns
 2016-11-01 21:28:44 -07:00
Neil Gentleman
5d55d299a2 don't just give up when LinePool can't be initialized 
maybe fixes #2525
 2016-11-01 21:28:44 -07:00
Neil Gentleman
b5bb6dd0db prefer ObjectColor.isRed() to ObjectColor.contains(ObjectColor.RED) 2016-11-01 21:28:43 -07:00
Neil Gentleman
8109532adf ThreadLocalStringBuilder is slower here 
by about 30%, as measured by JMH

avoiding garbage is more important when the string is more than 5
characters long
 2016-11-01 21:28:43 -07:00
Neil Gentleman
f438b76b31 remove deprecated, unused, unimplemented method 2016-11-01 21:28:43 -07:00
Neil Gentleman
ffa94811f6 fix compilation 
broken in c38f96ae55
 2016-11-01 21:28:42 -07:00
emerald000
c38f96ae55 [C16] Implemented Partner ability. 2016-11-01 22:59:39 -04:00