Commit graph

21914 commits

Author SHA1 Message Date
Oleg Agafonov
3dda5712db AI: fixed not working choice with key-value dialogs, random refactor 2018-01-04 00:23:20 +04:00
igoudt
ec50a123ec Merge branch 'master' of https://github.com/magefree/mage 2018-01-03 20:25:00 +01:00
igoudt
6c0db483b3 revert heralds horn fix 2018-01-03 20:24:52 +01:00
LevelX2
b448f83c8c Updated mtg-cards-data.txt with spoilers 82/196 of 2018-01-03 18:00 CET 2018-01-03 18:05:32 +01:00
LevelX2
547c7078bf [Rix] Added 6 cards. 2018-01-03 18:02:27 +01:00
LevelX2
d963cbe1e4 Merge origin/master 2018-01-03 15:37:11 +01:00
LevelX2
3d50213f46 Added test for #4333 - problem non-reproducible yet. 2018-01-03 15:36:43 +01:00
Oleg Agafonov
62dd91a5d5 [RIX] Added 3 cards, fixes 2018-01-03 17:53:58 +04:00
LevelX2
cdbaea4a80 Updated mtg-cards-data.txt with spoilers 72/196 of 2018-01-03 13:10 CET 2018-01-03 13:11:29 +01:00
LevelX2
21f151042c Merge origin/master
Conflicts:
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
2018-01-03 13:04:23 +01:00
LevelX2
59159338e8 [Rix] Added 6 cards. 2018-01-03 13:00:31 +01:00
Oleg Agafonov
723cc87f09 Typos 2018-01-03 15:19:53 +04:00
Oleg Agafonov
28cd0e3443 [RIX] Added Forerunner of the Heralds 2018-01-03 15:14:40 +04:00
LevelX2
2672bd36d5 [Rix] Added Jouney to Eternity and Jadelight Ranger. 2018-01-03 11:40:44 +01:00
LevelX2
32fb2507c3 Some rework to Framework. 2018-01-03 11:40:07 +01:00
LevelX2
bdd7cc48d1
Merge pull request #4330 from Zzooouhh/Zzooouhh-rix
[RIX] Implemented 2 cards
2018-01-03 09:25:57 +01:00
LevelX2
ce433f7761
Merge branch 'master' into Zzooouhh-rix 2018-01-03 09:25:37 +01:00
Oleg Agafonov
1a252e61a2 Fixed #4311: deck editor can't load decks with cards cards from Masterpiece Series Amonkhet (MPS-AKH) 2018-01-03 09:10:39 +04:00
Oleg Agafonov
204a602b36 Added old decklist files compatibility loading (free to change card numbers, names and codes, see #4332) 2018-01-03 07:43:15 +04:00
LevelX2
b0b5fe2036 [RIX] Updated mtg-cards-data.txt with spoilers of 2018-01-03 00:00 CET 2018-01-02 23:57:46 +01:00
LevelX2
02f6ce7639 Merge origin/master 2018-01-02 23:48:27 +01:00
LevelX2
bc490ef91a Added Spellweaver Volute. 2018-01-02 23:48:07 +01:00
LevelX2
d5fa7af270 [RIX] Minor text change for "The Immortal Sun". 2018-01-02 18:07:58 +01:00
LevelX2
7d026c699f [RIX] Added 3 cards. 2018-01-02 17:47:38 +01:00
Zzooouhh
ef7e7f861d
[RIX] Implemented 2 cards 2018-01-02 17:04:40 +01:00
Zzooouhh
40578b10bf
Implemented Elenda, the Dusk Rose 2018-01-02 17:01:31 +01:00
Zzooouhh
30482ff1ae
Implemented Zetalpa, Primal Dawn 2018-01-02 16:59:50 +01:00
Zzooouhh
aca1e2fe94
Merge pull request #31 from magefree/master
Merge https://github.com/magefree/mage
2018-01-02 16:56:27 +01:00
Zzooouhh
988076b93c
Minor fix 2018-01-02 16:44:31 +01:00
Oleg Agafonov
050a70b7db UI: fixed #4329 - errors on card selection in linux (debian) 2018-01-02 19:38:08 +04:00
LevelX2
70c08a2d81 * Victimize - Fixed that continuous effects of sacrificed permanent did not end before returning targets from graveyard (fixes #4315). 2018-01-02 15:01:58 +01:00
LevelX2
8d0079bd3d [RIX] Updated mtg-cards-data.txt with spoilers of 2018-01-02 15:00 CET 2018-01-02 15:00:27 +01:00
Zzooouhh
f201ec6fc0
Merge pull request #4326 from Zzooouhh/Zzooouhh-hml
Implemented some Homelands cards
2018-01-02 09:11:46 +01:00
Zzooouhh
d2fdc26ef1
Implemented cards 2018-01-02 05:59:36 +01:00
Zzooouhh
d4588fbf48
Implemented cards 2018-01-02 05:58:58 +01:00
Zzooouhh
a06f6244a7
Implemented cards 2018-01-02 05:58:31 +01:00
Zzooouhh
ff92c0c78a
Implemented cards 2018-01-02 05:58:05 +01:00
Zzooouhh
a9a2f85c4c
Implemented Rashka the Slayer 2018-01-02 05:57:10 +01:00
Zzooouhh
bc3e647544
Implemented Mammoth Harness 2018-01-02 05:56:13 +01:00
Zzooouhh
98cab3a0b7
Implemented Joven's Tools 2018-01-02 05:55:32 +01:00
Zzooouhh
ea29eb5a85
Hazduhr the Abbot 2018-01-02 05:54:29 +01:00
Zzooouhh
82d4ddd0fa
Broken Visage 2018-01-02 05:53:38 +01:00
Zzooouhh
497ebebc05
Implemented Broken Visage 2018-01-02 05:52:47 +01:00
Zzooouhh
5681c945a9
Removed comment 2018-01-02 05:50:41 +01:00
Zzooouhh
404c79efb1
Implemented Autumn Willow 2018-01-02 05:48:49 +01:00
Zzooouhh
bde116e201
Implemented Autumn Willow 2018-01-02 05:48:06 +01:00
Zzooouhh
aa10e2d336
Implemented Autumn Willow 2018-01-02 05:46:33 +01:00
Zzooouhh
a6774cdc74
Implemented Apocalypse Chime 2018-01-02 05:45:16 +01:00
Zzooouhh
b876b011a5
(Re)added missing ability 2018-01-02 00:41:03 +01:00
Oleg Agafonov
9009d72c82 UI: increased tooltip time before hide (60 secs) 2018-01-02 00:15:44 +04:00