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

23033 commits

This branch
This branch
All branches
Author SHA1 Message Date
LevelX2
fdd8cd0e09 * It That Betrays - Fixed that target handling of second triggered ability did not work correct (fixes #4568). 2018-03-16 15:04:31 +01:00
LevelX2
9b379491bc Merge origin/master 2018-03-16 13:19:16 +01:00
LevelX2
8b8b3752e8 * It That Betrays - Fixed that target handling of second triggered ability did not work correct (fixes #4568). 2018-03-16 13:13:25 +01:00
LevelX2
dbfb708e44 * It That Betrays - Fixed that target handling of second triggered ability did not work correct (fixes #4568). 2018-03-16 13:13:16 +01:00
spjspj
cd21387659
Merge pull request #4624 from spjspj/master 
Add rendering for Expeditions
 2018-03-16 22:57:37 +11:00
spjspj
89d58bef5b Add rendering for Expeditions 
(With non-copyright background image)
 2018-03-16 22:49:21 +11:00
Count Andromalius
47282abe99 Implemented [DOM] Mox Amber 2018-03-15 23:08:06 -03:00
LevelX2
753e039d02 * Fixed a problem that a tooltip window was shown of cards from panels in the back. 2018-03-16 00:28:12 +01:00
LevelX2
3c57115c1e Merge origin/master 2018-03-15 23:38:06 +01:00
LevelX2
64f9dc6e60 * Add Land Dialog - Added deck size value and images of mana symbols. 2018-03-15 23:37:05 +01:00
LevelX2
f7b5fabb77
Merge pull request #4619 from CountAndromalius/master 
Baloth Gorger + Jodah, Archmage Eternal
 2018-03-15 22:15:34 +01:00
LevelX2
db94287b20 * Pulmonic Sliver - Fixed that the put in the graveyard ability was not handled optional. 2018-03-15 17:28:45 +01:00
Jeff
6e4d655ac1 - Fixed #4521 2018-03-15 07:59:20 -05:00
Marc Zwart
51b266a2de fixed https://sonarcloud.io/project/issues?id=org.xmage%3Amage-root&issues=AWIlv32RgrzAwlaaQ7rP&open=AWIlv32RgrzAwlaaQ7rP 2018-03-15 10:47:31 +01:00
igoudt
5ba017a19b Merge branch 'master' of https://github.com/magefree/mage 2018-03-15 09:34:26 +01:00
igoudt
c3e080141b test for #4618 2018-03-15 09:34:13 +01:00
Jeff
05ae0c8a02 - Text change 2018-03-14 18:06:39 -05:00
Jeff
55164eda28 - Fixed Defiant Vanguard. It works with Cloudshift type effects now also. @4572 2018-03-14 17:57:04 -05:00
Oleg Agafonov
1b8049780b clean 2018-03-15 00:27:09 +04:00
Oleg Agafonov
83a3de9a93 * UI: improved choose number dialog (fixed enter key, added more info colorized info for mana distribute dialog); 2018-03-15 00:14:04 +04:00
Jeff
9647083f60 - Fixed Sokenzan Renegade. #4614 2018-03-14 15:00:19 -05:00
Oleg Agafonov
4a77ab1714 * UI: added hotkeys to pick number dialog (choose value by <ENTER> key); 2018-03-14 18:46:28 +04:00
Count Andromalius
311adbdf2b Baloth Gorger + Jodah 
First steps into DOM, implementing some cards shown in the official leak. Did not add into the set as we don't have official information on rarity yet.
 2018-03-14 00:16:23 -03:00
LevelX2
87f590f6b8 * Skirk Commando - Fixed triggered ability. 2018-03-13 23:19:36 +01:00
LevelX2
f0950518e9 Added Catalyst Stone. 2018-03-13 22:57:44 +01:00
LevelX2
1e1e361c60 * Some minor changes to Casting of Bones and the used effect. 2018-03-13 22:57:27 +01:00
LevelX2
25f5be3aba * Fixed a problem with download of Unhinged card images with a card name. 2018-03-13 22:56:39 +01:00
LevelX2
c8b1c6058b
Merge pull request #4613 from AMWJ/master 
Implemented card: Casting of Bones
 2018-03-13 22:19:38 +01:00
LevelX2
d101dc5a0e
Merge pull request #4617 from delftswa2018/hotfix/play-land-event 
Fire PLAY_LAND event only after replace check
 2018-03-13 22:14:05 +01:00
LevelX2
bd56b074a0 * Some minor changes to game end window. 2018-03-13 18:01:26 +01:00
Christiaan
da54f97a9d Fire PLAY_LAND event after replace check 
Fix issue with cards preventing players from playing lands still firing PLAY_LAND, while the actual event is replaced.
 2018-03-13 17:08:44 +01:00
LevelX2
537f7dd1ae * Dinosaur Hunter - Fixed wrong var name. 2018-03-13 16:52:37 +01:00
LevelX2
0885ed4058
Merge pull request #4605 from rscoates/patch-1 
Update DinosaurHunter.java
 2018-03-13 16:39:07 +01:00
Count Andromalius
4df90d7d51 Merge remote-tracking branch 'upstream/master' 2018-03-13 12:22:24 -03:00
spjspj
dd11d09cfa
Merge pull request #4616 from spjspj/master 
This allows hidden information out from the game state.
 2018-03-14 01:42:37 +11:00
spjspj
f1967de231 This allows hidden information out from the game state. 2018-03-14 01:41:46 +11:00
spjspj
4258520158
Merge pull request #4615 from spjspj/master 
Allow automatic targeting of lands to occur when untapping them under certain conditions.
 2018-03-14 01:34:51 +11:00
spjspj
3953ad8b0b Untapping lands in response to a trigger is somewhat painful. Allow lands to be targeted automatically. 2018-03-14 01:21:03 +11:00
spjspj
fa53e1ef6f Untapping lands in response to a trigger is somewhat painful. Allow lands to be targeted automatically. 2018-03-14 00:49:05 +11:00
chrvanorle
0da4e10c49
Merge pull request #1 from magefree/master 
Updating master by merging their master
 2018-03-13 12:48:46 +01:00
AMWJ
f4fe276fb6 Merge branch 'master' of https://github.com/magefree/mage 2018-03-13 01:56:01 -04:00
Oleg Agafonov
b344ab12dc * Alliances (ALL) changes: 
- Changed card numbers to new style (scryfall like);
   - Gorilla Shaman, Storm Shaman - fixed wrong rarity;
 2018-03-13 09:13:01 +04:00
AMWJ
5793e9a9dd Merge branch 'master' of https://github.com/magefree/mage 2018-03-12 21:37:44 -04:00
AMWJ
3a441349ef * Corrected use of DrawDiscardOneOfThemEffect, rather than DrawDiscardControllerEffect in CastingOfBones. 2018-03-12 21:32:52 -04:00
AMWJ
a0f2311300 * Implemented Casting Of Bones (https://scryfall.com/card/cst/44b), and added it to Alliances set. 
* Refactored DrawDiscardOneOfThemEffect to be used in CastingOfBones, KrovikanSorcerer, and SoldeviSage.
 2018-03-12 19:50:52 -04:00
Plopman
9aba870aa5 Change place counters to put counters 2018-03-12 22:52:02 +01:00
LevelX2
f01cec68a1 * Curse of the Swine - Reworked card movement and token creation. 2018-03-12 17:02:49 +01:00
LevelX2
c6f080b466 Merge origin/master 2018-03-12 16:34:14 +01:00
LevelX2
b7fa942b10 * Fixed a problem that the AI did not care for maximum allowed mana payment for X mana costs. 2018-03-12 16:33:42 +01:00
spjspj
a4485e92eb
Merge pull request #4611 from spjspj/master 
Add an 'add only full art land' option to the add land dialog.
 2018-03-13 01:04:16 +10:00