drmDev
3e12590d9b
Additional test for sources of differing colors
2016-03-06 08:57:37 -05:00
drmDev
7cc6de86ad
Card implementation and tests for CircleOfAffliction
2016-03-06 08:40:32 -05:00
spjspj
4bffbef07f
Merge pull request #1604 from spjspj/master
...
spjspj - Fix with error message.
2016-03-07 00:17:44 +11:00
spjspj
81e5c2b50e
spjspj - Fix with error message.
2016-03-07 00:13:31 +11:00
spjspj
025953138f
Merge pull request #1603 from spjspj/master
...
And again.
2016-03-07 00:03:35 +11:00
spjspj
2aceb3fcef
And again.
2016-03-06 23:59:00 +11:00
spjspj
1539819e94
Merge pull request #1602 from spjspj/master
...
spjspj - Make mistakes for user-chat commands less obtrusive
2016-03-06 22:52:17 +11:00
spjspj
6116320591
spjspj - Make mistakes in using user-chat commands less visible to the whole chat
2016-03-06 22:46:13 +11:00
LevelX2
619856c8f5
Some minor changes.
2016-03-06 10:25:11 +01:00
DjB
0286da4781
Create Ragamuffyn.java
2016-03-05 22:21:44 -06:00
LevelX2
0c242bce5f
* Some more support for GUI resizing.
2016-03-06 02:59:47 +01:00
LevelX2
c6f8d09229
Merge origin/master
2016-03-06 02:06:37 +01:00
LevelX2
e29c4c3516
* Fixed that the storm counter was no shown on the game panel.
2016-03-06 02:06:10 +01:00
rkfg
bb89c8a4e8
Fix startup script for Linux.
2016-03-06 03:07:55 +03:00
rkfg
5fe67bda4c
Remove unneded import.
2016-03-06 02:55:30 +03:00
rkfg
768b004d3e
Fix race condition on tooltip resize in EDT.
...
CardInfoPane.setCard() performs the tooltip resize, initially it's of
zero width and height. The resize happens in the EDT but location is
calculated in the thread pool's thread, i.e. before the first resize.
Because of that the first time the tooltip appears it may be partially
off-screen, nothing fatal but looks ugly. Now all calculations are moved
to EDT as well and they're guaranteed to happen after the resize.
2016-03-06 02:53:32 +03:00
rkfg
98c291be7b
Protect tooltip counter from going negative forever.
2016-03-06 02:53:31 +03:00
LevelX2
b756475b58
Merge pull request #1592 from drmDev/master
...
User requested condense trigger ability text for Tuktuk Scrapper
2016-03-05 22:21:17 +01:00
LevelX2
dd9431c8ea
* Added scrolling to the game dialog area. Some more GUI resizing. Removed some unwanted borders of viewports.
2016-03-05 21:00:55 +01:00
spjspj
d2ff6e3783
Merge pull request #1593 from spjspj/master
...
spjspj - Fixed for issue Vesuvan Shapeshifter not getting 'turn face …
2016-03-06 01:55:12 +11:00
spjspj
49e43aec38
spjspj - Fixed for issue Vesuvan Shapeshifter not getting 'turn face down' ability when cast for full 3UU cost and copying a creature.
2016-03-06 01:49:43 +11:00
drmDev
783a828cde
User requested condense trigger ability text for Tuktuk Scrapper
2016-03-05 06:10:54 -05:00
spjspj
3f3d39222f
Merge pull request #1591 from spjspj/master
...
spjspj - Implement Divine Intervention (LEG & ME3)
2016-03-05 21:33:27 +11:00
spjspj
1685e8eb82
spjspj - Implement Divine Intervention (LEG & ME3)
2016-03-05 21:25:57 +11:00
spjspj
fd60185987
index on master: 41af3e9 * Disrupting Shoal - Fixed that the converted mana costs of split cards were not handled correctly.
2016-03-05 20:46:09 +11:00
LevelX2
41af3e9d4a
* Disrupting Shoal - Fixed that the converted mana costs of split cards were not handled correctly.
2016-03-05 10:33:27 +01:00
LevelX2
4baa9e5588
Merge pull request #1588 from drmDev/master
...
Fixes for GlintHawk, FaerieImpostor. New card implementation DrakeFamiliar
2016-03-05 08:57:49 +01:00
rkfg
1ff8e42222
Prevent tooltip counter going up on hyperlink click.
2016-03-05 01:03:39 +03:00
rkfg
63ca80fc86
Recreate card thumbnails wrongly encoded as CMYK JPEG from PNG. Fixes
...
#1589 .
2016-03-05 00:06:57 +03:00
fireshoes
0c12998405
Updated SOI spoilers.
2016-03-04 12:59:39 -06:00
fireshoes
138882a086
Merge origin/master
2016-03-04 12:54:33 -06:00
rkfg
79568c82f2
Fix that when you quickly move cursor from one hyperlink to another,
...
tooltip disappears.
2016-03-04 21:39:48 +03:00
rkfg
75324f778e
Fix tooltip for cards with apostrophes. If there are cards with quotes
...
or lt/gt in the name, this will need more generic approach.
2016-03-04 21:39:47 +03:00
drmDev
82225e7b85
Optional Sacrifice tests for Glint Hawk and Drake Familiar
2016-03-04 12:48:33 -05:00
drmDev
a3a2e778ef
New card implementation Drake Familiar
2016-03-04 12:37:12 -05:00
drmDev
8f1af6b940
Fixes for GlintHawk, FaerieImposter. New card implementation DrakeFamiliar.
2016-03-04 12:20:43 -05:00
fireshoes
8096d2f4aa
Merge origin/master
2016-03-04 10:51:50 -06:00
rkfg
20e7130bb1
As per 6f9e316, not only this file doesn't help, it makes it impossible to reset --hard.
2016-03-04 19:34:04 +03:00
LevelX2
5735efa18d
Fixed some wrong counter handling not firing game events from removing counters ( fixes #1587 ).
2016-03-04 12:47:05 +01:00
LevelX2
080a1b883c
Wild Pair - fixed condition handling.
2016-03-04 12:21:47 +01:00
LevelX2
db0674a94d
Added .gittattributes file to deal with cr/lf problems and git. (We'll see.).
2016-03-04 12:21:16 +01:00
LevelX2
619f6058eb
Merge pull request #1586 from drmDev/master
...
Disrupting Shoal tests for fuse cards (reported bug)
2016-03-04 09:27:03 +01:00
rkfg
a612eb4585
Fix CRLF mess again.
2016-03-04 10:29:40 +03:00
drmDev
f1bbc16a75
Fixed disrupting shoal test for CMC 5
2016-03-03 20:33:50 -05:00
drmDev
f05afca73d
Disrupting Shoal tests for fuse cards (reported bug)
2016-03-03 20:10:27 -05:00
LevelX2
4674b18a51
* Fixed some prroblems with can't cast effects and morph ability (related to Reflector Mage, Exclusion Ritual and Alhammarret High Arbiter).
2016-03-04 01:07:52 +01:00
LevelX2
3f57012c85
Merge origin/master
...
Conflicts:
Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
2016-03-03 23:22:06 +01:00
LevelX2
c3f32a39bd
Merge.
2016-03-03 23:19:45 +01:00
rkfg
e8091daea5
Reverted crlf's back.
2016-03-04 01:13:27 +03:00
LevelX2
4f4cf16200
Merge pull request #1578 from fenhl/wild-pair
...
Implement Wild Pair
2016-03-03 23:12:26 +01:00
