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

14599 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
LevelX2
23518b16f5 Merge pull request #1582 from GitHubMage/master 
fixed Ali from Cairo
 2016-03-03 23:12:05 +01:00
LevelX2
be33af6101 Merge pull request #1585 from drmDev/master 
Reflector Mage tests and updated SkylineCascade test
 2016-03-03 23:10:05 +01:00
rkfg
b9bbf9ccec Store symbols as .gif instead of .jpg, rename already downloaded ones on 
start, fixes #98.
 2016-03-04 01:06:53 +03:00
rkfg
47b2a64cee Store symbols as .gif instead of .jpg, rename already downloaded ones on 
start, fixes #98.
 2016-03-04 00:59:12 +03:00
drmDev
95d9191236 Fixed SkylineCascade Test usage of addTarget 2016-03-03 15:05:27 -05:00
rkfg
9cf972ced4 Faster symbols load. 2016-03-03 23:04:35 +03:00
drmDev
b46c2d5b45 testReflectorMageBouncesFaceupCreatureReplayAsMorph fails due to bug reported 2016-03-03 14:50:00 -05:00
rkfg
e2b62fecd8 Prevent repeatable conceding (fixes #1526). 2016-03-03 19:03:37 +03:00
LevelX2
527bb2a492 Modified Blood Moon test. 2016-03-03 10:21:11 +01:00
LevelX2
beb257c081 Merge pull request #1583 from drmDev/master 
tests for Blood Moon and Pithing Needle interactions
 2016-03-03 09:21:04 +01:00
drmDev
db2784ff5d Tests for reported bug on Skyline Cascade. 2016-03-02 22:29:42 -05:00
drmDev
50e1828d41 tests for Blood Moon and Pithing Needle interactions 2016-03-02 19:33:51 -05:00
rkfg
89bce030d0 Add colorless mana filter to deck generator. 2016-03-03 00:39:58 +03:00
rkfg
6cfe43e9b7 Make DeckGeneratorDialog fields non-static for more OOP-style. 2016-03-03 00:39:57 +03:00
GitHubMage
a5504c1a96 fixed Ali from Cairo 
the previous implementation did reduce the amount of damage that is being dealt to not reduce life below one.
now the damage is untouched but the affected player's life total is set to 1 if the damage would otherwise reduce below 1.
 2016-03-02 22:29:29 +01:00