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

22399 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Agafonov
9e94ee0810 Revert last changes in maven's useIncrementalCompilation (it's not work and recompile non changed modules) 2018-01-12 14:04:03 +04:00
Oleg Agafonov
1067881564
Merge pull request #4401 from rsypen/fix_tests_not_passing 
Fixed failing tests
Fixed ItThatBetrays and Barrin, Master Wizard broken effects, added new test for Emrakul's annihilator trigger
 2018-01-12 13:55:44 +04:00
Radoslaw Sypen
29a889b236 Merge branch 'master' of github.com:rsypen/mage into fix_tests_not_passing 2018-01-12 10:42:50 +01:00
Radoslaw Sypen
88527987cc Fixed ItThatBetrays and Barrin, Master Wizard broken effects, added new test for Emrakul's annihilator trigger 2018-01-12 10:33:11 +01:00
Zzooouhh
ef394f8ba1
Merge pull request #4399 from Zzooouhh/Zzooouhh-camo 
Implemented Camouflage
 2018-01-11 19:42:20 +01:00
Zzooouhh
a77706a756
Moved PermanentInListPredicate to common predicates 2018-01-11 18:23:30 +00:00
Zzooouhh
709b45f942
Moved PermanentInListPredicate to common predicates 2018-01-11 18:23:05 +00:00
Zzooouhh
83a26a0007
Moved PermanentInListPredicate to common predicates 2018-01-11 18:22:35 +00:00
Zzooouhh
9e4ebfabad
Implemented Camouflage 2018-01-11 18:01:14 +00:00
Zzooouhh
93b8b91a1a
Implemented Camouflage 2018-01-11 18:00:51 +00:00
Zzooouhh
fe3829fca1
Implemented Camouflage 2018-01-11 18:00:34 +00:00
Zzooouhh
3b7ca8b0f6
Implemented Camouflage 2018-01-11 17:58:14 +00:00
Zzooouhh
ca46a8872a
Moved PermanentInListPredicate to common predicates 2018-01-11 17:53:32 +00:00
Zzooouhh
75d7d92774
Merge pull request #36 from magefree/master 
Merge https://github.com/magefree/mage
 2018-01-11 18:46:32 +01:00
Oleg Agafonov
50a906072e * HASCON Promo 2017 - Fixed image downloading for Grimlock cards 2018-01-11 21:03:11 +04:00
Oleg Agafonov
25072be306 * Expel from Orazca - Fixed wrong name 2018-01-11 20:56:24 +04:00
Oleg Agafonov
3632d7afe3 Fixed 27 wrong land types (can't see or too many in boosters): 
* e.g. Urza's lands counts as basic;
 * Arabian Nights: x1
 * Coldsnap: x5
 * Ice Age: x5
 * Masters Edition IV: x12
 * Oath of the Gatewatch: x4
 2018-01-11 20:46:39 +04:00
Oleg Agafonov
0ba2375ac1 Tests: 
* added new checks for basic land types/rarity in mage-verify;
 * fixed tests for UGL cards in mage-verify (wrong json data)
 2018-01-11 20:37:38 +04:00
spjspj
ab4490e476
Merge pull request #4398 from spjspj/master 
Add 5 cards  (UGL)
 2018-01-12 00:06:39 +11:00
spjspj
d9bcfa3f31 Add 5 cards (UGL) 2018-01-11 23:55:37 +11:00
spjspj
63cb997942 Add 5 cards (UGL) 2018-01-11 23:42:52 +11:00
LevelX2
78ac82a2d7 * See Red - Fixed that it was wrongly sacrificed (fixes #4395). 2018-01-11 12:54:09 +01:00
spjspj
8a1619f9b4
Merge pull request #4396 from spjspj/master 
Add 3 cards  (UGL)
 2018-01-11 17:56:55 +11:00
spjspj
96e6a917b4 Add 3 cards (UGL) 2018-01-11 17:43:33 +11:00
spjspj
c060f10287
Merge pull request #4392 from spjspj/master 
Add Jack-in-the-Mox + Jumbo Imp (UGL)
 2018-01-11 17:16:19 +11:00
LevelX2
4c9ed95662 Xmage 1.4.26V11d 2018-01-11 07:14:49 +01:00
LevelX2
2685d9f8b4 Fixed some possible null pointer exceptions (found in server log). Market Festival, Kindred Summons, Profane Processions, New Blood, Kindred Charge , Bishop of Binding, Metzal Tower of Triumph, Chrome Mox 2018-01-11 06:12:27 +01:00
Zzooouhh
a38ec84581
Removed slipped beta Blaze of Glory code 
in case it could break something, as it's still buggy
 2018-01-10 19:49:15 +00:00
Zzooouhh
8f9356533d
Fixed undoing individual blocker declarations for multi-blockers 
One more #4172 fix
 2018-01-10 19:44:48 +00:00
Zzooouhh
56c615a66f
Prohibit fix 2018-01-10 18:09:09 +00:00
Administrator
4f38939fc1 - Fixed Pride of Conquerors. 2018-01-10 11:56:51 -06:00
Oleg Agafonov
79bdd2ca8f Tests: fixed server load test for simple connection and game starting 2018-01-10 20:53:25 +04:00
spjspj
da69ee8816 Add Chicken a la King (UGL) 2018-01-11 00:12:05 +11:00
spjspj
9598ffa16b Add Jack-in-the-Mox + Jumbo Imp (UGL) 2018-01-10 20:02:37 +11:00
ciaccona007
13f26ab7be
Fix RIX Land Rarity 2018-01-09 19:14:44 -08:00
ciaccona007
c7c8ee390d Fix RIX land rarity 2018-01-09 19:13:00 -08:00
ciaccona007
408b0af7f1
Implement Poultrygeist 2018-01-09 16:31:16 -08:00
ciaccona007
4770c29cc8 Merge remote-tracking branch 'origin/master' 2018-01-09 16:26:10 -08:00
ciaccona007
77d90c5997 Implement Poultrygeist 2018-01-09 16:25:20 -08:00
ciaccona007
5bc1142cde
Implement Timmy, Power Gamer 2018-01-09 15:17:55 -07:00
ciaccona007
392fc60bad
Merge branch 'master' into master 2018-01-09 15:17:20 -07:00
ciaccona007
bdc4d3eb2b
Merge branch 'master' into master 2018-01-09 15:16:07 -07:00
ciaccona007
470bb69a7e Implement Timmy, Power Gamer 2018-01-09 14:14:34 -08:00
ciaccona007
d9b14acec7
Implement Growth Spurt (#4386) 2018-01-09 14:59:13 -07:00
ciaccona007
5db12db371 Implement Growth Spurt 2018-01-09 13:58:23 -08:00
ciaccona007
0bea4dcbbf
Merge pull request #4385 from ciaccona007/master 
Implement Krazy Kow
 2018-01-09 14:26:48 -07:00
ciaccona007
3e87a50b4d Implement Krazy Kow 2018-01-09 13:25:46 -08:00
ciaccona007
b5b73c84f4
Merge pull request #4384 from ciaccona007/master 
Implement Chicken Egg
 2018-01-09 13:42:16 -07:00
ciaccona007
79c18d28e2 Implement Chicken Egg 2018-01-09 12:40:39 -08:00
Oleg Agafonov
8e3b610a0c Tests: fixed performance problem (x20 speed up, no need to call full garbage collector manually) 2018-01-09 19:27:25 +04:00