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

18222 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
LevelX2
dfc72a9adb * Galvanic Blast - Fixed a minor typo. 2016-11-01 23:44:33 +01:00
LevelX2
c98671282f * Cursed Rack - Fixed that the hand size modification was applied to the controller of the cursed rack instead of the chosen opponent. 2016-11-01 23:36:42 +01:00
spjspj
7fead9c74f Merge pull request #2546 from spjspj/master 
Cleanup and more help for gen-existing-cards-by-set.pl
 2016-11-02 09:08:23 +11:00
spjspj
d062ff11f0 Cleanup and more help for gen-existing-cards-by-set.pl 2016-11-02 09:07:43 +11:00
LevelX2
1791b809db Added some more info to some logger and game messages. Removed unused method. 2016-11-01 23:02:11 +01:00
LevelX2
0f6c14bdb7 Fixed that a client reconnect tries to reconnect to the server the client was connected to and not the last server a client on this system has connected to. 2016-11-01 22:59:24 +01:00
LevelX2
5090eaee0d Fixed that Commander and Tiny leader decks were not checked for valid sets. 2016-11-01 22:57:34 +01:00
LevelX2
3f882b73c4 Fixed a problem with activated spells that could not be used but were used by AI and available mana calculation. 2016-11-01 14:31:02 +01:00
LevelX2
35c90f2dec Fixed a problem with the Wish cards of Judgement set where spell copies are wrongly exiled with the original spell. 2016-11-01 11:50:12 +01:00
LevelX2
56900a9b1f [SWS] Yoda, Jedi Master - Fixed a problem with the +1 ability. 2016-11-01 11:47:40 +01:00
LevelX2
65577486c4 [SWS] Lightsaber - Added missing subtype. 2016-11-01 10:02:55 +01:00
fireshoes
ac3203b63c Set some token version types. [C16] Added token info. Implemented Migratory Route. 2016-10-31 23:09:42 -05:00
LevelX2
135819c6ef Merge pull request #2542 from Wehk/master 
Fixed Outer Rim Slaver
 2016-11-01 01:27:58 +01:00
LevelX2
777025bea4 Unstable Shapeshifter fixed some bugs and clean up. 2016-11-01 01:19:52 +01:00
Wehk
889a99967c Fixed Outer Rim Slaver 
P/T from 2/2 to 3/3.
 2016-10-31 16:29:01 +01:00
spjspj
0ed441b11f Merge pull request #2541 from spjspj/master 
C16 changes
 2016-11-01 00:17:35 +11:00
Fenhl
69bbfad588 Add missing reprints to the Commander 2016 set class 2016-10-31 12:54:54 +00:00
spjspj
c49a323b6d C16 changes 2016-10-31 23:07:44 +11:00
spjspj
37e705ea40 Merge pull request #2540 from spjspj/master 
spjspj - Armory Automaton C16
 2016-10-31 21:43:25 +11:00
spjspj
dbae43e35f spjspj - Armory Automaton C16 2016-10-31 21:42:10 +11:00
spjspj
64baf2ce90 spjspj - Armory Automaton C16 2016-10-31 21:40:29 +11:00
spjspj
d510c550bf Merge pull request #2539 from spjspj/master 
spjspj - Akiri, Line-Slinger C16
 2016-10-31 20:26:56 +11:00
spjspj
7e3269aa4a spjspj - Akiri, Line-Slinger C16 2016-10-31 20:25:40 +11:00
Neil Gentleman
3966b4a217 Merge pull request #2537 from nigelzor/simplify-some-cards 
Simplify some cards
 2016-10-31 01:36:54 -07:00
Neil Gentleman
0ad74e8a9b Merge pull request #2536 from nigelzor/shortcut-filters 
use TargetArtifactPermanent, etc.
 2016-10-31 01:36:40 -07:00
Neil Gentleman
6f96ec5be5 Merge pull request #2538 from nigelzor/mana-cleanup 
Mana ability cleanup
 2016-10-31 01:36:18 -07:00