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

14727 commits

This branch
This branch
All branches
Author SHA1 Message Date
rkfg
23e93f008a Add missing import to Ragamuffyn.java 2016-03-07 02:11:01 +03:00
rkfg
95d5bd852e Merge branch 'staging' 2016-03-07 01:35:20 +03:00
LevelX2
ed541b89aa Merge origin/master 2016-03-06 23:18:23 +01:00
LevelX2
0a10a7e97a [SOI] Added Incorrigible Youths. 2016-03-06 23:17:57 +01:00
LevelX2
a3268ec71a Added Madness to keyword generation. 2016-03-06 23:17:40 +01:00
rkfg
66040f0c1f Move canPlaySorcery() to ActivatedAbility.canActivate(). 2016-03-07 01:07:08 +03:00
LevelX2
8b63aea5c4 Merge pull request #1599 from djbrez/patch-11 
Create Ragamuffyn.java
 2016-03-06 22:39:34 +01:00
rkfg
88d17d7ed9 Fix lands highlighting on the non-main phases. 2016-03-07 00:38:51 +03:00
LevelX2
19d67f9a83 Removed old AlternativeCost class, that's no longer used in cards. 2016-03-06 22:32:58 +01:00
LevelX2
29b37b046d Fixed some trap cards and removed old AlternateCostImpl. 2016-03-06 19:41:30 +01:00
DjB
56ecba2dd2 Update Ragamuffyn.java 2016-03-06 12:27:05 -06:00
fireshoes
9b4ef96eb9 Updated SOI spoilers for 3/5. 2016-03-06 09:51:08 -06:00
LevelX2
f8797b3b5d Merge pull request #1605 from drmDev/master 
Card implementation and tests for CircleOfAffliction
 2016-03-06 15:36:55 +01:00
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