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

22789 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Simons
936bab3303
Add missing mountain to Commander 2016 Entropic Uprising deck 
Fixes issue #4694
 2018-04-01 00:43:45 -04:00
L_J
7bbfe9f2ae
Growth Spurt text fix 2018-03-31 13:41:38 +00:00
spjspj
cdc68e3323
Merge pull request #4689 from spjspj/master 
Add 'Choose Matching' to deck editor
 2018-03-31 18:06:44 +11:00
spjspj
b69f2c4fd8 Add 'Choose Matching' to deck editor 2018-03-31 17:55:55 +11:00
L_J
1dff6d9c48
Fix for Cabal Slaver 
Cabal Slaver's ability caused the damaging goblin's controller to discard
 2018-03-31 00:07:36 +00:00
L_J
6c98f4802e
Fix for Cabal Slaver 
Cabal Slaver's ability caused the damaging goblin's controller to discard
 2018-03-31 00:06:44 +00:00
Oleg Agafonov
57db49fcf0
Merge pull request #4683 from delftswa2018/hotfix/readme-card-count 
Fix readme.md card count
 2018-03-29 18:30:41 +04:00
Christiaan
834d4ba921 Merge branch 'master' into hotfix/readme-card-count 2018-03-29 16:03:04 +02:00
Oleg Agafonov
fc065bbe3c Little fixes 2018-03-29 17:55:22 +04:00
chrvanorle
45724e8bf9
Merge pull request #5 from magefree/master 
Merge upstream into master
 2018-03-29 15:52:07 +02:00
Oleg Agafonov
8563c6d865
Merge pull request #4682 from delftswa2018/hotfix/resolving-unaccepted-changes 
Hotfix - resolving unaccepted changes
 2018-03-29 17:25:04 +04:00
Oleg Agafonov
d7237c4afa
Merge pull request #4681 from delftswa2018/feature/ClickableMsgOfTheDay 
Clickable message of the day
 2018-03-29 17:24:50 +04:00
Oleg Agafonov
0939aefe51
Merge pull request #4680 from delftswa2018/feature/loadingtime 
Improved XMage startup time
 2018-03-29 17:23:38 +04:00
Christiaan
4dd34902c1 Fixed card count in readme 2018-03-29 14:14:36 +02:00
chrvanorle
6936a8ef51
Merge pull request #4 from magefree/master 
Merge upstream into master
 2018-03-29 14:04:07 +02:00
Marc Zwart
fed2f31789 set lock calls back to original place as per request 2018-03-29 13:56:10 +02:00
Marc Zwart
a7ffaafcb0 made close call safe 2018-03-29 13:53:59 +02:00
Danny Plenge
aa96caa554 Removed useless else case 2018-03-29 12:54:43 +02:00
spjspj
bd29eaaa82
Merge pull request #4674 from spjspj/master 
Have a faded life total over the avatar which glows then fades again …
 2018-03-29 08:40:17 +11:00
Jeff
4c67d96feb - Added a requested card Retribution. 2018-03-28 09:49:18 -05:00
spjspj
938ac35981 Have a faded life total over the avatar which glows then fades again reddish for damage and bluish for life gain. 2018-03-29 00:28:56 +11:00
Danny Plenge
98c2b171de Added the URLHandler which makes the URL's in the message of the day clickable. 
At the moment when there are 2 URL's in 1 message, it only makes the last one clickable.
 2018-03-28 13:49:04 +02:00
Danny Plenge
7d7cd64b1e
Merge pull request #3 from magefree/master 
Update Master
 2018-03-28 11:20:45 +02:00
spjspj
2d32ec0a80
Merge pull request #4668 from spjspj/master 
Have a faded life total over the avatar which glows then fades again
 2018-03-28 09:28:42 +11:00
Christiaan
f956075341 Merge remote-tracking branch 'origin/master' into feature/loadingtime 2018-03-27 17:28:58 +02:00
Christiaan
e69423af27 performance improvements for startup 
added option to skip generating small icons that already exist, load symbol images multithreaded
 2018-03-27 17:26:19 +02:00
spjspj
08ffbecdb4 Have a faded life total over the avatar which glows then fades again reddish for damage and bluish for life gain. 2018-03-28 02:22:28 +11:00
Plopman
1466cc2a81 Fix Axelrod Gunnarson 2018-03-27 00:07:13 +02:00
Plopman
a33916f3f4 Add StaticFilters.FILTER_CONTROLLED_LAND_SHORT_TEXT 2018-03-27 00:04:13 +02:00
Plopman
95b07bdb1f Fix some ability text. Fix #2039 2018-03-26 22:27:39 +02:00
L_J
9e813935db
Practical improvement for Drought 
The caster now can cancel the payment at the "Sacrifice a swamp" phase
 2018-03-25 10:56:43 +00:00
Oleg Agafonov
e7546b9e33 Fixed umlauts in card names 2018-03-25 14:48:45 +04:00
L_J
05e526aa08
Merge pull request #4661 from Zzooouhh/master 
Implemented Drought, Monsoon, Leshrac's Sigil, Lim-Dûl's Hex
 2018-03-25 12:31:47 +02:00
L_J
0fc22b2f16
Implemented cards 2018-03-25 01:51:35 +00:00
L_J
0e4af73cc9
Implemented Lim-Dûl's Hex 2018-03-25 01:50:26 +00:00
L_J
3a355669aa
Implemented Leshrac's Sigil 2018-03-25 01:49:05 +00:00
L_J
93d1d5b390
Implemented Monsoon 2018-03-25 01:48:10 +00:00
L_J
89d3284f1f
Implemented Drought 2018-03-25 00:13:14 +00:00
L_J
a37d1aa868
Implemented Drought 2018-03-25 00:12:59 +00:00
L_J
4378581042
Merge pull request #46 from magefree/master 
Merge https://github.com/magefree/mage
 2018-03-25 01:10:41 +01:00
spjspj
1340f75c1e
Merge pull request #4658 from spjspj/master 
Karn, Scion of Urza (DOM)
 2018-03-25 09:04:49 +11:00
spjspj
4527f791aa Karn, Scion of Urza (DOM) 2018-03-25 01:44:23 +11:00
Oleg Agafonov
645fbf6da1 * Cheat engine: added optional set code in card's command (example: battlefield:Human:Island:HOU:1); 2018-03-24 18:44:02 +04:00
Jeff
a71c627fc7 - Added Cabal Shrine, Hint of Insanity, Mind Burst, and Traveling Plague. Odyssey set 100%. 2018-03-23 12:10:29 -05:00
Oleg Agafonov
eeaa40c945 [DOM] Renamed Fall into Oblivion to Cast Down 2018-03-23 11:15:41 +04:00
Oleg Agafonov
0eeada3264 [DOM] Fixed not working Fall into Oblivion 2018-03-23 11:10:52 +04:00
igoudt
c535b81bff changed some == to .equals() 2018-03-22 23:37:07 +01:00
Jeff
ffb4ea647f - Fixed Morality Shift. #4652 2018-03-22 16:35:33 -05:00
Jeff
802e9f99af - Added Cephalid Shrine. 2018-03-22 15:12:30 -05:00
igoudt
00f91391e9 Homarid Drake, reprints, and rewriting his or her to their 2018-03-22 16:52:26 +01:00