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

22654 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
bef754afd0 Merge origin/master 2018-03-08 23:41:24 +01:00
LevelX2
51c68842aa Some minor changes to JSON game log (#4587). 2018-03-08 23:40:55 +01:00
Jeff
a452c6650e - Added requested card Morality Shift. 2018-03-08 16:28:08 -06:00
LevelX2
15602cdfb3 Small change to Uphill Battle. 2018-03-08 23:27:19 +01:00
LevelX2
82e8606b40 * Added Master 25 to Wizard download source. 2018-03-08 23:26:55 +01:00
Sinsedrix
de61e10a90 Implemented: Builder's Bane from Mirage 2018-03-08 22:07:27 +01:00
LevelX2
fedf254219
Merge pull request #4554 from hooptie45/topic/json-logs 
[WIP] Consumable JSON game logs
 2018-03-08 17:32:32 +01:00
LevelX2
ef809e837c
Merge pull request #4573 from delftswa2018/feature/UphillBattle 
[WIP] Implemented Uphill Battle
 2018-03-08 17:25:10 +01:00
LevelX2
03bb39e1f8
Merge pull request #4584 from delftswa2018/hotfix/checksumhelper_misspelled_classname 
Typo in classname
 2018-03-08 17:14:39 +01:00
Christiaan
0b8e8c0007 Fire PLAY_LAND event when a player plays a land, fixed UphillBattle PlayCreatureLandWatcher 
Fire a PLAY_LAND event when a player plays a land. This is necessary for the PlayCreatureLandWatcher to know if a land was played, or put into thte battlefield (make distinction between playing Dryad Arbor and using Sneak Attack to put it on the battlefield)
 2018-03-08 16:17:36 +01:00
spjspj
3dee3586c2
Merge pull request #4583 from spjspj/master 
Add a 'spectators allowed' option for regular tables (aka non tournam…
 2018-03-08 22:46:44 +10:00
spjspj
79d4e7e9b1 Add a 'spectators allowed' option for regular tables (aka non tournaments). 2018-03-08 23:45:09 +11:00
spjspj
4c7b0d50d2 Add a 'spectators allowed' option for regular tables (aka non tournaments). 2018-03-08 23:31:51 +11:00
JRHerlehy
9dbd1e8b41 Fix Exhume 
Set the "notTarget" flag for the ability to allow it to work under cards restricting targeting of cards in graveyards.
 2018-03-07 23:26:02 -08:00
Sinsedrix
8576dbea00 Implement Builder's Bane 2018-03-07 09:56:20 +01:00
Christiaan
94de3b405b Merge branch 'feature/UphillBattle' of https://github.com/delftswa2018/mage into feature/UphillBattle 2018-03-06 16:50:47 +01:00
Christiaan
0fd5c4fba1 check on play instead of cast, updated ability to check for creature lands 2018-03-06 16:48:15 +01:00
Danny Plenge
21a86b8440 gerge remote-tracking branch 'upstream/master' into feature/UphillBattle 
Merging current Master into branch to make sure everything is "up to
date".
 2018-03-06 13:31:20 +01:00
Danny Plenge
a059909fd2 Removed unnecessary file which I accidently added. 2018-03-06 09:52:39 +01:00
L_J
9f6e522969
Implemented Proteus Machine 2018-03-04 10:42:00 +00:00
L_J
4f4028174e
Implemented Proteus Machine 2018-03-04 10:41:23 +00:00
L_J
5bd58ca56e
Included duration for BecomesChosenCreatureTypeSourceEffect 2018-03-04 10:38:38 +00:00
L_J
d2c39a1339
Included duration for BecomesChosenCreatureTypeTargetEffect 2018-03-04 10:37:22 +00:00
spjspj
41c43cb891
Merge pull request #4567 from spjspj/master 
Add a singleton search option for deck editor search
 2018-03-04 17:06:06 +10:00
spjspj
be70ecd7f3 Add a singleton search option for deck editor search 2018-03-04 17:57:51 +11:00
L_J
bb9e438e51
Added missing Scarecrow 2018-03-03 23:57:56 +00:00
L_J
17c1800cb6
Implemented Karona's Zealot 2018-03-03 23:44:16 +00:00
L_J
0b3822ab7c
Implemented Karona's Zealot 2018-03-03 23:43:44 +00:00
L_J
9e001acfe2
Implemented Karona's Zealot 2018-03-03 23:42:43 +00:00
spjspj
7a0707e1fa
Merge pull request #4565 from spjspj/master 
Missing devoid type background
 2018-03-04 01:22:59 +10:00
spjspj
da76c7687d Missing deovid type background 2018-03-04 02:17:21 +11:00
spjspj
374774c7b9
Merge pull request #4564 from spjspj/master 
For actual cards on modo, the full background is always printed to it…
 2018-03-03 23:14:23 +10:00
spjspj
8cf065e345 For actual cards on modo, the full background is always printed to it (not just part of the top left corner of the background). 2018-03-03 23:51:47 +11:00
Oleg Agafonov
08f15416ba * Add new full set Masters 25 (only Karona's Zealot must be implemented); 2018-03-02 22:06:24 +04:00
Oleg Agafonov
ae99a1b444 Fixed tests 2018-03-02 21:42:16 +04:00
Christiaan
f2410b7ef1 Fixed creatures not getting tapped by Uphill Battle 
The condition was checking if the Uphill Battle was cast from hand, instead of the actual card entering the battlefield
 2018-03-02 14:32:12 +01:00
spjspj
550b98509c
Merge pull request #4562 from spjspj/master 
Fix zendikar full art land drawings.  (Travis build failed but didn't seem to be related to Mage.Client)
 2018-03-02 17:33:11 +10:00
spjspj
60cc0525da Fix zendikar full art land drawings. 
- Realized curve fits part of an off-centered ellipse
  (a 295x700 sized ellipse, with the top left being 197 pixels off the top of the top of the curved image on a scanned ZEN forest with bounding rects of: 293x337)
 2018-03-02 18:22:09 +11:00
Danny Plenge
07c76e0784 Test file for Uphill Battle card. 2018-03-01 17:11:52 +01:00
Marc Zwart
fa36c9080c fixed typo in checksumhelper 2018-03-01 17:10:13 +01:00
Christiaan
e5a5e74862 added MMQ UphillBattle 
added MercadianMasques card Uphill Battle
 2018-03-01 16:50:46 +01:00
L_J
b32c8f6bb0
Merge pull request #4547 from Zzooouhh/Zzooouhh-bog 
Implemented Blaze of Glory and Portal cards (& finished a todo in MustBlockAny checking)
 2018-03-01 07:05:11 +01:00
LevelX2
86287f71c8 Merge origin/master 2018-02-28 17:25:24 +01:00
LevelX2
8c8b4ce019 * Added a check if life of players is going down during infinite loop check. Is so no Draw check message is shown (fixes #4557). 2018-02-28 17:24:42 +01:00
spjspj
d6910897e3
Merge pull request #4559 from spjspj/master 
Zen lands slightly offcenter
 2018-02-28 23:50:10 +10:00
spjspj
8c614a9006 slightly offcenter 2018-03-01 00:49:43 +11:00
spjspj
8887cca387 slightly offcenter 2018-03-01 00:32:30 +11:00
spjspj
6516e7eea4
Merge pull request #4556 from spjspj/master 
Adding in way to render BFZ style full art lands (BFZ and HOU full ar…
 2018-02-28 00:54:04 +10:00
spjspj
596ca5be86 Adding in way to render BFZ style full art lands (BFZ and HOU full art lands) 
Things still to do:
1) Get everyone to download the full art Face images ...
2) Add in the collector number to the Face images (<ImageDirector>/FACE/ZEN/Island.<numberneeded>.jpg for example)
4) Maybe even add in an UST (Unstable) way of rendering lands (with the swoosh of opaque full art down the bottom).
 2018-02-28 01:25:29 +11:00
spjspj
154c2121b1
Merge pull request #4555 from spjspj/master 
Modifying zendikar curved box to use a path instead. (Will be easier …
 2018-02-28 00:35:02 +11:00