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

16952 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
233096dc1b Merge pull request #2715 from bhickey/bowdlerize 
Censor the word "penis"
 2016-12-25 10:57:36 +01:00
fireshoes
7943d1021e Added AER Masterpieces. Fixed Yahenni's Expertise spelling. 2016-12-24 22:18:13 -06:00
Brendan Hickey
3294e51d29 Censor the word "penis" 
mage is censoring the word "vagina", so it should also censor "penis"
 2016-12-24 11:36:04 -05:00
LevelX2
862ac38f51 * Fixed that special actions (e.g. delve mana payment) were handled correctly if a player plays a turn for another player. 2016-12-24 16:52:06 +01:00
LevelX2
7bdc5b2f44 * Show of Dominance - Fixed a bug that toughness instead of power was used to select creature. 2016-12-24 13:01:38 +01:00
LevelX2
08887113fd Added Hall of Gemstone. 2016-12-24 12:34:34 +01:00
LevelX2
a632f9c0e8 Fixed a problem that Dwarven Recruiter, Goblin Recruiter or Scouting Trek searched for the wrong subtype. 2016-12-24 11:55:30 +01:00
LevelX2
030430fe51 * Debt to the Deathless - Fixed that it wrongly did damage to opponents instead of life loss. 2016-12-24 11:48:12 +01:00
LevelX2
c6d54c929f Fixed a problem that selecting cards in hand or libraray could unintended trigger "becomes the target of a spell or ability" abilities. 2016-12-24 11:42:11 +01:00
LevelX2
3cd26fa834 * Wild Pair - FIxed that it also triggered for creatures cast from opponents. 2016-12-24 11:02:05 +01:00
LevelX2
4bbdaad101 * Gilded Drake - Fixed possible null pointer exception. 2016-12-24 10:52:57 +01:00
LevelX2
4988e0bb74 Merge origin/master 2016-12-24 10:16:23 +01:00
LevelX2
c05941cf0d * Added cascade test. 2016-12-24 10:16:03 +01:00
LevelX2
b3e884fae9 Merge pull request #2714 from DimitarKum/master 
Card fix: Recuperate
 2016-12-24 09:56:35 +01:00
LevelX2
8674be1f0f Merge origin/master 2016-12-24 09:53:59 +01:00
LevelX2
b788356460 * Fulfill Contract - Fixed that the spell created an error. 2016-12-24 09:52:58 +01:00
DimitarK
2f38e35344 Recuperate fixed; use to gain life for target player, now gains life for 
self as it should
 2016-12-23 23:10:10 -08:00
MTGfan
8a807c888c Merge remote-tracking branch 'upstream/master' 2016-12-24 00:13:54 -05:00
MTGfan
a40a67c2b8 Cyclopean Tomb: watcher stuff replacing the array stuff, card not working completely yet 2016-12-23 23:59:29 -05:00
LevelX2
d0249716c2 Merge pull request #2711 from sotovdev/perf_22_12_2016 
Concurrency perfomance boost
 2016-12-23 19:49:28 +01:00
ludwig.hirth
ec4e50ece4 Added test. 2016-12-23 15:04:09 +01:00
ludwig.hirth
e5a5911c6e * Sacred Ground - Fixed that the Sacred Ground effect did also move the land if it was removed from graveyard since the ability triggered. 2016-12-23 12:29:33 +01:00
MTGfan
7c6d19267b Cyclopean Tomb: Progress, player is now prompted to pick a land, landId predicate not working yet 2016-12-23 00:27:13 -05:00
Justin Herlehy
decc5c190c Merge pull request #2708 from JRHerlehy/NewCardsImpl 
[AER] Heart of Kiran
 2016-12-22 21:43:06 -05:00
LevelX2
8ba22ad7e2 * Fixed that selecting no target players let fizzle the spell (e.g. Wheel and Deal). 2016-12-22 23:50:02 +01:00
MTGfan
cf17d02657 CyclopeanTomb: updated to track what lands it is putting counters on 2016-12-22 15:58:03 -05:00
vraskulin
4f81babdfa Concurrency perfomance boost 
Parallel execution. Speed increased from 50% (avg in all methods) to 500% (checkForNewCards method)
 2016-12-22 18:36:40 +03:00
MTGfan
dc2e4569db Jihad: Fixed - was missing condition 2nd ability and corrected trigger that results in sacrificing Jihad 2016-12-22 03:27:45 -05:00
Styxo
c2ef2b1f47 [CN2] Added Deadly Designs and Fang of the Pack 2016-12-22 08:05:22 +01:00
MTGfan
4183e31984 Celestial Sword: removed unused imports 2016-12-22 00:17:38 -05:00
Justin Herlehy
4ef339d521 [AER] Heart of Kiran 
Fixed the Alternate Crew Cost to push the correct game events for crewing a vehicle and the vehicle being crewed.
 2016-12-21 23:07:55 -05:00
MTGfan
7e867f4fcf Cyclopean Tomb TODO: remove counters part of effect 2016-12-21 19:46:46 -05:00
LevelX2
913e7f8719 * Hardened Scales - Fixed that the counter was only added if at least one counter was added originally. 2016-12-21 16:17:18 +01:00
LevelX2
2338ccf05f Merge pull request #2699 from sotovdev/perf19_12_2016 
Concurrency perfomance boost
 2016-12-21 15:48:38 +01:00
LevelX2
f0ba7d38a6 Merge pull request #2697 from sotovdev/master 
Refactoring SQl query + unwanted ArrayList creation
 2016-12-21 15:48:01 +01:00
Justin Herlehy
91a3d9a6a2 [AER] Heart of Kiran 
As the alternate crew cost payment ability is just a simple activated ability with a different wording, it is implemented here as an anonymous inner class to override the getRule() method rather than generate large amounts of boilerplate code to get the same effect with a full class.
 2016-12-21 02:33:58 -05:00
Justin Herlehy
7838c8ef37 Merge pull request #2706 from JRHerlehy/master 
[AER] Tezzeret the Schemer
 2016-12-20 22:14:47 -05:00
Justin Herlehy
7395c4aa12 [AER] Tezzeret the Schemer 
Remove unused code from test version.
 2016-12-20 21:40:23 -05:00
Justin Herlehy
ef3efc9c86 [AER] Tezzeret the Schemer 2016-12-20 21:21:42 -05:00
Justin Herlehy
f44c934334 [AER] Oath of Ajani 2016-12-20 11:34:15 -05:00
Justin Herlehy
ffd1b37eeb Merge pull request #2694 from JRHerlehy/master 
[AER] Oath of Ajani
 2016-12-20 11:33:24 -05:00
Styxo
465fa48026 [AER] Added Quicksmith Rebel & Spy 2016-12-20 15:01:07 +01:00
Styxo
2eb0a487a4 Added WishEffect, ExchangeLifeTargetEffect and did refactors 2016-12-20 13:31:39 +01:00
vraskulin
95242e8cf9 Concurrency perfomance boost 
Checking if image exist or not now parallel. It took 35-39 seconds to perform, now it takes 13-16 seconds. Planning to make all class method concurrent and reduce client loading time even more.
 2016-12-19 15:58:08 +03:00
Styxo
009676f75f Added HippoToken 2016-12-19 12:40:58 +01:00
Styxo
cff83aefb1 Created LoseHalfLifeTargetEffect, DiscardedByOpponentTrigger and made some refactors 2016-12-19 12:39:26 +01:00
vraskulin
2e83930ace Creating new ArrayList is unneccesarry 
We shouldn't create new arraylist with default size and no element in it to show that no elements found in database. It's one more object in heap, which will be never used. There is special method Collections.emptyList() - it's more readeable and returns empty immutable list
 2016-12-19 12:23:23 +03:00
vraskulin
e22951c68e Repository objects refactoring 
SQL query is limited by 1, so there will be two cases - whether collection is empty or not. We should user convenient shortcut for checking emptiness of collection
 2016-12-19 11:30:32 +03:00
LevelX2
a5b2c9f8c0 Merge pull request #2695 from PedroTav/develop 
[PLS] Dark Suspicions
 2016-12-18 23:41:10 +01:00
LevelX2
3c0ee90663 Pia's Revolution - Fixed that it wrongly triggered for artifacts from other players. 2016-12-18 23:14:11 +01:00