Commit graph

17669 commits

Author SHA1 Message Date
vraskulin
d3214c65e4 Merge remote-tracking branch 'fork/master' 2017-03-22 14:51:31 +03:00
vraskulin
d93061c0bc Equals should be compared with == but not equals() 2017-03-22 14:50:50 +03:00
Achilles
1f9b51d833 - Added Noetic Scales 2017-03-21 21:37:11 -05:00
Achilles
1fc245eb10 - Set edit needed for Keldon Firebombers 2017-03-21 20:44:04 -05:00
Achilles
cdef5fb13b - Added Keldon Firebombers 2017-03-21 20:40:10 -05:00
Derek M
91536469ee Merge pull request #3003 from drmDev/refactor/tokens-exiled
Refactor/tokens exiled
2017-03-21 19:59:18 -04:00
drmDev
107b83c231 fixes tapped and attacking cards. reverted firecat blitz. created issue for that one 2017-03-21 19:57:49 -04:00
LevelX2
4b8c2d19ad Added Ogre Leadfoot. 2017-03-21 19:57:49 -04:00
Max Lebedev
338d032a8b updated author 2017-03-21 19:57:49 -04:00
Max Lebedev
2f031f883c added Divining Witch 2017-03-21 19:57:49 -04:00
ingmargoudt
59eb2ed568 change map for list 2017-03-21 19:57:49 -04:00
LevelX2
7549bf6d28 Merge pull request #2999 from ingmargoudt/kynaios-rewrite
change map for list
2017-03-21 11:43:41 +01:00
LevelX2
7693f3fd59 Added Ogre Leadfoot. 2017-03-21 11:37:22 +01:00
LevelX2
0a45985ad6 Merge pull request #3000 from maxlebedev/master
Added Divining Witch
2017-03-21 11:08:25 +01:00
Max Lebedev
f6e6d806e0 updated author 2017-03-21 02:30:33 -04:00
Max Lebedev
462d2db8ff added Divining Witch 2017-03-21 02:24:38 -04:00
drmDev
5c34022175 second set using refactored createtokeneffect for exiling at end step 2017-03-20 21:57:26 -04:00
drmDev
a8f42de901 First set of cards updated to simplifed token creation and exile at end step 2017-03-20 21:30:48 -04:00
LevelX2
696272b328 * Misthollow Griffin - Fixed a bug that sometimes a not owning player could play the card from exile. 2017-03-20 23:09:14 +01:00
Achilles
dc7e9318af - getPlayersInRange() added to All Hallow's Eve 2017-03-20 08:24:28 -05:00
vraskulin
c783614cba NotifyAll 2017-03-20 15:17:30 +03:00
vraskulin
f37c823aa8 String + string concatenation can be replaced by string + char concetenation 2017-03-20 14:00:18 +03:00
ingmargoudt
7e75b0cc03 change map for list 2017-03-20 10:39:59 +01:00
ingmargoudt
0cb8e727fb Merge pull request #2998 from kubikrubikvkube/master 2017-03-20 09:43:01 +01:00
vraskulin
1fa9d4a4f6 Typo 2017-03-20 11:34:44 +03:00
Derek M
6cab4db51f Merge pull request #2996 from drmDev/ut/tromokratis
#2995 unable to duplicate by unit tests
2017-03-19 22:10:09 -04:00
drmDev
fb37dcd5f1 #2995 unable to duplicate by unit tests 2017-03-19 22:09:29 -04:00
Achilles
49974c5d66 - Added All Hallow's Eve. 2017-03-19 18:47:20 -05:00
LevelX2
bc81f7974a Merge pull request #2992 from ingmargoudt/optionals
rewrites to optionals
2017-03-19 23:27:09 +01:00
Derek M
70f22fefd4 Merge pull request #2991 from drmDev/card/lightcoils
Implemented card Lightning Coils and test for it
2017-03-19 17:56:22 -04:00
drmDev
311e41abd2 refactored exiletokensAtEndStep 2017-03-19 17:54:07 -04:00
ingmargoudt
ff6c6405aa rewrites to optionals 2017-03-19 19:48:32 +01:00
drmDev
dcd5c76bad minor typo fix 2017-03-19 12:33:12 -04:00
drmDev
c109fc8a0e Implemented card Lightning Coils and test for it 2017-03-19 12:23:58 -04:00
Derek M
348faa345b Merge pull request #2990 from drmDev/ut/medomai
#2989 cannot duplicate medomai issue with UT
2017-03-19 10:45:36 -04:00
drmDev
0d1c846cd5 #2989 cannot duplicate medomai issue with UT 2017-03-19 10:44:59 -04:00
LevelX2
441b6bc2e9 Fixed AI handling of cost reduction of reductions defined with "up to" causing game locks. 2017-03-19 11:20:37 +01:00
LevelX2
ee5675a0fc Fixed wrong client preferences tab reference. 2017-03-19 10:28:12 +01:00
Derek M
d0c4c758ea Merge pull request #2988 from drmDev/ut/divTransform
closes #2625 unable to duplicate with UT
2017-03-18 14:45:00 -04:00
drmDev
286eca3116 closes #2625 unable to duplicate with UT 2017-03-18 14:44:38 -04:00
Derek M
6cde3d343b Merge pull request #2987 from drmDev/master
fixed #2983 - Skyfire Kirin bug
2017-03-18 09:54:32 -04:00
drmDev
164b6e00c2 merge 2017-03-18 09:44:16 -04:00
Derek M
33f7eba708 Merge pull request #2986 from magefree/ut/skyfirekirin
#2983 confirmed bug with skyfire kirin
2017-03-18 09:33:48 -04:00
drmDev
0e5ba16ac1 #2983 confirmed bug with skyfire kirin 2017-03-18 09:32:28 -04:00
Derek M
492d0e2be4 Merge pull request #2980 from drmDev/ut/nmgMenace
#2841 UT unable to duplicate
2017-03-17 21:30:57 -04:00
drmDev
212385e876 #2841 UT unable to duplicate 2017-03-17 21:30:29 -04:00
Derek M
5ec65196c5 Merge pull request #2979 from drmDev/ut/flunkies
#2970 UT unable to duplicate issue
2017-03-17 21:10:18 -04:00
drmDev
329ac6d980 #2970 UT unable to duplicate issue 2017-03-17 21:09:06 -04:00
Derek M
6d8c3d906b Merge pull request #2978 from drmDev/ut/emeria
Ut/emeria
2017-03-17 18:00:28 -04:00
drmDev
4aaea107a0 #2409 cannot duplicate with UT 2017-03-17 17:59:32 -04:00